Merge branch 'main' into psycopg3-instrumentation

Author: lzchen

instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

@@ -33,10 +33,6 @@ dependencies = [
 instruments = [
   "asyncpg >= 0.12.0",
 ]
-test = [
-  "opentelemetry-instrumentation-asyncpg[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 asyncpg = "opentelemetry.instrumentation.asyncpg:AsyncPGInstrumentor"

instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt

@@ -0,0 +1,19 @@
+asgiref==3.7.2
+async-timeout==4.0.3
+asyncpg==0.29.0
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-asyncpg

instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py

@@ -390,15 +390,15 @@ def response_hook(span, request, response):
         self.assertIsInstance(response_hook_args[2], HttpResponse)
         self.assertEqual(response_hook_args[2], response)
 
-    async def test_trace_parent(self):
+    def test_trace_parent(self):
         id_generator = RandomIdGenerator()
         trace_id = format_trace_id(id_generator.generate_trace_id())
         span_id = format_span_id(id_generator.generate_span_id())
         traceparent_value = f"00-{trace_id}-{span_id}-01"
 
         Client().get(
             "/span_name/1234/",
-            traceparent=traceparent_value,
+            HTTP_TRACEPARENT=traceparent_value,
         )
         span = self.memory_exporter.get_finished_spans()[0]
 

tox.ini

@@ -343,7 +343,7 @@ commands_pre =
 
   wsgi: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt
 
-  asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
+  asyncpg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
 
   aws-lambda: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda[test]
 
@@ -604,8 +604,8 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
@@ -630,7 +630,7 @@ deps =
   amqp==5.2.0
   asgiref==3.7.2
   async-timeout==4.0.3
-  asyncpg==0.27.0
+  asyncpg==0.29.0
   attrs==23.2.0
   bcrypt==4.1.2
   billiard==4.2.0