diff --git a/instana/__init__.py b/instana/__init__.py index 45b1c2f6..af00ad93 100644 --- a/instana/__init__.py +++ b/instana/__init__.py @@ -14,7 +14,6 @@ Source Code: https://github.com/instana/python-sensor """ -from __future__ import absolute_import import os import sys diff --git a/instana/agent/host.py b/instana/agent/host.py index c60f739f..89daff8e 100644 --- a/instana/agent/host.py +++ b/instana/agent/host.py @@ -5,7 +5,6 @@ The in-process Instana agent (for host based processes) that manages monitoring state and reporting that data. """ -from __future__ import absolute_import import os import json diff --git a/instana/configurator.py b/instana/configurator.py index f8de858d..167aa4c1 100644 --- a/instana/configurator.py +++ b/instana/configurator.py @@ -5,7 +5,6 @@ This file contains a config object that will hold configuration options for the package. Defaults are set and can be overridden after package load. """ -from __future__ import absolute_import from .util import DictionaryOfStan # La Protagonista diff --git a/instana/fsm.py b/instana/fsm.py index 5267f2d6..3cdd25ee 100644 --- a/instana/fsm.py +++ b/instana/fsm.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2016 -from __future__ import absolute_import import os import re diff --git a/instana/hooks/hook_uwsgi.py b/instana/hooks/hook_uwsgi.py index 21ae9ada..16c2b26d 100644 --- a/instana/hooks/hook_uwsgi.py +++ b/instana/hooks/hook_uwsgi.py @@ -6,7 +6,6 @@ when running under uWSGI. Here we attempt to detect the presence of these packages and then use the appropriate hooks. """ -from __future__ import absolute_import from ..log import logger from ..singletons import agent diff --git a/instana/instrumentation/aiohttp/client.py b/instana/instrumentation/aiohttp/client.py index bcc02bc0..9640d249 100644 --- a/instana/instrumentation/aiohttp/client.py +++ b/instana/instrumentation/aiohttp/client.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import opentracing import wrapt diff --git a/instana/instrumentation/aiohttp/server.py b/instana/instrumentation/aiohttp/server.py index 930d0f09..93dcb256 100644 --- a/instana/instrumentation/aiohttp/server.py +++ b/instana/instrumentation/aiohttp/server.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import opentracing import wrapt diff --git a/instana/instrumentation/asyncio.py b/instana/instrumentation/asyncio.py index 60cfd277..e8363e19 100644 --- a/instana/instrumentation/asyncio.py +++ b/instana/instrumentation/asyncio.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import wrapt diff --git a/instana/instrumentation/boto3_inst.py b/instana/instrumentation/boto3_inst.py index 7d1b8163..f975ad49 100644 --- a/instana/instrumentation/boto3_inst.py +++ b/instana/instrumentation/boto3_inst.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import import json import wrapt diff --git a/instana/instrumentation/cassandra_inst.py b/instana/instrumentation/cassandra_inst.py index c1e8c1fd..af1579b3 100644 --- a/instana/instrumentation/cassandra_inst.py +++ b/instana/instrumentation/cassandra_inst.py @@ -6,7 +6,6 @@ https://docs.datastax.com/en/developer/python-driver/3.20/ https://github.com/datastax/python-driver """ -from __future__ import absolute_import import wrapt from ..log import logger from ..util.traceutils import get_active_tracer diff --git a/instana/instrumentation/celery/catalog.py b/instana/instrumentation/celery/catalog.py index 9c9d7c4a..2ba395ac 100644 --- a/instana/instrumentation/celery/catalog.py +++ b/instana/instrumentation/celery/catalog.py @@ -10,7 +10,6 @@ WeakValueDictionary allows for lost scopes to be garbage collected. """ -from __future__ import absolute_import from weakref import WeakValueDictionary diff --git a/instana/instrumentation/celery/hooks.py b/instana/instrumentation/celery/hooks.py index 2f6f7323..e62f9b58 100644 --- a/instana/instrumentation/celery/hooks.py +++ b/instana/instrumentation/celery/hooks.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import import opentracing from ...log import logger diff --git a/instana/instrumentation/couchbase_inst.py b/instana/instrumentation/couchbase_inst.py index 8157f7f0..b7918c93 100644 --- a/instana/instrumentation/couchbase_inst.py +++ b/instana/instrumentation/couchbase_inst.py @@ -5,7 +5,6 @@ couchbase instrumentation - This instrumentation supports the Python CouchBase 2.3.4 --> 2.5.x SDK currently: https://docs.couchbase.com/python-sdk/2.5/start-using-sdk.html """ -from __future__ import absolute_import import wrapt diff --git a/instana/instrumentation/django/middleware.py b/instana/instrumentation/django/middleware.py index 964a1670..d50488cc 100644 --- a/instana/instrumentation/django/middleware.py +++ b/instana/instrumentation/django/middleware.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2018 -from __future__ import absolute_import import os import sys diff --git a/instana/instrumentation/flask/__init__.py b/instana/instrumentation/flask/__init__.py index d2a03c02..3ec4b3e9 100644 --- a/instana/instrumentation/flask/__init__.py +++ b/instana/instrumentation/flask/__init__.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import try: import flask diff --git a/instana/instrumentation/flask/common.py b/instana/instrumentation/flask/common.py index c9656f9d..58de6ae2 100644 --- a/instana/instrumentation/flask/common.py +++ b/instana/instrumentation/flask/common.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import wrapt import flask diff --git a/instana/instrumentation/flask/vanilla.py b/instana/instrumentation/flask/vanilla.py index 5a384e8e..9775f1db 100644 --- a/instana/instrumentation/flask/vanilla.py +++ b/instana/instrumentation/flask/vanilla.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import re import flask diff --git a/instana/instrumentation/flask/with_blinker.py b/instana/instrumentation/flask/with_blinker.py index 787d44b8..cac55c96 100644 --- a/instana/instrumentation/flask/with_blinker.py +++ b/instana/instrumentation/flask/with_blinker.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import re import wrapt diff --git a/instana/instrumentation/gevent_inst.py b/instana/instrumentation/gevent_inst.py index d65bb7d0..322f0b1c 100644 --- a/instana/instrumentation/gevent_inst.py +++ b/instana/instrumentation/gevent_inst.py @@ -4,7 +4,6 @@ """ Instrumentation for the gevent package. """ -from __future__ import absolute_import import sys from ..log import logger diff --git a/instana/instrumentation/google/cloud/pubsub.py b/instana/instrumentation/google/cloud/pubsub.py index b62b816f..dfa6b6c3 100644 --- a/instana/instrumentation/google/cloud/pubsub.py +++ b/instana/instrumentation/google/cloud/pubsub.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2021 -from __future__ import absolute_import import json import wrapt diff --git a/instana/instrumentation/google/cloud/storage.py b/instana/instrumentation/google/cloud/storage.py index 6f985df6..637a617b 100644 --- a/instana/instrumentation/google/cloud/storage.py +++ b/instana/instrumentation/google/cloud/storage.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import import wrapt import re diff --git a/instana/instrumentation/grpcio.py b/instana/instrumentation/grpcio.py index f6d3c439..fe8e1d16 100644 --- a/instana/instrumentation/grpcio.py +++ b/instana/instrumentation/grpcio.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import wrapt import opentracing diff --git a/instana/instrumentation/logging.py b/instana/instrumentation/logging.py index 1a15087e..5cddea0b 100644 --- a/instana/instrumentation/logging.py +++ b/instana/instrumentation/logging.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import sys import wrapt diff --git a/instana/instrumentation/mysqlclient.py b/instana/instrumentation/mysqlclient.py index 7c0c7754..5b7270f8 100644 --- a/instana/instrumentation/mysqlclient.py +++ b/instana/instrumentation/mysqlclient.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import from ..log import logger from .pep0249 import ConnectionFactory diff --git a/instana/instrumentation/pika.py b/instana/instrumentation/pika.py index 845ff9fe..3149c242 100644 --- a/instana/instrumentation/pika.py +++ b/instana/instrumentation/pika.py @@ -3,7 +3,6 @@ # (c) Copyright Instana Inc. 2021 -from __future__ import absolute_import import wrapt import opentracing diff --git a/instana/instrumentation/psycopg2.py b/instana/instrumentation/psycopg2.py index 1288ac2b..86e35b10 100644 --- a/instana/instrumentation/psycopg2.py +++ b/instana/instrumentation/psycopg2.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import copy import wrapt diff --git a/instana/instrumentation/pymongo.py b/instana/instrumentation/pymongo.py index 31d5fd2e..f9695654 100644 --- a/instana/instrumentation/pymongo.py +++ b/instana/instrumentation/pymongo.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import from ..log import logger from ..util.traceutils import get_active_tracer diff --git a/instana/instrumentation/pymysql.py b/instana/instrumentation/pymysql.py index cb67f185..c4939cc4 100644 --- a/instana/instrumentation/pymysql.py +++ b/instana/instrumentation/pymysql.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import from ..log import logger from .pep0249 import ConnectionFactory diff --git a/instana/instrumentation/pyramid/tweens.py b/instana/instrumentation/pyramid/tweens.py index c525e2e9..5f6c0d11 100644 --- a/instana/instrumentation/pyramid/tweens.py +++ b/instana/instrumentation/pyramid/tweens.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import from pyramid.httpexceptions import HTTPException diff --git a/instana/instrumentation/redis.py b/instana/instrumentation/redis.py index 7eeea3ef..0faf0a62 100644 --- a/instana/instrumentation/redis.py +++ b/instana/instrumentation/redis.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2018 -from __future__ import absolute_import import wrapt diff --git a/instana/instrumentation/sqlalchemy.py b/instana/instrumentation/sqlalchemy.py index 831793b9..3fbb34c9 100644 --- a/instana/instrumentation/sqlalchemy.py +++ b/instana/instrumentation/sqlalchemy.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2018 -from __future__ import absolute_import import re from operator import attrgetter diff --git a/instana/instrumentation/tornado/client.py b/instana/instrumentation/tornado/client.py index 0f82a119..24e37809 100644 --- a/instana/instrumentation/tornado/client.py +++ b/instana/instrumentation/tornado/client.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import opentracing import wrapt diff --git a/instana/instrumentation/tornado/server.py b/instana/instrumentation/tornado/server.py index eccfca8c..6f3f1d28 100644 --- a/instana/instrumentation/tornado/server.py +++ b/instana/instrumentation/tornado/server.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2019 -from __future__ import absolute_import import opentracing import wrapt diff --git a/instana/instrumentation/urllib3.py b/instana/instrumentation/urllib3.py index e2f450cb..303973b5 100644 --- a/instana/instrumentation/urllib3.py +++ b/instana/instrumentation/urllib3.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2017 -from __future__ import absolute_import import opentracing import opentracing.ext.tags as ext diff --git a/instana/middleware.py b/instana/middleware.py index 5caa04fa..f731931d 100644 --- a/instana/middleware.py +++ b/instana/middleware.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2017 -from __future__ import absolute_import from .instrumentation.wsgi import InstanaWSGIMiddleware from .instrumentation.asgi import InstanaASGIMiddleware \ No newline at end of file diff --git a/instana/propagators/base_propagator.py b/instana/propagators/base_propagator.py index 9be8cc51..876b271a 100644 --- a/instana/propagators/base_propagator.py +++ b/instana/propagators/base_propagator.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import import sys diff --git a/instana/propagators/binary_propagator.py b/instana/propagators/binary_propagator.py index cf3d7926..92a294d9 100644 --- a/instana/propagators/binary_propagator.py +++ b/instana/propagators/binary_propagator.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import from instana.log import logger from instana.propagators.base_propagator import BasePropagator diff --git a/instana/propagators/http_propagator.py b/instana/propagators/http_propagator.py index 6d34d5cd..00f4afbc 100644 --- a/instana/propagators/http_propagator.py +++ b/instana/propagators/http_propagator.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import from instana.log import logger from instana.propagators.base_propagator import BasePropagator diff --git a/instana/propagators/text_propagator.py b/instana/propagators/text_propagator.py index 02af14a5..f7ecf04c 100644 --- a/instana/propagators/text_propagator.py +++ b/instana/propagators/text_propagator.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2020 -from __future__ import absolute_import from instana.log import logger from instana.propagators.base_propagator import BasePropagator diff --git a/instana/recorder.py b/instana/recorder.py index 8adec939..d5d0d714 100644 --- a/instana/recorder.py +++ b/instana/recorder.py @@ -2,7 +2,6 @@ # (c) Copyright Instana Inc. 2016 # Accept, process and queue spans for eventual reporting. -from __future__ import absolute_import import os import queue diff --git a/instana/tracer.py b/instana/tracer.py index 8f4396fd..2d1d2def 100644 --- a/instana/tracer.py +++ b/instana/tracer.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2016 -from __future__ import absolute_import import os import re diff --git a/instana/wsgi.py b/instana/wsgi.py index 666991c3..aa0d3ba6 100644 --- a/instana/wsgi.py +++ b/instana/wsgi.py @@ -1,7 +1,6 @@ # (c) Copyright IBM Corp. 2021 # (c) Copyright Instana Inc. 2017 -from __future__ import absolute_import from .instrumentation.wsgi import InstanaWSGIMiddleware