opentelemetry-instrumentation-confluent-kafka 0.48b0__tar.gz → 0.49b0__tar.gz

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-confluent-kafka
-Version: 0.48b0
+Version: 0.49b0
 Summary: OpenTelemetry Confluent Kafka instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-confluent-kafka
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.48b0
+Requires-Dist: opentelemetry-instrumentation==0.49b0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Provides-Extra: instruments
 Requires-Dist: confluent-kafka<=2.4.0,>=1.8.2; extra == 'instruments'

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.48b0",
+  "opentelemetry-instrumentation == 0.49b0",
   "opentelemetry-api ~= 1.12",
   "wrapt >= 1.0.0, < 2.0.0",
 ]

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/src/opentelemetry/instrumentation/confluent_kafka/__init__.py

@@ -97,6 +97,7 @@ The _instrument method accepts the following keyword args:
 
 ___
 """
+
 from typing import Collection
 
 import confluent_kafka
@@ -123,9 +124,7 @@ from .version import __version__
 
 class AutoInstrumentedProducer(Producer):
     # This method is deliberately implemented in order to allow wrapt to wrap this function
-    def produce(
-        self, topic, value=None, *args, **kwargs
-    ):  # pylint: disable=keyword-arg-before-vararg,useless-super-delegation
+    def produce(self, topic, value=None, *args, **kwargs):  # pylint: disable=keyword-arg-before-vararg,useless-super-delegation
         super().produce(topic, value, *args, **kwargs)
 
 
@@ -139,9 +138,7 @@ class AutoInstrumentedConsumer(Consumer):
         return super().poll(timeout)
 
     # This method is deliberately implemented in order to allow wrapt to wrap this function
-    def consume(
-        self, *args, **kwargs
-    ):  # pylint: disable=useless-super-delegation
+    def consume(self, *args, **kwargs):  # pylint: disable=useless-super-delegation
         return super().consume(*args, **kwargs)
 
     # This method is deliberately implemented in order to allow wrapt to wrap this function
@@ -163,9 +160,7 @@ class ProxiedProducer(Producer):
     def purge(self, in_queue=True, in_flight=True, blocking=True):
         self._producer.purge(in_queue, in_flight, blocking)
 
-    def produce(
-        self, topic, value=None, *args, **kwargs
-    ):  # pylint: disable=keyword-arg-before-vararg
+    def produce(self, topic, value=None, *args, **kwargs):  # pylint: disable=keyword-arg-before-vararg
         new_kwargs = kwargs.copy()
         new_kwargs["topic"] = topic
         new_kwargs["value"] = value
@@ -205,9 +200,7 @@ class ProxiedConsumer(Consumer):
             kwargs,
         )
 
-    def get_watermark_offsets(
-        self, partition, timeout=-1, *args, **kwargs
-    ):  # pylint: disable=keyword-arg-before-vararg
+    def get_watermark_offsets(self, partition, timeout=-1, *args, **kwargs):  # pylint: disable=keyword-arg-before-vararg
         return self._consumer.get_watermark_offsets(
             partition, timeout, *args, **kwargs
         )
@@ -220,9 +213,7 @@ class ProxiedConsumer(Consumer):
             self._consumer.poll, self, self._tracer, [timeout], {}
         )
 
-    def subscribe(
-        self, topics, on_assign=lambda *args: None, *args, **kwargs
-    ):  # pylint: disable=keyword-arg-before-vararg
+    def subscribe(self, topics, on_assign=lambda *args: None, *args, **kwargs):  # pylint: disable=keyword-arg-before-vararg
         self._consumer.subscribe(topics, on_assign, *args, **kwargs)
 
     def original_consumer(self):
@@ -363,7 +354,9 @@ class ConfluentKafkaInstrumentor(BaseInstrumentor):
                 headers = []
                 kwargs["headers"] = headers
 
-            topic = KafkaPropertiesExtractor.extract_produce_topic(args)
+            topic = KafkaPropertiesExtractor.extract_produce_topic(
+                args, kwargs
+            )
             _enrich_span(
                 span,
                 topic,

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/src/opentelemetry/instrumentation/confluent_kafka/utils.py

@@ -25,11 +25,9 @@ class KafkaPropertiesExtractor:
         return kwargs.get(key, default_value)
 
     @staticmethod
-    def extract_produce_topic(args):
+    def extract_produce_topic(args, kwargs):
         """extract topic from `produce` method arguments in Producer class"""
-        if len(args) > 0:
-            return args[0]
-        return "unknown"
+        return kwargs.get("topic") or (args[0] if args else "unknown")
 
     @staticmethod
     def extract_produce_headers(args, kwargs):

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/src/opentelemetry/instrumentation/confluent_kafka/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0"
+__version__ = "0.49b0"

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/tests/test_instrumentation.py

@@ -284,6 +284,15 @@ class TestConfluentKafka(TestBase):
                     expected_attribute_value, span.attributes[attribute_key]
                 )
 
+    def _assert_topic(self, span, expected_topic: str) -> None:
+        self.assertEqual(
+            span.attributes[SpanAttributes.MESSAGING_DESTINATION],
+            expected_topic,
+        )
+
+    def _assert_span_count(self, span_list, expected_count: int) -> None:
+        self.assertEqual(len(span_list), expected_count)
+
     def test_producer_poll(self) -> None:
         instrumentation = ConfluentKafkaInstrumentor()
         message_queue = []
@@ -299,6 +308,9 @@ class TestConfluentKafka(TestBase):
         producer.produce(topic="topic-1", key="key-1", value="value-1")
         msg = producer.poll()
         self.assertIsNotNone(msg)
+        span_list = self.memory_exporter.get_finished_spans()
+        self._assert_span_count(span_list, 1)
+        self._assert_topic(span_list[0], "topic-1")
 
     def test_producer_flush(self) -> None:
         instrumentation = ConfluentKafkaInstrumentor()
@@ -315,3 +327,6 @@ class TestConfluentKafka(TestBase):
         producer.produce(topic="topic-1", key="key-1", value="value-1")
         msg = producer.flush()
         self.assertIsNotNone(msg)
+        span_list = self.memory_exporter.get_finished_spans()
+        self._assert_span_count(span_list, 1)
+        self._assert_topic(span_list[0], "topic-1")

{opentelemetry_instrumentation_confluent_kafka-0.48b0 → opentelemetry_instrumentation_confluent_kafka-0.49b0}/tests/utils.py

@@ -8,9 +8,7 @@ class MockConsumer(Consumer):
         self._queue = queue
         super().__init__(config)
 
-    def consume(
-        self, num_messages=1, *args, **kwargs
-    ):  # pylint: disable=keyword-arg-before-vararg
+    def consume(self, num_messages=1, *args, **kwargs):  # pylint: disable=keyword-arg-before-vararg
         messages = self._queue[:num_messages]
         self._queue = self._queue[num_messages:]
         return messages
@@ -62,9 +60,7 @@ class MockedProducer(Producer):
         self._queue = queue
         super().__init__(config)
 
-    def produce(
-        self, *args, **kwargs
-    ):  # pylint: disable=keyword-arg-before-vararg
+    def produce(self, *args, **kwargs):  # pylint: disable=keyword-arg-before-vararg
         self._queue.append(
             MockedMessage(
                 topic=kwargs.get("topic"),