Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib into django-issue-fix

Author: rads-1996

CHANGELOG.md

@@ -31,9 +31,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3731](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3731))
 - Fix documentation order of sections and headers for Django, Flask, MySQL, mysqlclient, psycopg, psycopg2, pymysql, sqlalchemy instrumentations.
   ([#3719](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3719))
+- `opentelemetry-instrumentation-httpx`: fix missing metric response attributes when tracing is disabled
+  ([#3615](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3615))
 
 ### Added
 
+- `opentelemetry-util-genai` Add a utility to parse the `OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT` environment variable.
+  Add `gen_ai_latest_experimental` as a new value to the Sem Conv stability flag ([#3716](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3716)).
 - `opentelemetry-instrumentation-confluent-kafka` Add support for confluent-kafka <=2.11.0
   ([#3685](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3685))
 - `opentelemetry-instrumentation-system-metrics`: Add `cpython.gc.collected_objects` and `cpython.gc.uncollectable_objects` metrics
@@ -42,6 +46,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3366](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3366))
 - `opentelemetry-instrumentation`: add support for  `OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH` to inform opentelemetry-instrument about gevent monkeypatching
   ([#3699](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3699))
+- `opentelemetry-instrumentation-botocore`: Add support for SNS semantic convention attribute aws.sns.topic.arn
+  ([#3734](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3734))
+- `opentelemetry-instrumentation`: botocore: upgrade moto package from 5.0.9 to 5.1.11
+  ([#3736](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3736))
 
 ## Version 1.36.0/0.57b0 (2025-07-29)
 

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/span_builder.py

@@ -16,13 +16,22 @@
 from aio_pika.abc import AbstractChannel, AbstractMessage
 
 from opentelemetry.instrumentation.utils import is_instrumentation_enabled
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+    MESSAGING_OPERATION,
+    MESSAGING_SYSTEM,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
+    NET_PEER_NAME,
+    NET_PEER_PORT,
+)
 from opentelemetry.semconv.trace import (
     MessagingOperationValues,
     SpanAttributes,
 )
 from opentelemetry.trace import Span, SpanKind, Tracer
 
-_DEFAULT_ATTRIBUTES = {SpanAttributes.MESSAGING_SYSTEM: "rabbitmq"}
+_DEFAULT_ATTRIBUTES = {MESSAGING_SYSTEM: "rabbitmq"}
 
 
 class SpanBuilder:
@@ -44,6 +53,8 @@ def set_operation(self, operation: MessagingOperationValues):
 
     def set_destination(self, destination: str):
         self._destination = destination
+        # TODO: Update this implementation once the semantic conventions for messaging stabilize
+        # See: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/messaging.md
         self._attributes[SpanAttributes.MESSAGING_DESTINATION] = destination
 
     def set_channel(self, channel: AbstractChannel):
@@ -61,17 +72,15 @@ def set_channel(self, channel: AbstractChannel):
             url = connection.url
         self._attributes.update(
             {
-                SpanAttributes.NET_PEER_NAME: url.host,
-                SpanAttributes.NET_PEER_PORT: url.port or 5672,
+                NET_PEER_NAME: url.host,
+                NET_PEER_PORT: url.port or 5672,
             }
         )
 
     def set_message(self, message: AbstractMessage):
         properties = message.properties
         if properties.message_id:
-            self._attributes[SpanAttributes.MESSAGING_MESSAGE_ID] = (
-                properties.message_id
-            )
+            self._attributes[MESSAGING_MESSAGE_ID] = properties.message_id
         if properties.correlation_id:
             self._attributes[SpanAttributes.MESSAGING_CONVERSATION_ID] = (
                 properties.correlation_id
@@ -81,10 +90,10 @@ def build(self) -> Optional[Span]:
         if not is_instrumentation_enabled():
             return None
         if self._operation:
-            self._attributes[SpanAttributes.MESSAGING_OPERATION] = (
-                self._operation.value
-            )
+            self._attributes[MESSAGING_OPERATION] = self._operation.value
         else:
+            # TODO: Update this implementation once the semantic conventions for messaging stabilize
+            # See: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/messaging.md
             self._attributes[SpanAttributes.MESSAGING_TEMP_DESTINATION] = True
         span = self._tracer.start_span(
             self._generate_span_name(),

instrumentation/opentelemetry-instrumentation-aio-pika/tests/consts.py

@@ -6,7 +6,7 @@
 AIOPIKA_VERSION_INFO = tuple(int(v) for v in aiopika_version.split("."))
 MESSAGE_ID = "meesage_id"
 CORRELATION_ID = "correlation_id"
-MESSAGING_SYSTEM = "rabbitmq"
+MESSAGING_SYSTEM_VALUE = "rabbitmq"
 EXCHANGE_NAME = "exchange_name"
 QUEUE_NAME = "queue_name"
 ROUTING_KEY = "routing_key"

instrumentation/opentelemetry-instrumentation-aio-pika/tests/test_callback_decorator.py

@@ -19,6 +19,15 @@
 from opentelemetry.instrumentation.aio_pika.callback_decorator import (
     CallbackDecorator,
 )
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+    MESSAGING_OPERATION,
+    MESSAGING_SYSTEM,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
+    NET_PEER_NAME,
+    NET_PEER_PORT,
+)
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import SpanKind, get_tracer
 
@@ -30,7 +39,7 @@
     EXCHANGE_NAME,
     MESSAGE,
     MESSAGE_ID,
-    MESSAGING_SYSTEM,
+    MESSAGING_SYSTEM_VALUE,
     QUEUE_NAME,
     SERVER_HOST,
     SERVER_PORT,
@@ -40,13 +49,13 @@
 @skipIf(AIOPIKA_VERSION_INFO >= (8, 0), "Only for aio_pika 7")
 class TestInstrumentedQueueAioRmq7(TestCase):
     EXPECTED_ATTRIBUTES = {
-        SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
+        MESSAGING_SYSTEM: MESSAGING_SYSTEM_VALUE,
         SpanAttributes.MESSAGING_DESTINATION: EXCHANGE_NAME,
-        SpanAttributes.NET_PEER_NAME: SERVER_HOST,
-        SpanAttributes.NET_PEER_PORT: SERVER_PORT,
-        SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,
+        NET_PEER_NAME: SERVER_HOST,
+        NET_PEER_PORT: SERVER_PORT,
+        MESSAGING_MESSAGE_ID: MESSAGE_ID,
         SpanAttributes.MESSAGING_CONVERSATION_ID: CORRELATION_ID,
-        SpanAttributes.MESSAGING_OPERATION: "receive",
+        MESSAGING_OPERATION: "receive",
     }
 
     def setUp(self):
@@ -80,13 +89,13 @@ def test_decorate_callback(self):
 @skipIf(AIOPIKA_VERSION_INFO <= (8, 0), "Only for aio_pika 8")
 class TestInstrumentedQueueAioRmq8(TestCase):
     EXPECTED_ATTRIBUTES = {
-        SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
+        MESSAGING_SYSTEM: MESSAGING_SYSTEM_VALUE,
         SpanAttributes.MESSAGING_DESTINATION: EXCHANGE_NAME,
-        SpanAttributes.NET_PEER_NAME: SERVER_HOST,
-        SpanAttributes.NET_PEER_PORT: SERVER_PORT,
-        SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,
+        NET_PEER_NAME: SERVER_HOST,
+        NET_PEER_PORT: SERVER_PORT,
+        MESSAGING_MESSAGE_ID: MESSAGE_ID,
         SpanAttributes.MESSAGING_CONVERSATION_ID: CORRELATION_ID,
-        SpanAttributes.MESSAGING_OPERATION: "receive",
+        MESSAGING_OPERATION: "receive",
     }
 
     def setUp(self):

instrumentation/opentelemetry-instrumentation-aio-pika/tests/test_publish_decorator.py

@@ -21,6 +21,14 @@
 from opentelemetry.instrumentation.aio_pika.publish_decorator import (
     PublishDecorator,
 )
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+    MESSAGING_SYSTEM,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
+    NET_PEER_NAME,
+    NET_PEER_PORT,
+)
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import SpanKind, get_tracer
 
@@ -34,7 +42,7 @@
     EXCHANGE_NAME,
     MESSAGE,
     MESSAGE_ID,
-    MESSAGING_SYSTEM,
+    MESSAGING_SYSTEM_VALUE,
     ROUTING_KEY,
     SERVER_HOST,
     SERVER_PORT,
@@ -44,11 +52,11 @@
 @skipIf(AIOPIKA_VERSION_INFO >= (8, 0), "Only for aio_pika 7")
 class TestInstrumentedExchangeAioRmq7(TestCase):
     EXPECTED_ATTRIBUTES = {
-        SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
+        MESSAGING_SYSTEM: MESSAGING_SYSTEM_VALUE,
         SpanAttributes.MESSAGING_DESTINATION: f"{EXCHANGE_NAME},{ROUTING_KEY}",
-        SpanAttributes.NET_PEER_NAME: SERVER_HOST,
-        SpanAttributes.NET_PEER_PORT: SERVER_PORT,
-        SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,
+        NET_PEER_NAME: SERVER_HOST,
+        NET_PEER_PORT: SERVER_PORT,
+        MESSAGING_MESSAGE_ID: MESSAGE_ID,
         SpanAttributes.MESSAGING_CONVERSATION_ID: CORRELATION_ID,
         SpanAttributes.MESSAGING_TEMP_DESTINATION: True,
     }
@@ -123,11 +131,11 @@ def test_publish_works_with_not_recording_span_robust(self):
 @skipIf(AIOPIKA_VERSION_INFO <= (8, 0), "Only for aio_pika 8")
 class TestInstrumentedExchangeAioRmq8(TestCase):
     EXPECTED_ATTRIBUTES = {
-        SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
+        MESSAGING_SYSTEM: MESSAGING_SYSTEM_VALUE,
         SpanAttributes.MESSAGING_DESTINATION: f"{EXCHANGE_NAME},{ROUTING_KEY}",
-        SpanAttributes.NET_PEER_NAME: SERVER_HOST,
-        SpanAttributes.NET_PEER_PORT: SERVER_PORT,
-        SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,
+        NET_PEER_NAME: SERVER_HOST,
+        NET_PEER_PORT: SERVER_PORT,
+        MESSAGING_MESSAGE_ID: MESSAGE_ID,
         SpanAttributes.MESSAGING_CONVERSATION_ID: CORRELATION_ID,
         SpanAttributes.MESSAGING_TEMP_DESTINATION: True,
     }

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/sns.py

@@ -24,6 +24,10 @@
     _AwsSdkCallContext,
     _AwsSdkExtension,
     _BotocoreInstrumentorContext,
+    _BotoResultT,
+)
+from opentelemetry.semconv._incubating.attributes.aws_attributes import (
+    AWS_SNS_TOPIC_ARN,
 )
 from opentelemetry.semconv.trace import (
     MessagingDestinationKindValues,
@@ -161,6 +165,9 @@ def __init__(self, call_context: _AwsSdkCallContext):
 
     def extract_attributes(self, attributes: _AttributeMapT):
         attributes[SpanAttributes.MESSAGING_SYSTEM] = "aws.sns"
+        topic_arn = self._call_context.params.get("TopicArn")
+        if topic_arn:
+            attributes[AWS_SNS_TOPIC_ARN] = topic_arn
 
         if self._op:
             self._op.extract_attributes(self._call_context, attributes)
@@ -170,3 +177,16 @@ def before_service_call(
     ):
         if self._op:
             self._op.before_service_call(self._call_context, span)
+
+    def on_success(
+        self,
+        span: Span,
+        result: _BotoResultT,
+        instrumentor_context: _BotocoreInstrumentorContext,
+    ):
+        if not span.is_recording():
+            return
+
+        topic_arn = result.get("TopicArn")
+        if topic_arn:
+            span.set_attribute(AWS_SNS_TOPIC_ARN, topic_arn)

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-0.txt

@@ -13,7 +13,7 @@ iniconfig==2.0.0
 Jinja2==3.1.6
 jmespath==1.0.1
 MarkupSafe==2.1.5
-moto==5.0.9
+moto==5.1.11
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-1.txt

@@ -13,7 +13,7 @@ iniconfig==2.0.0
 Jinja2==3.1.6
 jmespath==1.0.1
 MarkupSafe==2.1.5
-moto==5.0.9
+moto==5.1.11
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_dynamodb.py

@@ -439,7 +439,7 @@ def test_scan(self):
             Limit=42,
             Select="ALL_ATTRIBUTES",
             TotalSegments=17,
-            Segment=21,
+            Segment=16,
             ProjectionExpression="PE",
             ConsistentRead=True,
             ReturnConsumedCapacity="TOTAL",
@@ -448,14 +448,14 @@ def test_scan(self):
         span = self.assert_span("Scan")
         self.assert_table_names(span, self.default_table_name)
         self.assertEqual(
-            21, span.attributes[SpanAttributes.AWS_DYNAMODB_SEGMENT]
+            16, span.attributes[SpanAttributes.AWS_DYNAMODB_SEGMENT]
         )
         self.assertEqual(
             17, span.attributes[SpanAttributes.AWS_DYNAMODB_TOTAL_SEGMENTS]
         )
-        self.assertEqual(1, span.attributes[SpanAttributes.AWS_DYNAMODB_COUNT])
+        self.assertEqual(0, span.attributes[SpanAttributes.AWS_DYNAMODB_COUNT])
         self.assertEqual(
-            1, span.attributes[SpanAttributes.AWS_DYNAMODB_SCANNED_COUNT]
+            0, span.attributes[SpanAttributes.AWS_DYNAMODB_SCANNED_COUNT]
         )
         self.assert_attributes_to_get(span, "id", "idl")
         self.assert_consistent_read(span, True)

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_sns.py

@@ -21,6 +21,9 @@
 from moto import mock_aws
 
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
+from opentelemetry.semconv._incubating.attributes.aws_attributes import (
+    AWS_SNS_TOPIC_ARN,
+)
 from opentelemetry.semconv.trace import (
     MessagingDestinationKindValues,
     SpanAttributes,
@@ -151,6 +154,10 @@ def test_publish_injects_span(self):
         )
 
         span = self.assert_span(f"{self.topic_name} send")
+        self.assertEqual(
+            topic_arn,
+            span.attributes[AWS_SNS_TOPIC_ARN],
+        )
         self.assert_injected_span(message_attrs, span)
 
     def test_publish_batch_to_topic(self):
@@ -188,6 +195,10 @@ def test_publish_batch_to_topic(self):
             MessagingDestinationKindValues.TOPIC.value,
             span.attributes[SpanAttributes.MESSAGING_DESTINATION_KIND],
         )
+        self.assertEqual(
+            topic_arn,
+            span.attributes[AWS_SNS_TOPIC_ARN],
+        )
         self.assertEqual(
             topic_arn,
             span.attributes[SpanAttributes.MESSAGING_DESTINATION],
@@ -199,3 +210,16 @@ def test_publish_batch_to_topic(self):
 
         self.assert_injected_span(message1_attrs, span)
         self.assert_injected_span(message2_attrs, span)
+
+    @mock_aws
+    def test_create_topic_span(self):
+        _ = self.client.create_topic(Name=self.topic_name)
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(1, len(spans))
+        span = spans[0]
+        self.assertEqual(SpanKind.CLIENT, span.kind)
+        self.assertEqual("SNS.CreateTopic", span.name)
+        self.assertEqual(
+            self.topic_arn,
+            span.attributes[AWS_SNS_TOPIC_ARN],
+        )