From 03d97ffaf948302b8c49d2877ca118838519e407 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Thu, 25 Aug 2022 20:02:04 +0200 Subject: [PATCH] Remove support for 3.6 (#853) --- .github/workflows/test.yml | 9 +- _template/setup.cfg | 3 +- .../opentelemetry-exporter-datadog/setup.cfg | 3 +- .../exporter/datadog/spanprocessor.py | 6 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../instrumentation/falcon/__init__.py | 4 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../instrumentation/flask/__init__.py | 4 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 1 - .../setup.cfg | 3 +- .../setup.cfg | 1 - .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../instrumentation/pyramid/callbacks.py | 4 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../instrumentation/tornado/__init__.py | 6 +- .../instrumentation/tornado/client.py | 4 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- opentelemetry-distro/setup.cfg | 3 +- opentelemetry-instrumentation/setup.cfg | 3 +- .../setup.cfg | 3 +- .../setup.cfg | 3 +- .../opentelemetry-sdk-extension-aws/setup.cfg | 3 +- tox.ini | 100 +++++++++--------- util/opentelemetry-util-http/setup.cfg | 5 +- 58 files changed, 116 insertions(+), 169 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b65009b5b..30fe757cc6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/_template/setup.cfg b/_template/setup.cfg index beb0b480b8..e34e383416 100644 --- a/_template/setup.cfg +++ b/_template/setup.cfg @@ -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: diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg index af5add1643..3303c3e3df 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -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: diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py index d6581dd5cc..4ac1abf4b1 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py @@ -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__) @@ -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 diff --git a/exporter/opentelemetry-exporter-richconsole/setup.cfg b/exporter/opentelemetry-exporter-richconsole/setup.cfg index 8d8a3c7a3d..73a727aad7 100644 --- a/exporter/opentelemetry-exporter-richconsole/setup.cfg +++ b/exporter/opentelemetry-exporter-richconsole/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg b/instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg index c2de0a948c..9f9c0a5e56 100644 --- a/instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg index 68ffadc59e..11fc272f26 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg index 0177ac8cf9..69c19eff16 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg index 64e3a8eaad..aec1f8d762 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg index 9bb81fae46..49e3da4448 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg index 7604d6cce6..03a39fb1e4 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg index b13aa32612..02db129a4b 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg index b6cd820a06..6da1b06796 100644 --- a/instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index a274ed7f1a..1b4d74ea8b 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index ca076989c0..8205545ecd 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/setup.cfg b/instrumentation/opentelemetry-instrumentation-confluent-kafka/setup.cfg index 43a84acfaf..94ffffcff7 100644 --- a/instrumentation/opentelemetry-instrumentation-confluent-kafka/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg index e614060278..bb4f713b72 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg index ce40fdc0cc..cb60870ffe 100644 --- a/instrumentation/opentelemetry-instrumentation-django/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-django/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index b5eedc43e5..72d0c48b27 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index 1af9a22bc2..d21231010c 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py index cdf2c3553f..b123203c77 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py @@ -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 @@ -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__) @@ -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, diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg index f2815b8bee..f17dd9e3f6 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index a484994caf..fef2fce338 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py index db63c8c07c..77f227d15d 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py @@ -141,6 +141,7 @@ def response_hook(span: Span, status: str, response_headers: List): """ from logging import getLogger +from time import time_ns from timeit import default_timer from typing import Collection @@ -157,7 +158,6 @@ def response_hook(span: Span, status: str, response_headers: List): from opentelemetry.instrumentation.utils import _start_internal_or_server_span from opentelemetry.metrics import get_meter from opentelemetry.semconv.trace import SpanAttributes -from opentelemetry.util._time import _time_ns from opentelemetry.util.http import get_excluded_urls, parse_excluded_urls _logger = getLogger(__name__) @@ -191,7 +191,7 @@ def _wrapped_app(wrapped_app_environ, start_response): # In theory, we could start the span here and use # update_name later but that API is "highly discouraged" so # we better avoid it. - wrapped_app_environ[_ENVIRON_STARTTIME_KEY] = _time_ns() + wrapped_app_environ[_ENVIRON_STARTTIME_KEY] = time_ns() start = default_timer() attributes = otel_wsgi.collect_request_attributes(wrapped_app_environ) active_requests_count_attrs = ( diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index 6fd95bbf09..4d20e572bd 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg index b0d969531d..e60855da16 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index a65f2f4e82..730e0ea253 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -28,7 +28,6 @@ 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 diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg b/instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg index 194a7b91cb..cb01ce573e 100644 --- a/instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg index ad6804865f..cf5898df25 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg @@ -28,7 +28,6 @@ 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 diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg index 8e1dc6255a..316849980c 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-pika/setup.cfg b/instrumentation/opentelemetry-instrumentation-pika/setup.cfg index 91b4756fb7..b5f7864ab9 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pika/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg index 02eb68e604..9b0d9ef3fd 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg index a100eb40f1..aeef01e67d 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg index 2f31ea82a8..269ea49e37 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg index e829866103..dd9253cccf 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg index 278345a48c..316253198d 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py index 0f36b17e56..c9ebf7081e 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py +++ b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py @@ -13,6 +13,7 @@ # limitations under the License. from logging import getLogger +from time import time_ns from pyramid.events import BeforeTraversal from pyramid.httpexceptions import HTTPException, HTTPServerError @@ -27,7 +28,6 @@ from opentelemetry.instrumentation.pyramid.version import __version__ from opentelemetry.instrumentation.utils import _start_internal_or_server_span from opentelemetry.semconv.trace import SpanAttributes -from opentelemetry.util._time import _time_ns from opentelemetry.util.http import get_excluded_urls TWEEN_NAME = "opentelemetry.instrumentation.pyramid.trace_tween_factory" @@ -144,7 +144,7 @@ def trace_tween(request): return handler(request) request.environ[_ENVIRON_ENABLED_KEY] = True - request.environ[_ENVIRON_STARTTIME_KEY] = _time_ns() + request.environ[_ENVIRON_STARTTIME_KEY] = time_ns() response = None status = None diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg index 34c6fdb84d..d6afa117bb 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg index 92b1b2afb5..b750920dea 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg index 59322b5794..d224af6d62 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg index 8dc4c4d1ca..007a32860b 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg index 1ba2ef2f79..9d3e700efa 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg index 2ac61e630b..d0f2826ce8 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg b/instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg index 7704103a2b..4ea9772e36 100644 --- a/instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg index 390a759e50..56418ffd3c 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg @@ -27,14 +27,13 @@ classifiers = Intended Audience :: Developers License :: OSI Approved :: Apache Software License Programming Language :: Python - 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: diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py index 20ad51cd9c..ed0122a7e8 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py @@ -156,6 +156,7 @@ def client_resposne_hook(span, future): from collections import namedtuple from functools import partial from logging import getLogger +from time import time_ns from typing import Collection import tornado.web @@ -179,7 +180,6 @@ def client_resposne_hook(span, future): from opentelemetry.propagators import textmap from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace.status import Status, StatusCode -from opentelemetry.util._time import _time_ns from opentelemetry.util.http import ( OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST, OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE, @@ -290,7 +290,7 @@ def _wrap(cls, method_name, wrapper): def _prepare(tracer, request_hook, func, handler, args, kwargs): - start_time = _time_ns() + start_time = time_ns() request = handler.request if _excluded_urls.url_disabled(request.uri): return func(*args, **kwargs) @@ -423,7 +423,7 @@ def _finish_span(tracer, handler, error=None): if isinstance(error, tornado.web.HTTPError): status_code = error.status_code if not ctx and status_code == 404: - ctx = _start_span(tracer, handler, _time_ns()) + ctx = _start_span(tracer, handler, time_ns()) else: status_code = 500 reason = None diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py index 03497ec5ca..9a682c6160 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py +++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py @@ -13,6 +13,7 @@ # limitations under the License. import functools +from time import time_ns from tornado.httpclient import HTTPError, HTTPRequest @@ -21,7 +22,6 @@ from opentelemetry.propagate import inject from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace.status import Status -from opentelemetry.util._time import _time_ns from opentelemetry.util.http import remove_url_credentials @@ -42,7 +42,7 @@ def _normalize_request(args, kwargs): def fetch_async(tracer, request_hook, response_hook, func, _, args, kwargs): - start_time = _time_ns() + start_time = time_ns() # Return immediately if no args were provided (error) # or original_request is set (meaning we are in a redirect step). diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg index 7ea9b2bd3c..8993ee0f98 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg index af653e1c9e..2d28acbe75 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg @@ -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: diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg index 26915425d3..fc4b2c5f99 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg @@ -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: diff --git a/opentelemetry-contrib-instrumentations/setup.cfg b/opentelemetry-contrib-instrumentations/setup.cfg index 61e0a9ceca..520e0c62d8 100644 --- a/opentelemetry-contrib-instrumentations/setup.cfg +++ b/opentelemetry-contrib-instrumentations/setup.cfg @@ -14,14 +14,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: diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg index c81f5394d3..845a1f21d1 100644 --- a/opentelemetry-distro/setup.cfg +++ b/opentelemetry-distro/setup.cfg @@ -28,13 +28,12 @@ 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 Typing :: Typed [options] -python_requires = >=3.6 +python_requires = >=3.7 package_dir= =src packages=find_namespace: diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index 57f7936b42..c0eda1876d 100644 --- a/opentelemetry-instrumentation/setup.cfg +++ b/opentelemetry-instrumentation/setup.cfg @@ -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: diff --git a/propagator/opentelemetry-propagator-aws-xray/setup.cfg b/propagator/opentelemetry-propagator-aws-xray/setup.cfg index 3c3251c7b3..f4afe67cad 100644 --- a/propagator/opentelemetry-propagator-aws-xray/setup.cfg +++ b/propagator/opentelemetry-propagator-aws-xray/setup.cfg @@ -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: diff --git a/propagator/opentelemetry-propagator-ot-trace/setup.cfg b/propagator/opentelemetry-propagator-ot-trace/setup.cfg index c951d72887..5283c63b86 100644 --- a/propagator/opentelemetry-propagator-ot-trace/setup.cfg +++ b/propagator/opentelemetry-propagator-ot-trace/setup.cfg @@ -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: diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg index cff69550f6..ae53ace3ea 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg +++ b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg @@ -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: diff --git a/tox.ini b/tox.ini index 74d412b057..80fd488dce 100644 --- a/tox.ini +++ b/tox.ini @@ -6,30 +6,30 @@ envlist = ; for specifying supported Python versions per package. ; opentelemetry-sdk-extension-aws - py3{6,7,8,9,10}-test-sdkextension-aws + py3{7,8,9,10}-test-sdkextension-aws pypy3-test-sdkextension-aws ; opentelemetry-distro - py3{6,7,8,9,10}-test-distro + py3{7,8,9,10}-test-distro pypy3-test-distro ; opentelemetry-instrumentation - py3{6,7,8,9,10}-test-opentelemetry-instrumentation + py3{7,8,9,10}-test-opentelemetry-instrumentation pypy3-test-opentelemetry-instrumentation ; opentelemetry-instrumentation-aiohttp-client - py3{6,7,8,9,10}-test-instrumentation-aiohttp-client + py3{7,8,9,10}-test-instrumentation-aiohttp-client pypy3-test-instrumentation-aiohttp-client ; opentelemetry-instrumentation-aiopg - py3{6,7,8,9,10}-test-instrumentation-aiopg + py3{7,8,9,10}-test-instrumentation-aiopg ; instrumentation-aiopg intentionally excluded from pypy3 ; opentelemetry-instrumentation-aws-lambda - py3{6,7,8,9}-test-instrumentation-aws-lambda + py3{7,8,9}-test-instrumentation-aws-lambda ; opentelemetry-instrumentation-botocore - py3{6,7,8,9,10}-test-instrumentation-botocore + py3{7,8,9,10}-test-instrumentation-botocore pypy3-test-instrumentation-botocore ; opentelemetry-instrumentation-boto3sqs @@ -40,121 +40,119 @@ envlist = ; Only officially supported Python versions are tested for each Django ; major release. Updated list can be found at: ; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django - py3{6,7}-test-instrumentation-django1 - py3{6,7,8,9}-test-instrumentation-django2 - py3{6,7,8,9,10}-test-instrumentation-django3 + py3{7}-test-instrumentation-django1 + py3{7,8,9}-test-instrumentation-django2 + py3{7,8,9,10}-test-instrumentation-django3 py3{8,9,10}-test-instrumentation-django4 pypy3-test-instrumentation-django{1,2,3} ; opentelemetry-instrumentation-dbapi - py3{6,7,8,9,10}-test-instrumentation-dbapi + py3{7,8,9,10}-test-instrumentation-dbapi pypy3-test-instrumentation-dbapi ; opentelemetry-instrumentation-boto - py3{6,7,8,9,10}-test-instrumentation-boto + py3{7,8,9,10}-test-instrumentation-boto pypy3-test-instrumentation-boto ; opentelemetry-instrumentation-elasticsearch - py3{6,7,8,9,10}-test-instrumentation-elasticsearch{2,6} + py3{7,8,9,10}-test-instrumentation-elasticsearch{2,6} pypy3-test-instrumentation-elasticsearch{2,6} ; opentelemetry-instrumentation-elasticsearch5 - py3{6,7,8,9}-test-instrumentation-elasticsearch5 + py3{7,8,9}-test-instrumentation-elasticsearch5 pypy3-test-instrumentation-elasticsearch5 ; opentelemetry-instrumentation-falcon ; py310 does not work with falcon 1 - py3{6,7,8,9}-test-instrumentation-falcon1 - py3{6,7,8,9,10}-test-instrumentation-falcon{2,3} + py3{7,8,9}-test-instrumentation-falcon1 + py3{7,8,9,10}-test-instrumentation-falcon{2,3} pypy3-test-instrumentation-falcon{1,2,3} ; opentelemetry-instrumentation-fastapi - ; fastapi only supports 3.6 and above. - py3{6,7,8,9,10}-test-instrumentation-fastapi + py3{7,8,9,10}-test-instrumentation-fastapi pypy3-test-instrumentation-fastapi ; opentelemetry-instrumentation-flask - py3{6,7,8,9,10}-test-instrumentation-flask + py3{7,8,9,10}-test-instrumentation-flask pypy3-test-instrumentation-flask ; opentelemetry-instrumentation-urllib - py3{6,7,8,9,10}-test-instrumentation-urllib + py3{7,8,9,10}-test-instrumentation-urllib pypy3-test-instrumentation-urllib ; opentelemetry-instrumentation-urllib3 - py3{6,7,8,9,10}-test-instrumentation-urllib3 + py3{7,8,9,10}-test-instrumentation-urllib3 pypy3-test-instrumentation-urllib3 ; opentelemetry-instrumentation-requests - py3{6,7,8,9,10}-test-instrumentation-requests + py3{7,8,9,10}-test-instrumentation-requests pypy3-test-instrumentation-requests ; opentelemetry-instrumentation-starlette. - ; starlette only supports 3.6 and above. - py3{6,7,8,9,10}-test-instrumentation-starlette + py3{7,8,9,10}-test-instrumentation-starlette pypy3-test-instrumentation-starlette ; opentelemetry-instrumentation-jinja2 - py3{6,7,8,9,10}-test-instrumentation-jinja2 + py3{7,8,9,10}-test-instrumentation-jinja2 pypy3-test-instrumentation-jinja2 ; opentelemetry-instrumentation-logging - py3{6,7,8,9,10}-test-instrumentation-logging + py3{7,8,9,10}-test-instrumentation-logging pypy3-test-instrumentation-logging ; opentelemetry-exporter-richconsole - py3{6,7,8,9,10}-test-exporter-richconsole + py3{7,8,9,10}-test-exporter-richconsole ; opentelemetry-instrumentation-mysql - py3{6,7,8,9,10}-test-instrumentation-mysql + py3{7,8,9,10}-test-instrumentation-mysql pypy3-test-instrumentation-mysql ; opentelemetry-instrumentation-psycopg2 - py3{6,7,8,9,10}-test-instrumentation-psycopg2 + py3{7,8,9,10}-test-instrumentation-psycopg2 ; ext-psycopg2 intentionally excluded from pypy3 ; opentelemetry-instrumentation-pymemcache - py3{6,7,8,9,10}-test-instrumentation-pymemcache{135,200,300,342} + py3{7,8,9,10}-test-instrumentation-pymemcache{135,200,300,342} pypy3-test-instrumentation-pymemcache{135,200,300,342} ; opentelemetry-instrumentation-pymongo - py3{6,7,8,9,10}-test-instrumentation-pymongo + py3{7,8,9,10}-test-instrumentation-pymongo pypy3-test-instrumentation-pymongo ; opentelemetry-instrumentation-pymysql - py3{6,7,8,9,10}-test-instrumentation-pymysql + py3{7,8,9,10}-test-instrumentation-pymysql pypy3-test-instrumentation-pymysql ; opentelemetry-instrumentation-pyramid - py3{6,7,8,9,10}-test-instrumentation-pyramid + py3{7,8,9,10}-test-instrumentation-pyramid pypy3-test-instrumentation-pyramid ; opentelemetry-instrumentation-asgi - py3{6,7,8,9,10}-test-instrumentation-asgi + py3{7,8,9,10}-test-instrumentation-asgi pypy3-test-instrumentation-asgi ; opentelemetry-instrumentation-asyncpg - py3{6,7,8,9,10}-test-instrumentation-asyncpg + py3{7,8,9,10}-test-instrumentation-asyncpg ; ext-asyncpg intentionally excluded from pypy3 ; opentelemetry-instrumentation-sqlite3 - py3{6,7,8,9,10}-test-instrumentation-sqlite3 + py3{7,8,9,10}-test-instrumentation-sqlite3 pypy3-test-instrumentation-sqlite3 ; opentelemetry-instrumentation-wsgi - py3{6,7,8,9,10}-test-instrumentation-wsgi + py3{7,8,9,10}-test-instrumentation-wsgi pypy3-test-instrumentation-wsgi ; opentelemetry-instrumentation-grpc - py3{6,7,8,9,10}-test-instrumentation-grpc + py3{7,8,9,10}-test-instrumentation-grpc ; opentelemetry-instrumentation-sqlalchemy - py3{6,7}-test-instrumentation-sqlalchemy{11} - py3{6,7,8,9,10}-test-instrumentation-sqlalchemy{14} + py3{7}-test-instrumentation-sqlalchemy{11} + py3{7,8,9,10}-test-instrumentation-sqlalchemy{14} pypy3-test-instrumentation-sqlalchemy{11,14} ; opentelemetry-instrumentation-redis - py3{6,7,8,9,10}-test-instrumentation-redis + py3{7,8,9,10}-test-instrumentation-redis pypy3-test-instrumentation-redis ; opentelemetry-instrumentation-remoulade @@ -163,42 +161,42 @@ envlist = ; instrumentation-remoulade intentionally excluded from pypy3 ; opentelemetry-instrumentation-celery - py3{6,7,8,9,10}-test-instrumentation-celery + py3{7,8,9,10}-test-instrumentation-celery pypy3-test-instrumentation-celery ; opentelemetry-instrumentation-sklearn - py3{6,7,8}-test-instrumentation-sklearn + py3{7,8}-test-instrumentation-sklearn ; opentelemetry-instrumentation-system-metrics py3{6,7,8,9,10}-test-instrumentation-system-metrics ; instrumentation-system-metrics intentionally excluded from pypy3 ; opentelemetry-instrumentation-tornado - py3{6,7,8,9,10}-test-instrumentation-tornado + py3{7,8,9,10}-test-instrumentation-tornado pypy3-test-instrumentation-tornado ; opentelemetry-instrumentation-httpx - py3{6,7,8,9,10}-test-instrumentation-httpx{18,21} + py3{7,8,9,10}-test-instrumentation-httpx{18,21} pypy3-test-instrumentation-httpx{18,21} ; opentelemetry-util-http - py3{6,7,8,9,10}-test-util-http + py3{7,8,9,10}-test-util-http pypy3-test-util-http ; opentelemetry-propagator-aws-xray - py3{6,7,8,9,10}-test-propagator-aws-xray + py3{7,8,9,10}-test-propagator-aws-xray pypy3-test-propagator-aws-xray ; opentelemetry-propagator-ot-trace - py3{6,7,8,9,10}-test-propagator-ot-trace + py3{7,8,9,10}-test-propagator-ot-trace pypy3-test-propagator-ot-trace ; opentelemetry-instrumentation-pika - py3{6,7,8,9,10}-test-instrumentation-pika{0,1} + py3{7,8,9,10}-test-instrumentation-pika{0,1} pypy3-test-instrumentation-pika{0,1} ; opentelemetry-instrumentation-kafka-python - py3{6,7,8,9,10}-test-instrumentation-kafka-python + py3{7,8,9,10}-test-instrumentation-kafka-python pypy3-test-instrumentation-kafka-python lint @@ -303,7 +301,7 @@ changedir = commands_pre = ; Install without -e to test the actual installation - py3{6,7,8,9,10}: python -m pip install -U pip setuptools wheel + py3{7,8,9,10}: python -m pip install -U pip setuptools wheel ; Install common packages for all the tests. These are not needed in all the ; cases but it saves a lot of boilerplate in this file. test: pip install "opentelemetry-api[test] @ {env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api" diff --git a/util/opentelemetry-util-http/setup.cfg b/util/opentelemetry-util-http/setup.cfg index 8abce2cb06..6e8c046c9f 100644 --- a/util/opentelemetry-util-http/setup.cfg +++ b/util/opentelemetry-util-http/setup.cfg @@ -28,17 +28,16 @@ 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: [options.packages.find] -where = src \ No newline at end of file +where = src