Add server address and port to Bedrock metric attributes

Author: SrdjanLL

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

@@ -82,7 +82,6 @@ def response_hook(span, service_name, operation_name, result):
 
 import logging
 from typing import Any, Callable, Collection, Dict, Optional, Tuple
-from urllib.parse import urlparse
 
 from botocore.client import BaseClient
 from botocore.endpoint import Endpoint
@@ -100,6 +99,7 @@ def response_hook(span, service_name, operation_name, result):
     _BotocoreInstrumentorContext,
 )
 from opentelemetry.instrumentation.botocore.package import _instruments
+from opentelemetry.instrumentation.botocore.utils import get_server_attributes
 from opentelemetry.instrumentation.botocore.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
@@ -112,7 +112,6 @@ def response_hook(span, service_name, operation_name, result):
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import get_tracer
 from opentelemetry.trace.span import Span
-from opentelemetry.util.types import AttributeValue
 
 logger = logging.getLogger(__name__)
 
@@ -279,7 +278,7 @@ def _patched_api_call(self, original_func, instance, args, kwargs):
             SpanAttributes.RPC_METHOD: call_context.operation,
             # TODO: update when semantic conventions exist
             "aws.region": call_context.region,
-            **_get_server_attributes(call_context.endpoint_url),
+            **get_server_attributes(call_context.endpoint_url),
         }
 
         _safe_invoke(extension.extract_attributes, attributes)
@@ -406,13 +405,3 @@ def _safe_invoke(function: Callable, *args):
         logger.error(
             "Error when invoking function '%s'", function_name, exc_info=ex
         )
-
-
-def _get_server_attributes(endpoint_url: str) -> Dict[str, AttributeValue]:
-    """Extract server.* attributes from AWS endpoint URL."""
-    parsed = urlparse(endpoint_url)
-    attributes = {}
-    if parsed.hostname:
-        attributes[SpanAttributes.SERVER_ADDRESS] = parsed.hostname
-        attributes[SpanAttributes.SERVER_PORT] = parsed.port or 443
-    return attributes

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

@@ -41,6 +41,7 @@
     _BotoClientErrorT,
     _BotocoreInstrumentorContext,
 )
+from opentelemetry.instrumentation.botocore.utils import get_server_attributes
 from opentelemetry.metrics import Instrument, Meter
 from opentelemetry.semconv._incubating.attributes.error_attributes import (
     ERROR_TYPE,
@@ -163,6 +164,11 @@ def _extract_metrics_attributes(self) -> _AttributeMapT:
             attributes[GEN_AI_OPERATION_NAME] = (
                 GenAiOperationNameValues.CHAT.value
             )
+
+        server_attributes = get_server_attributes(
+            self._call_context.endpoint_url
+        )
+        attributes.update(server_attributes)
         return attributes
 
     def extract_attributes(self, attributes: _AttributeMapT):

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/utils.py

@@ -0,0 +1,17 @@
+from typing import Dict
+from urllib.parse import urlparse
+
+from opentelemetry.semconv._incubating.attributes import (
+    server_attributes as ServerAttributes,
+)
+from opentelemetry.util.types import AttributeValue
+
+
+def get_server_attributes(endpoint_url: str) -> Dict[str, AttributeValue]:
+    """Extract server.* attributes from AWS endpoint URL."""
+    parsed = urlparse(endpoint_url)
+    attributes = {}
+    if parsed.hostname:
+        attributes[ServerAttributes.SERVER_ADDRESS] = parsed.hostname
+        attributes[ServerAttributes.SERVER_PORT] = parsed.port or 443
+    return attributes

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

@@ -32,14 +32,16 @@
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAIAttributes,
 )
+from opentelemetry.semconv._incubating.attributes import (
+    server_attributes as ServerAttributes,
+)
 from opentelemetry.semconv._incubating.attributes.error_attributes import (
     ERROR_TYPE,
 )
 from opentelemetry.semconv._incubating.metrics.gen_ai_metrics import (
     GEN_AI_CLIENT_OPERATION_DURATION,
     GEN_AI_CLIENT_TOKEN_USAGE,
 )
-from opentelemetry.semconv.trace import SpanAttributes
 
 
 # pylint: disable=too-many-branches, too-many-locals, too-many-statements
@@ -238,8 +240,8 @@ def assert_all_attributes(
         request_model == span.attributes[GenAIAttributes.GEN_AI_REQUEST_MODEL]
     )
 
-    assert server_address == span.attributes[SpanAttributes.SERVER_ADDRESS]
-    assert server_port == span.attributes[SpanAttributes.SERVER_PORT]
+    assert server_address == span.attributes[ServerAttributes.SERVER_ADDRESS]
+    assert server_port == span.attributes[ServerAttributes.SERVER_PORT]
 
     assert_equal_or_not_present(
         input_tokens, GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS, span
@@ -309,7 +311,12 @@ def assert_message_in_logs(log, event_name, expected_content, parent_span):
 
 
 def assert_all_metric_attributes(
-    data_point, operation_name: str, model: str, error_type: str | None = None
+    data_point,
+    operation_name: str,
+    model: str,
+    error_type: str | None = None,
+    server_address: str = "bedrock-runtime.us-east-1.amazonaws.com",
+    server_port: int = 443,
 ):
     assert GenAIAttributes.GEN_AI_OPERATION_NAME in data_point.attributes
     assert (
@@ -324,6 +331,14 @@ def assert_all_metric_attributes(
     assert GenAIAttributes.GEN_AI_REQUEST_MODEL in data_point.attributes
     assert data_point.attributes[GenAIAttributes.GEN_AI_REQUEST_MODEL] == model
 
+    assert ServerAttributes.SERVER_ADDRESS in data_point.attributes
+    assert (
+        data_point.attributes[ServerAttributes.SERVER_ADDRESS]
+        == server_address
+    )
+    assert ServerAttributes.SERVER_PORT in data_point.attributes
+    assert data_point.attributes[ServerAttributes.SERVER_PORT] == server_port
+
     if error_type is not None:
         assert ERROR_TYPE in data_point.attributes
         assert data_point.attributes[ERROR_TYPE] == error_type