mirror of
https://github.com/open-telemetry/opentelemetry-python-contrib.git
synced 2025-07-30 13:43:03 +08:00
Migrate Django middleware to new-style (#533)
This commit is contained in:

committed by
GitHub

parent
c100b21fa4
commit
b2802ddd21
@ -23,6 +23,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
|
||||
|
@ -16,6 +16,7 @@ from logging import getLogger
|
||||
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 @@ try:
|
||||
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 = [
|
||||
|
Reference in New Issue
Block a user