Merge branch 'main' into django-issue-fix

Author: rads-1996

CHANGELOG.md

@@ -31,6 +31,12 @@ 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-asgi` Fixed an issue where FastAPI reports IP instead of URL.
+  ([#3670](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3670))
+- `opentelemetry-instrumentation-httpx`: fix missing metric response attributes when tracing is disabled
+  ([#3615](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3615))
+- `opentelemetry-instrumentation-fastapi`:  Don't pass bounded server_request_hook when using `FastAPIInstrumentor.instrument()`
+  ([#3701](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3701))
 
 ### Added
 
@@ -44,6 +50,12 @@ 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 AWS Step Functions semantic convention attributes
+  ([#3737](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3737))
+- `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-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

@@ -445,15 +445,28 @@ def get_host_port_url_tuple(scope):
     """Returns (host, port, full_url) tuple."""
     server = scope.get("server") or ["0.0.0.0", 80]
     port = server[1]
+
+    host_header = asgi_getter.get(scope, "host")
+    if host_header:
+        host_value = host_header[0]
+        # Ensure host_value is a string, not bytes
+        if isinstance(host_value, bytes):
+            host_value = _decode_header_item(host_value)
+
+        url_host = host_value
+
+    else:
+        url_host = server[0] + (":" + str(port) if str(port) != "80" else "")
     server_host = server[0] + (":" + str(port) if str(port) != "80" else "")
+
     # using the scope path is enough, see:
     # - https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope (see: root_path and path)
     # - https://asgi.readthedocs.io/en/latest/specs/www.html#wsgi-compatibility (see: PATH_INFO)
     #       PATH_INFO can be derived by stripping root_path from path
     #       -> that means that the path should contain the root_path already, so prefixing it again is not necessary
     # - https://wsgi.readthedocs.io/en/latest/definitions.html#envvar-PATH_INFO
     full_path = scope.get("path", "")
-    http_url = scope.get("scheme", "http") + "://" + server_host + full_path
+    http_url = scope.get("scheme", "http") + "://" + url_host + full_path
     return server_host, port, http_url
 
 

instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_middleware.py

@@ -780,7 +780,10 @@ async def test_host_header(self):
 
         def update_expected_server(expected):
             expected[3]["attributes"].update(
-                {SpanAttributes.HTTP_SERVER_NAME: hostname.decode("utf8")}
+                {
+                    SpanAttributes.HTTP_SERVER_NAME: hostname.decode("utf8"),
+                    SpanAttributes.HTTP_URL: f"http://{hostname.decode('utf8')}/",
+                }
             )
             return expected
 
@@ -797,7 +800,10 @@ async def test_host_header_both_semconv(self):
 
         def update_expected_server(expected):
             expected[3]["attributes"].update(
-                {SpanAttributes.HTTP_SERVER_NAME: hostname.decode("utf8")}
+                {
+                    SpanAttributes.HTTP_SERVER_NAME: hostname.decode("utf8"),
+                    SpanAttributes.HTTP_URL: f"http://{hostname.decode('utf8')}/",
+                }
             )
             return expected
 
@@ -1728,7 +1734,7 @@ def test_request_attributes(self):
                 SpanAttributes.HTTP_METHOD: "GET",
                 SpanAttributes.HTTP_HOST: "127.0.0.1",
                 SpanAttributes.HTTP_TARGET: "/",
-                SpanAttributes.HTTP_URL: "http://127.0.0.1/?foo=bar",
+                SpanAttributes.HTTP_URL: "http://test/?foo=bar",
                 SpanAttributes.NET_HOST_PORT: 80,
                 SpanAttributes.HTTP_SCHEME: "http",
                 SpanAttributes.HTTP_SERVER_NAME: "test",
@@ -1781,7 +1787,7 @@ def test_request_attributes_both_semconv(self):
                 SpanAttributes.HTTP_METHOD: "GET",
                 SpanAttributes.HTTP_HOST: "127.0.0.1",
                 SpanAttributes.HTTP_TARGET: "/",
-                SpanAttributes.HTTP_URL: "http://127.0.0.1/?foo=bar",
+                SpanAttributes.HTTP_URL: "http://test/?foo=bar",
                 SpanAttributes.NET_HOST_PORT: 80,
                 SpanAttributes.HTTP_SCHEME: "http",
                 SpanAttributes.HTTP_SERVER_NAME: "test",

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

@@ -35,6 +35,7 @@ def loader():
     "bedrock-runtime": _lazy_load(".bedrock", "_BedrockRuntimeExtension"),
     "dynamodb": _lazy_load(".dynamodb", "_DynamoDbExtension"),
     "lambda": _lazy_load(".lmbd", "_LambdaExtension"),
+    "stepfunctions": _lazy_load(".sfns", "_StepFunctionsExtension"),
     "sns": _lazy_load(".sns", "_SnsExtension"),
     "sqs": _lazy_load(".sqs", "_SqsExtension"),
 }

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

@@ -0,0 +1,58 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from opentelemetry.instrumentation.botocore.extensions.types import (
+    _AttributeMapT,
+    _AwsSdkExtension,
+    _BotocoreInstrumentorContext,
+    _BotoResultT,
+)
+from opentelemetry.semconv._incubating.attributes.aws_attributes import (
+    AWS_STEP_FUNCTIONS_ACTIVITY_ARN,
+    AWS_STEP_FUNCTIONS_STATE_MACHINE_ARN,
+)
+from opentelemetry.trace.span import Span
+
+
+class _StepFunctionsExtension(_AwsSdkExtension):
+    @staticmethod
+    def _set_arn_attributes(source, target, setter_func):
+        """Helper to set ARN attributes if they exist in source."""
+        activity_arn = source.get("activityArn")
+        if activity_arn:
+            setter_func(target, AWS_STEP_FUNCTIONS_ACTIVITY_ARN, activity_arn)
+
+        state_machine_arn = source.get("stateMachineArn")
+        if state_machine_arn:
+            setter_func(
+                target, AWS_STEP_FUNCTIONS_STATE_MACHINE_ARN, state_machine_arn
+            )
+
+    def extract_attributes(self, attributes: _AttributeMapT):
+        self._set_arn_attributes(
+            self._call_context.params,
+            attributes,
+            lambda target, key, value: target.__setitem__(key, value),
+        )
+
+    def on_success(
+        self,
+        span: Span,
+        result: _BotoResultT,
+        instrumentor_context: _BotocoreInstrumentorContext,
+    ):
+        self._set_arn_attributes(
+            result,
+            span,
+            lambda target, key, value: target.set_attribute(key, value),
+        )

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)