feat: Drop support for Python 2, webapp2, suds-jurko, asynqp

* Drop support for Python 2, and everything below the last
  supported version of the Python Software Foundation, which is
  everyting below Python 3.7
* Modernise the code accordingly
  - Import from collections.abc
  - Stop using distutils as it is slasted for removal,
    and already emits constant warnings.
* Add full support for Python 3.10
* Drop webapp2 as it was Python 2 only, now abandoned
* Drop suds-jurko as it is an abandoned library
* Drop asynqp as it is an abandoned library

* Drop support for the `INSTANA_MAGIC` mechanism,
  which has been removed from `autotrace-dynamic`
  more than two years ago.

Author: Ferenc-

.circleci/config.yml

@@ -5,24 +5,6 @@ version: 2.1
 #   ruby: circleci/[email protected]
 
 commands:
-  pip-install-deps-27:
-    parameters:
-      requirements:
-        default: "tests/requirements-27.txt"
-        type: string
-    steps:
-      - run:
-          name: Install Python 2.7 Dependencies
-          command: |
-            rm -rf venv
-            export PATH=/home/circleci/.local/bin:$PATH
-            pip install -U pip setuptools virtualenv wheel
-            virtualenv --python=python2.7 --always-copy venv
-            . venv/bin/activate
-            pip install 'wheel>=0.29.0'
-            pip install -r requirements.txt
-            pip install -r <<parameters.requirements>>
-
   pip-install-deps:
     parameters:
       requirements:
@@ -31,12 +13,9 @@ commands:
     steps:
       - run:
           name: Install Python Dependencies
-          # TODO: Remove the pinning of setuptools
-          # as soon as we get rid of suds-jurko
           command: |
             python -m venv venv
             . venv/bin/activate
-            pip install --upgrade 'setuptools<58'
             pip install --upgrade pip
             pip install 'wheel>=0.29.0'
             pip install -r requirements.txt
@@ -57,39 +36,6 @@ commands:
             sudo apt install libcouchbase-dev -y
 
 jobs:
-  python27:
-    docker:
-      - image: cimg/python:2.7.18
-      - image: cimg/postgres:9.6.24
-        environment:
-          POSTGRES_USER: root
-          POSTGRES_PASSWORD: ''
-          POSTGRES_DB: circle_test
-      - image: cimg/mariadb:10.6.7
-      - image: cimg/redis:5.0.14
-      - image: rabbitmq:3.9.13
-      - image: mongo:4.2.3
-      - image: singularities/pubsub-emulator
-        environment:
-          PUBSUB_PROJECT_ID: "project-test"
-          PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432"
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          name: Install MySQL Dependencies
-          command: |
-            sudo apt update
-            sudo apt install libmysqlclient-dev
-      - pip-install-deps-27
-      - run:
-          name: run tests
-          environment:
-            INSTANA_TEST: "true"
-          command: |
-            . venv/bin/activate
-            pytest -v
-
   python37:
     docker:
       - image: cimg/python:3.7.13
@@ -228,49 +174,9 @@ jobs:
             . venv/bin/activate
             pytest -v tests/clients/test_couchbase.py
 
-  py27couchbase:
-    docker:
-      - image: cimg/python:2.7.18
-      - image: couchbase/server-sandbox:5.5.0
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - install-couchbase-deps
-      - pip-install-deps-27:
-          requirements: "tests/requirements-couchbase.txt"
-      - run:
-          name: run tests
-          environment:
-            INSTANA_TEST: "true"
-            COUCHBASE_TEST: "true"
-          command: |
-            . venv/bin/activate
-            pytest -v tests/clients/test_couchbase.py
-
-  py27cassandra:
+  py37cassandra:
     docker:
-      - image: cimg/python:2.7.16
-      - image: cassandra:3.11
-        environment:
-          MAX_HEAP_SIZE: 2048m
-          HEAP_NEWSIZE: 512m
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - pip-install-deps-27:
-          requirements: "tests/requirements-cassandra.txt"
-      - run:
-          name: run tests
-          environment:
-            INSTANA_TEST: "true"
-            CASSANDRA_TEST: "true"
-          command: |
-            . venv/bin/activate
-            pytest -v tests/clients/test_cassandra-driver.py
-
-  py36cassandra:
-    docker:
-      - image: cimg/python:3.6.15
+      - image: cimg/python:3.7.13
       - image: cassandra:3.11
         environment:
           MAX_HEAP_SIZE: 2048m
