Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for 3.6 #853

Merged
merged 10 commits into from
Aug 25, 2022
Merged

Remove support for 3.6 #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3cd2cec
Remove support for 3.6
ocelotl Jan 10, 2022
8206129
Remove use of 3.6
ocelotl Jun 15, 2022
490babc
Remove use of 3.6 for aio pika
ocelotl Aug 24, 2022
7212f73
Update SHA
ocelotl Aug 24, 2022
46604a0
Update pypy version
ocelotl Aug 24, 2022
040c684
Another attempt
ocelotl Aug 24, 2022
858e7b8
Try updating setup-python version
ocelotl Aug 24, 2022
0dc372e
Remove usage of _time_ns
ocelotl Aug 24, 2022
a6c3d53
Fix lint
ocelotl Aug 24, 2022
51a8ad1
Update core repo SHA
ocelotl Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,30 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: ece57231cde5bb5656775a62f027cab0b1c76fce
CORE_REPO_SHA: b3b0ba3a47dbdd844b524c46db22a60549364071

jobs:
build:
env:
# We use these variables to convert between tox and GHA version literals
py36: 3.6
py37: 3.7
py38: 3.8
py39: 3.9
py310: "3.10"
pypy3: pypy3
pypy3: "pypy3.7"
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
python-version: [ py36, py37, py38, py39, py310, pypy3 ]
python-version: [ py37, py38, py39, py310, pypy3 ]
package: ["instrumentation", "distro", "exporter", "sdkextension", "propagator"]
os: [ ubuntu-20.04 ]
steps:
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v2
- name: Set up Python ${{ env[matrix.python-version] }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ env[matrix.python-version] }}
- name: Install tox
Expand Down
3 changes: 1 addition & 2 deletions _template/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions exporter/opentelemetry-exporter-datadog/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
6 changes: 3 additions & 3 deletions exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
import logging
import threading
import typing
from time import time_ns

from opentelemetry.context import Context, attach, detach, set_value
from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
from opentelemetry.sdk.trace import Span, SpanProcessor
from opentelemetry.sdk.trace.export import SpanExporter
from opentelemetry.trace import INVALID_TRACE_ID
from opentelemetry.util._time import _time_ns

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -128,9 +128,9 @@ def worker(self):
break

# substract the duration of this export call to the next timeout
start = _time_ns()
start = time_ns()
self.export()
end = _time_ns()
end = time_ns()
duration = (end - start) / 1e9
timeout = self.schedule_delay_millis / 1e3 - duration

Expand Down
3 changes: 1 addition & 2 deletions exporter/opentelemetry-exporter-richconsole/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6.3
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-asgi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-boto/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-botocore/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-celery/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-confluent-kafka/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-django/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-falcon/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
4 changes: 2 additions & 2 deletions ...opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ def response_hook(span, req, resp):

from logging import getLogger
from sys import exc_info
from time import time_ns
from typing import Collection

import falcon
Expand All @@ -164,7 +165,6 @@ def response_hook(span, req, resp):
)
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.trace.status import Status
from opentelemetry.util._time import _time_ns
from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs

_logger = getLogger(__name__)
Expand Down Expand Up @@ -253,7 +253,7 @@ def __call__(self, env, start_response):
if self._otel_excluded_urls.url_disabled(env.get("PATH_INFO", "/")):
return super().__call__(env, start_response)

start_time = _time_ns()
start_time = time_ns()

span, token = _start_internal_or_server_span(
tracer=self._otel_tracer,
Expand Down
3 changes: 1 addition & 2 deletions instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ classifiers =
License :: OSI Approved :: Apache Software License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down
Loading