opentelemetry-instrumentation-confluent-kafka 0.48b0__py3-none-any.whl → 0.49b1__py3-none-any.whl

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/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/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.49b1"

{opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info → opentelemetry_instrumentation_confluent_kafka-0.49b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-confluent-kafka
-Version: 0.48b0
+Version: 0.49b1
 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.49b1
 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.49b1.dist-info/RECORD

@@ -0,0 +1,9 @@
+opentelemetry/instrumentation/confluent_kafka/__init__.py,sha256=jBSO3Ygop_QTMrcn5lMQkeBEYsaVZtuAEqj1bNeRu4E,14235
+opentelemetry/instrumentation/confluent_kafka/package.py,sha256=qHUkPcyPmxXSU2ztkYUBTixbJ0dzXJA_idhtkw73_RI,641
+opentelemetry/instrumentation/confluent_kafka/utils.py,sha256=EAxdWdx_36rMAbxLnc9Pf2ANZY-CLLBIxQSagZYsSpI,4508
+opentelemetry/instrumentation/confluent_kafka/version.py,sha256=h6dsqBsePrrYeyzZnEEQ3BnuIeH-0Z6C9cW0S1NrUFQ,608
+opentelemetry_instrumentation_confluent_kafka-0.49b1.dist-info/METADATA,sha256=offXuRiRluCQzmja92DLRJCpzExLUzjbv8J7jtYKATI,1908
+opentelemetry_instrumentation_confluent_kafka-0.49b1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+opentelemetry_instrumentation_confluent_kafka-0.49b1.dist-info/entry_points.txt,sha256=hAIEwx8JI8eFsUgk3ewaMdYw215At11XX-1a4WjAHBY,120
+opentelemetry_instrumentation_confluent_kafka-0.49b1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentelemetry_instrumentation_confluent_kafka-0.49b1.dist-info/RECORD,,

opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info/RECORD

@@ -1,9 +0,0 @@
-opentelemetry/instrumentation/confluent_kafka/__init__.py,sha256=bMfMwSQoSINvstmUEPe5-OCzPq_gZXdtmD_7_aVTf94,14266
-opentelemetry/instrumentation/confluent_kafka/package.py,sha256=qHUkPcyPmxXSU2ztkYUBTixbJ0dzXJA_idhtkw73_RI,641
-opentelemetry/instrumentation/confluent_kafka/utils.py,sha256=2fGEUpZNKtw2oels6lEYczVuOq1_tJmRjIcaH-3L1Sw,4507
-opentelemetry/instrumentation/confluent_kafka/version.py,sha256=wOX_9uGRBIlLks98mTGJZnnmD1Zez4rGVQNmP23fWEc,608
-opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info/METADATA,sha256=2VHnwdHzrl1_9U76HuhItzrNiVJbnEljrvCvsNLyARI,1908
-opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info/entry_points.txt,sha256=hAIEwx8JI8eFsUgk3ewaMdYw215At11XX-1a4WjAHBY,120
-opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentelemetry_instrumentation_confluent_kafka-0.48b0.dist-info/RECORD,,