@@ -289,47 +195,7 @@ jobs:
             . venv/bin/activate
             pytest -v tests/clients/test_cassandra-driver.py
 
-  py37asynqp:
-    docker:
-      - image: cimg/python:3.7.13
-      - image: rabbitmq:3.9.13
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - pip-install-deps:
-          requirements: "tests/requirements-asynqp.txt"
-      - run:
-          name: run tests
-          environment:
-            INSTANA_TEST: "true"
-            ASYNQP_TEST: "true"
-          command: |
-            . venv/bin/activate
-            # We uninstall uvloop as it interferes with asyncio changing the event loop policy
-            pip uninstall -y uvloop
-            pytest -v tests/clients/test_asynqp.py
-
-  py37asynqp-legacy:
-    docker:
-      - image: cimg/python:3.7.13
-      - image: rabbitmq:3.9.13
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - pip-install-deps:
-          requirements: "tests/requirements-asynqp-legacy-flask-markupsafe.txt"
-      - run:
-          name: run tests
-          environment:
-            INSTANA_TEST: "true"
-            ASYNQP_TEST: "true"
-          command: |
-            . venv/bin/activate
-            # We uninstall uvloop as it interferes with asyncio changing the event loop policy
-            pip uninstall -y uvloop
-            pytest -v tests/clients/test_asynqp.py
-
-  gevent38:
+  py38gevent:
     docker:
       - image: cimg/python:3.8.12
     working_directory: ~/repo
@@ -350,14 +216,10 @@ workflows:
   version: 2
   build:
     jobs:
-      - python27
       - python37
       - python38
       - python39
       - python310
-      - py27cassandra
-      - py36cassandra
-      - py37asynqp
-      - py37asynqp-legacy
+      - py37cassandra
       - py38couchbase
-      - gevent38
+      - py38gevent

README.md

@@ -6,7 +6,7 @@
 
 The `instana` Python package collects key metrics and distributed traces for [Instana](https://www.instana.com/).
 
-This package supports Python 2.7 or greater.
+This package supports Python 3.7 or greater.
 
 Any and all feedback is welcome.  Happy Python visibility.
 

bin/aws-lambda/build_and_publish_lambda_layer.py

@@ -85,7 +85,7 @@
                              "Provides Instana tracing and monitoring of AWS Lambda functions built with Python",
                              "--license-info", "MIT", "--output", "json",
                              "--layer-name", LAYER_NAME, "--zip-file", aws_zip_filename,
-                             "--compatible-runtimes", "python2.7", "python3.6", "python3.7", "python3.8"])
+                             "--compatible-runtimes", "python3.7", "python3.8", "python3.9", "python3.10"])
 
     json_data = json.loads(response)
     version = json_data['Version']

example/asyncio/README.md

@@ -1,11 +1,11 @@
 # Asyncio Examples
 
-This directory includes an example asyncio application and client with aiohttp and asynqp used for testing.
+This directory includes an example asyncio application and client with aiohttp and aio-pika used for testing.
 
 # Requirements
 
-* Python 3.5 or greater
-* instana, aiohttp and asynqp Python packages installed
+* Python 3.7 or greater
+* instana, aiohttp and aio-pika Python packages installed
 * A RabbitMQ server with it's location specified in the `RABBITMQ_HOST` environment variable
 
 
