Merge branch 'main' into per-package-release-2

open-telemetry · Oct 1, 2024 · 0c816c2 · 0c816c2
2 parents 8694c57 + eccb05c
commit 0c816c2
Show file tree

Hide file tree

Showing 87 changed files with 395 additions and 104 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -61,5 +61,8 @@ components:
   instrumentation/opentelemetry-instrumentation-psycopg:
     - federicobond
 
+  instrumentation/opentelemetry-instrumentation-aiokafka:
+    - dimastbk
+
   processor/opentelemetry-processor-baggage:
     - codeboten
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-aiokafka` Add instrumentor and auto instrumentation support for aiokafka
   ([#2082](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2082))
 
+
+### Fixed
+
+- `opentelemetry-instrumentation-aiokafka` Wrap `AIOKafkaConsumer.getone()` instead of `AIOKafkaConsumer.__anext__`
+  ([#2874](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2874))
+
 ## Version 1.27.0/0.48b0 ()
 
 ### Added

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -16,7 +16,7 @@ pytest==7.4.4
 python-snappy==0.7.1
 requests==2.32.3
 tomli==2.0.1
-typing_extensions==4.10.0
+typing_extensions==4.12.2
 urllib3==2.2.2
 wrapt==1.16.0
 zipp==3.19.2

diff --git a/exporter/opentelemetry-exporter-richconsole/test-requirements.txt b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
@@ -12,7 +12,7 @@ Pygments==2.17.2
 pytest==7.4.4
 rich==13.7.1
 tomli==2.0.1
-typing_extensions==4.10.0
+typing_extensions==4.12.2
 wrapt==1.16.0
 zipp==3.19.2
 -e exporter/opentelemetry-exporter-richconsole
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
@@ -12,7 +12,7 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
-typing_extensions==4.9.0
+typing_extensions==4.12.2
 wrapt==1.16.0
 yarl==1.9.4
 zipp==3.19.2

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -12,7 +12,7 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
-typing_extensions==4.9.0
+typing_extensions==4.12.2
 wrapt==1.16.0
 yarl==1.9.4
 zipp==3.19.2

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
@@ -12,7 +12,7 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
-typing_extensions==4.9.0
+typing_extensions==4.12.2
 wrapt==1.16.0
 yarl==1.9.4
 zipp==3.19.2

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt
@@ -12,7 +12,7 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
-typing_extensions==4.9.0
+typing_extensions==4.12.2
 wrapt==1.16.0
 yarl==1.9.4
 zipp==3.19.2

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -23,7 +23,7 @@ py-cpuinfo==9.0.0
 pytest==7.4.4
 requests==2.32.3
 tomli==2.0.1
-typing_extensions==4.10.0
+typing_extensions==4.12.2
 urllib3==2.2.2
 Werkzeug==3.0.3
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
@@ -15,7 +15,7 @@ pytest==7.4.4
 pytest-aiohttp==1.0.5
 pytest-asyncio==0.23.5
 tomli==2.0.1
-typing_extensions==4.10.0
+typing_extensions==4.12.2
 wrapt==1.16.0
 yarl==1.9.4
 zipp==3.19.2

diff --git a/...telemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/__init__.py b/...telemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/__init__.py
@@ -76,7 +76,7 @@ async def async_consume_hook(span, record, args, kwargs):
 from opentelemetry import trace
 from opentelemetry.instrumentation.aiokafka.package import _instruments
 from opentelemetry.instrumentation.aiokafka.utils import (
-    _wrap_anext,
+    _wrap_getone,
     _wrap_send,
 )
 from opentelemetry.instrumentation.aiokafka.version import __version__
@@ -126,10 +126,10 @@ def _instrument(self, **kwargs):
         )
         wrap_function_wrapper(
             aiokafka.AIOKafkaConsumer,
-            "__anext__",
-            _wrap_anext(tracer, async_consume_hook),
+            "getone",
+            _wrap_getone(tracer, async_consume_hook),
         )
 
     def _uninstrument(self, **kwargs):
         unwrap(aiokafka.AIOKafkaProducer, "send")
-        unwrap(aiokafka.AIOKafkaConsumer, "__anext__")
+        unwrap(aiokafka.AIOKafkaConsumer, "getone")
diff --git a/...pentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/utils.py b/...pentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/utils.py
@@ -335,7 +335,7 @@ async def _create_consumer_span(
         context.detach(token)
 
 
-def _wrap_anext(
+def _wrap_getone(
     tracer: Tracer, async_consume_hook: ConsumeHookT
 ) -> Callable[..., Awaitable[aiokafka.ConsumerRecord]]:
     async def _traced_next(