Use opentelemetry-instrumentation-aiohttp-server from upstream

closes #5833
pulp · Oct 2, 2024 · dcad800 · dcad800
1 parent 2ad8582
commit dcad800
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 268 deletions.
diff --git a/CHANGES/5833.feature b/CHANGES/5833.feature
@@ -0,0 +1 @@
+Started using an upstream version of the OpenTelemetry aiohttp server instrumentation.
diff --git a/pulpcore/content/__init__.py b/pulpcore/content/__init__.py
@@ -8,7 +8,7 @@
 from asgiref.sync import sync_to_async
 from aiohttp import web
 
-from .instrumentation import middleware as instrumentation
+from opentelemetry.instrumentation.aiohttp_server import middleware as instrumentation
 
 import django
 

diff --git a/pulpcore/content/instrumentation.py b/pulpcore/content/instrumentation.py
diff --git a/requirements.txt b/requirements.txt
@@ -26,6 +26,7 @@ PyOpenSSL<25.0
 opentelemetry-distro[otlp]>=0.45b0,<=0.48b0
 opentelemetry-exporter-otlp-proto-http>=1.24.0,<=1.27.0
 opentelemetry-instrumentation-wsgi>=0.45b,<=0.48b0
+opentelemetry-instrumentation-aiohttp-server>=0.45b,<=0.48b
 protobuf>=4.21.1,<5.0
 pulp-glue>=0.18.0,<0.30
 pygtrie>=2.5,<=2.5.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Started using an upstream version of the OpenTelemetry aiohttp server instrumentation.