Skip to content

Commit 03d97ff

Browse files
ocelotlocelotl
authored
Remove support for 3.6 (#853)
1 parent 85e5328 commit 03d97ff

File tree

58 files changed

+116
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+116
-169
lines changed

‎.github/workflows/test.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,30 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: ece57231cde5bb5656775a62f027cab0b1c76fce
9+
CORE_REPO_SHA: b3b0ba3a47dbdd844b524c46db22a60549364071
1010

1111
jobs:
1212
build:
1313
env:
1414
# We use these variables to convert between tox and GHA version literals
15-
py36: 3.6
1615
py37: 3.7
1716
py38: 3.8
1817
py39: 3.9
1918
py310: "3.10"
20-
pypy3: pypy3
19+
pypy3: "pypy3.7"
2120
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
2221
runs-on: ${{ matrix.os }}
2322
strategy:
2423
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
2524
matrix:
26-
python-version: [ py36, py37, py38, py39, py310, pypy3 ]
25+
python-version: [ py37, py38, py39, py310, pypy3 ]
2726
package: ["instrumentation", "distro", "exporter", "sdkextension", "propagator"]
2827
os: [ ubuntu-20.04 ]
2928
steps:
3029
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
3130
uses: actions/checkout@v2
3231
- name: Set up Python ${{ env[matrix.python-version] }}
33-
uses: actions/setup-python@v2
32+
uses: actions/setup-python@v4
3433
with:
3534
python-version: ${{ env[matrix.python-version] }}
3635
- name: Install tox

‎_template/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@ classifiers =
3434
License :: OSI Approved :: Apache Software License
3535
Programming Language :: Python
3636
Programming Language :: Python :: 3
37-
Programming Language :: Python :: 3.6
3837
Programming Language :: Python :: 3.7
3938
Programming Language :: Python :: 3.8
4039
Programming Language :: Python :: 3.9
4140
Programming Language :: Python :: 3.10
4241

4342
[options]
44-
python_requires = >=3.6
43+
python_requires = >=3.7
4544
package_dir=
4645
=src
4746
packages=find_namespace:

‎exporter/opentelemetry-exporter-datadog/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
import logging
1717
import threading
1818
import typing
19+
from time import time_ns
1920

2021
from opentelemetry.context import Context, attach, detach, set_value
2122
from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
2223
from opentelemetry.sdk.trace import Span, SpanProcessor
2324
from opentelemetry.sdk.trace.export import SpanExporter
2425
from opentelemetry.trace import INVALID_TRACE_ID
25-
from opentelemetry.util._time import _time_ns
2626

2727
logger = logging.getLogger(__name__)
2828

@@ -128,9 +128,9 @@ def worker(self):
128128
break
129129

130130
# substract the duration of this export call to the next timeout
131-
start = _time_ns()
131+
start = time_ns()
132132
self.export()
133-
end = _time_ns()
133+
end = time_ns()
134134
duration = (end - start) / 1e9
135135
timeout = self.schedule_delay_millis / 1e3 - duration
136136

‎exporter/opentelemetry-exporter-richconsole/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6.3
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-asgi/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433

3534
[options]
36-
python_requires = >=3.6
35+
python_requires = >=3.7
3736
package_dir=
3837
=src
3938
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-boto/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@ classifiers =
3333
License :: OSI Approved :: Apache Software License
3434
Programming Language :: Python
3535
Programming Language :: Python :: 3
36-
Programming Language :: Python :: 3.6
3736
Programming Language :: Python :: 3.7
3837
Programming Language :: Python :: 3.8
3938
Programming Language :: Python :: 3.9
4039
Programming Language :: Python :: 3.10
4140

4241
[options]
43-
python_requires = >=3.6
42+
python_requires = >=3.7
4443
package_dir=
4544
=src
4645
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-botocore/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-celery/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-confluent-kafka/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-django/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-falcon/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

‎instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ def response_hook(span, req, resp):
143143

144144
from logging import getLogger
145145
from sys import exc_info
146+
from time import time_ns
146147
from typing import Collection
147148

148149
import falcon
@@ -164,7 +165,6 @@ def response_hook(span, req, resp):
164165
)
165166
from opentelemetry.semconv.trace import SpanAttributes
166167
from opentelemetry.trace.status import Status
167-
from opentelemetry.util._time import _time_ns
168168
from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
169169

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

256-
start_time = _time_ns()
256+
start_time = time_ns()
257257

258258
span, token = _start_internal_or_server_span(
259259
tracer=self._otel_tracer,

‎instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31-
Programming Language :: Python :: 3.6
3231
Programming Language :: Python :: 3.7
3332
Programming Language :: Python :: 3.8
3433
Programming Language :: Python :: 3.9
3534
Programming Language :: Python :: 3.10
3635

3736
[options]
38-
python_requires = >=3.6
37+
python_requires = >=3.7
3938
package_dir=
4039
=src
4140
packages=find_namespace:

0 commit comments

Comments
 (0)