@@ -36,5 +36,8 @@ Some example traces from local tests.
 aiohttp client calling aiohttp server:
 ![screen shot 2019-02-25 at 19 12 28](https://user-images.githubusercontent.com/395132/53401921-0f49cc00-39b1-11e9-8606-24844925a478.png)
 
-aiohttp server making multiple asynqp calls (publish & consume)
+aiohttp server making multiple aio-pika calls (publish & consume)
+<!--
+#TODO: Add new screenshot once we actually have the aio-pika support
+-->
 ![screen shot 2019-02-26 at 10 21 50](https://user-images.githubusercontent.com/395132/53401997-2e485e00-39b1-11e9-97fd-460b136cf92a.png)

example/asyncio/aioclient.py

@@ -14,7 +14,7 @@ async def test():
         await asyncio.sleep(2)
         with async_tracer.start_active_span('JobRunner'):
             async with aiohttp.ClientSession() as session:
-                    # aioserver exposes /, /401, /500 & /publish (via asynqp)
+                    # aioserver exposes /, /401, /500 & /publish
                     async with session.get("http://localhost:5102/publish?secret=iloveyou") as response:
                         print(response.status)
 

example/asyncio/aioserver.py

@@ -3,6 +3,7 @@
 
 import os
 import asyncio
+# TODO: Change asynqp to aio-pika once it is fully supported
 import asynqp
 from aiohttp import web
 

instana/__init__.py

@@ -107,15 +107,6 @@ def lambda_handler(event, context):
             print("Couldn't determine and locate default function handler: %s.%s" % (module_name, function_name))
 
 
-def boot_agent_later():
-    """ Executes <boot_agent> in the future! """
-    if 'gevent' in sys.modules:
-        import gevent  # pylint: disable=import-outside-toplevel
-        gevent.spawn_later(2.0, boot_agent)
-    else:
-        Timer(2.0, boot_agent).start()
-
-
 def boot_agent():
     """Initialize the Instana agent and conditionally load auto-instrumentation."""
     # Disable all the unused-import violations in this function
@@ -129,31 +120,21 @@ def boot_agent():
         # Import & initialize instrumentation
         from .instrumentation.aws import lambda_inst
 
-        if sys.version_info >= (3, 7, 0):
-            from .instrumentation import sanic_inst
+        from .instrumentation import sanic_inst
 
-        if sys.version_info >= (3, 6, 0):
-            from .instrumentation import fastapi_inst
-            from .instrumentation import starlette_inst
+        from .instrumentation import fastapi_inst
+        from .instrumentation import starlette_inst
 
-        if sys.version_info >= (3, 5, 3):
-            from .instrumentation import asyncio
-            from .instrumentation.aiohttp import client
-            from .instrumentation.aiohttp import server
-            from .instrumentation import boto3_inst
+        from .instrumentation import asyncio
+        from .instrumentation.aiohttp import client
+        from .instrumentation.aiohttp import server
+        from .instrumentation import boto3_inst
 
-        if sys.version_info >= (3, 5, 3) and sys.version_info < (3, 8, 0):
-            from .instrumentation import asynqp
 
-        if sys.version_info[0] < 3:
-            from .instrumentation import mysqlpython
-            from .instrumentation import webapp2_inst
-        else:
-            from .instrumentation import mysqlclient
+        from .instrumentation import mysqlclient
 
-        if sys.version_info[0] >= 3:
-            from .instrumentation.google.cloud import storage
-            from .instrumentation.google.cloud import pubsub
+        from .instrumentation.google.cloud import storage
+        from .instrumentation.google.cloud import pubsub
 
         from .instrumentation.celery import hooks
 
@@ -170,7 +151,6 @@ def boot_agent():
         from .instrumentation import psycopg2
         from .instrumentation import redis
         from .instrumentation import sqlalchemy
-        from .instrumentation import sudsjurko
         from .instrumentation import urllib3
         from .instrumentation.django import middleware
         from .instrumentation import pymongo
@@ -195,12 +175,4 @@ def boot_agent():
             if profiler:
                 profiler.start()
 
-        if "INSTANA_MAGIC" in os.environ:
-            pkg_resources.working_set.add_entry("/tmp/.instana/python")
-            # The following path is deprecated: To be removed at a future date
-            pkg_resources.working_set.add_entry("/tmp/instana/python")
-
-            # If we're being loaded into an already running process, then delay agent initialization
-            boot_agent_later()
-        else:
-            boot_agent()
+        boot_agent()

instana/autoprofile/runtime.py

@@ -10,8 +10,6 @@ class runtime_info(object):
     OS_LINUX = (sys.platform.startswith('linux'))
     OS_DARWIN = (sys.platform == 'darwin')
     OS_WIN = (sys.platform == 'win32')
-    PYTHON_2 = (sys.version_info.major == 2)
-    PYTHON_3 = (sys.version_info.major == 3)
     GEVENT = False
 
 try: