Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib into instr

Author: lzchen

Diff for: CHANGELOG.md

@@ -6,9 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.3.0-0.22b0...HEAD)
+- `opentelemetry-sdk-extension-aws` Update AWS entry points to match spec
+  ([#566](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/566))
 - Include Flask 2.0 as compatible with existing flask instrumentation
   ([#545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/545))
-
+- `openelemetry-sdk-extension-aws` Take a dependency on `opentelemetry-sdk`
+  ([#558](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/558))
 ### Changed
 - `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
   ([#499](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/499))
@@ -21,8 +24,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/538))
 - Changed the psycopg2-binary to psycopg2 as dependency in production
   ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543))
-- Implement consistent way of checking if instrumentation is already instrumented
+- Implement consistent way of checking if instrumentation is already active
   ([#549](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/549))
+- Require aiopg to be less than 1.3.0
+  ([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560))
+- `opentelemetry-instrumentation-django` Migrated Django middleware to new-style.
+  ([#533](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/533))
 
 ### Added
 - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation

Diff for: docs-requirements.txt

@@ -8,6 +8,7 @@ sphinx-autodoc-typehints
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
 -e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
+-e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http"
 
 # Required by opentelemetry-instrumentation
 fastapi>=0.65.2
@@ -19,7 +20,7 @@ django>=2.2
 
 # Required by instrumentation and exporter packages
 aiohttp~=3.0
-aiopg>=0.13.0
+aiopg>=0.13.0,<1.3.0
 asyncpg>=0.12.0
 boto~=2.0
 botocore~=1.0

Diff for: instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py

@@ -1,7 +1,10 @@
 import typing
 
 import wrapt
-from aiopg.utils import _ContextManager, _PoolAcquireContextManager
+from aiopg.utils import (  # pylint: disable=no-name-in-module
+    _ContextManager,
+    _PoolAcquireContextManager,
+)
 
 from opentelemetry.instrumentation.dbapi import (
     CursorTracer,
@@ -61,7 +64,9 @@ def __init__(self, connection, *args, **kwargs):
 
         def cursor(self, *args, **kwargs):
             coro = self._cursor(*args, **kwargs)
-            return _ContextManager(coro)
+            return _ContextManager(  # pylint: disable=no-value-for-parameter
+                coro
+            )
 
         async def _cursor(self, *args, **kwargs):
             # pylint: disable=protected-access

Diff for: instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("aiopg >= 0.13.0",)
+_instruments = ("aiopg >= 0.13.0, < 1.3.0",)

Diff for: instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py

@@ -34,7 +34,10 @@
 
 import aiopg
 import wrapt
-from aiopg.utils import _ContextManager, _PoolContextManager
+from aiopg.utils import (  # pylint: disable=no-name-in-module
+    _ContextManager,
+    _PoolContextManager,
+)
 
 from opentelemetry.instrumentation.aiopg.aiopg_integration import (
     AiopgIntegration,
@@ -108,7 +111,7 @@ def wrap_connect_(
             version=version,
             tracer_provider=tracer_provider,
         )
-        return _ContextManager(
+        return _ContextManager(  # pylint: disable=no-value-for-parameter
             db_integration.wrapped_connection(wrapped, args, kwargs)
         )
 

Diff for: instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py

@@ -17,7 +17,10 @@
 from unittest.mock import MagicMock
 
 import aiopg
-from aiopg.utils import _ContextManager, _PoolAcquireContextManager
+from aiopg.utils import (  # pylint: disable=no-name-in-module
+    _ContextManager,
+    _PoolAcquireContextManager,
+)
 
 import opentelemetry.instrumentation.aiopg
 from opentelemetry import trace as trace_api
@@ -542,7 +545,7 @@ def __init__(self, database, server_port, server_host, user):
     # pylint: disable=no-self-use
     def cursor(self):
         coro = self._cursor()
-        return _ContextManager(coro)
+        return _ContextManager(coro)  # pylint: disable=no-value-for-parameter
 
     async def _cursor(self):
         return MockCursor()

Diff for: instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_middleware.py

@@ -14,7 +14,7 @@
 
 import sys
 import unittest
-import unittest.mock as mock
+from unittest import mock
 
 import opentelemetry.instrumentation.asgi as otel_asgi
 from opentelemetry import trace as trace_api

Diff for: instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py

@@ -16,6 +16,7 @@
 from time import time
 from typing import Callable
 
+from django import VERSION as django_version
 from django.http import HttpRequest, HttpResponse
 
 from opentelemetry.context import attach, detach
@@ -42,10 +43,31 @@
 except ImportError:
     from django.urls import Resolver404, resolve
 
-try:
-    from django.utils.deprecation import MiddlewareMixin
-except ImportError:
-    MiddlewareMixin = object
+DJANGO_2_0 = django_version >= (2, 0)
+
+if DJANGO_2_0:
+    # Since Django 2.0, only `settings.MIDDLEWARE` is supported, so new-style
+    # middlewares can be used.
+    class MiddlewareMixin:
+        def __init__(self, get_response):
+            self.get_response = get_response
+
+        def __call__(self, request):
+            self.process_request(request)
+            response = self.get_response(request)
+            return self.process_response(request, response)
+
+
+else:
+    # Django versions 1.x can use `settings.MIDDLEWARE_CLASSES` and expect
+    # old-style middlewares, which are created by inheriting from
+    # `deprecation.MiddlewareMixin` since its creation in Django 1.10 and 1.11,
+    # or from `object` for older versions.
+    try:
+        from django.utils.deprecation import MiddlewareMixin
+    except ImportError:
+        MiddlewareMixin = object
+
 
 _logger = getLogger(__name__)
 _attributes_by_preference = [

Diff for: instrumentation/opentelemetry-instrumentation-grpc/tests/_server.py

@@ -79,6 +79,7 @@ def BidirectionalStreamingMethod(self, request_iterator, context):
 
 
 def create_test_server(port):
+    # pylint: disable=consider-using-with
     server = grpc.server(futures.ThreadPoolExecutor(max_workers=1))
 
     test_server_pb2_grpc.add_GRPCTestServerServicer_to_server(