Merge branch 'main' into checking-parent-spans-current-context

Author: andresbeckruiz

CHANGELOG.md

@@ -6,6 +6,8 @@ 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))
 
@@ -23,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543))
 - 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

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
@@ -48,10 +49,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 = [

sdk-extension/opentelemetry-sdk-extension-aws/README.rst

@@ -53,7 +53,7 @@ This can be done by either setting this environment variable:
 
 ::
 
-    export OTEL_PROPAGATORS = aws_xray
+    export OTEL_PROPAGATORS = xray
 
 
 Or by setting this propagator in your instrumented application:

sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg

@@ -42,9 +42,9 @@ install_requires =
 
 [options.entry_points]
 opentelemetry_propagator =
-    aws_xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AwsXRayFormat
+    xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AwsXRayFormat
 opentelemetry_id_generator =
-    aws_xray = opentelemetry.sdk.extension.aws.trace.aws_xray_id_generator:AwsXRayIdGenerator
+    xray = opentelemetry.sdk.extension.aws.trace.aws_xray_id_generator:AwsXRayIdGenerator
 
 [options.extras_require]
 test =

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py

@@ -31,7 +31,7 @@
 
 ::
 
-    export OTEL_PROPAGATORS = aws_xray
+    export OTEL_PROPAGATORS = xray
 
 
 Or by setting this propagator in your instrumented application: