refactor: extract guardrail remote id from cloudformation primary id

Author: yiyuan-he

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/_aws_metric_attribute_generator.py

@@ -423,7 +423,9 @@ def _set_remote_type_and_identifier(span: ReadableSpan, attributes: BoundedAttri
             )
         elif is_key_present(span, AWS_BEDROCK_GUARDRAIL_ID):
             remote_resource_type = _NORMALIZED_BEDROCK_SERVICE_NAME + "::Guardrail"
-            remote_resource_identifier = _escape_delimiters(span.attributes.get(AWS_BEDROCK_GUARDRAIL_ID))
+            remote_resource_identifier = _getBedrockIdentifierFromArn(
+                _escape_delimiters(span.attributes.get(AWS_BEDROCK_GUARDRAIL_ARN))
+            )
             cloudformation_primary_identifier = _escape_delimiters(span.attributes.get(AWS_BEDROCK_GUARDRAIL_ARN))
         elif is_key_present(span, AWS_BEDROCK_KNOWLEDGE_BASE_ID):
             remote_resource_type = _NORMALIZED_BEDROCK_SERVICE_NAME + "::KnowledgeBase"
@@ -480,6 +482,12 @@ def _set_remote_type_and_identifier(span: ReadableSpan, attributes: BoundedAttri
         attributes[AWS_CLOUDFORMATION_PRIMARY_IDENTIFIER] = cloudformation_primary_identifier
 
 
+def _getBedrockIdentifierFromArn(arn: str):
+    # NOTE: Bedrock Guardrail ARNs follow this pattern:
+    # arn:aws:bedrock:<region>:<account_id>:guardrail/<identifier>
+    return arn.split(":")[-1].split("/")[-1]
+
+
 def _get_db_connection(span: ReadableSpan) -> None:
     """
     RemoteResourceIdentifier is populated with rule:

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_metric_attribute_generator.py

@@ -10,6 +10,7 @@
 from amazon.opentelemetry.distro._aws_attribute_keys import (
     AWS_BEDROCK_AGENT_ID,
     AWS_BEDROCK_DATA_SOURCE_ID,
+    AWS_BEDROCK_GUARDRAIL_ARN,
     AWS_BEDROCK_GUARDRAIL_ID,
     AWS_BEDROCK_KNOWLEDGE_BASE_ID,
     AWS_CONSUMER_PARENT_SPAN_KIND,
@@ -1073,14 +1074,24 @@ def test_sdk_client_span_with_remote_resource_attributes(self):
         self._mock_attribute([AWS_BEDROCK_DATA_SOURCE_ID, AWS_BEDROCK_KNOWLEDGE_BASE_ID], [None, None])
 
         # Validate behaviour of AWS_BEDROCK_GUARDRAIL_ID attribute, then remove it.
-        self._mock_attribute([AWS_BEDROCK_GUARDRAIL_ID], ["test_guardrail_id"], keys, values)
+        self._mock_attribute(
+            [AWS_BEDROCK_GUARDRAIL_ID, AWS_BEDROCK_GUARDRAIL_ARN],
+            ["test_guardrail_id", "arn:aws:bedrock:us-west-2:123456789012:guardrail/test_guardrail_id"],
+            keys,
+            values,
+        )
         self._validate_remote_resource_attributes("AWS::Bedrock::Guardrail", "test_guardrail_id")
-        self._mock_attribute([AWS_BEDROCK_GUARDRAIL_ID], [None])
+        self._mock_attribute([AWS_BEDROCK_GUARDRAIL_ID, AWS_BEDROCK_GUARDRAIL_ARN], [None, None])
 
         # Validate behaviour of AWS_BEDROCK_GUARDRAIL_ID attribute with special chars(^), then remove it.
-        self._mock_attribute([AWS_BEDROCK_GUARDRAIL_ID], ["test_guardrail_^id"], keys, values)
+        self._mock_attribute(
+            [AWS_BEDROCK_GUARDRAIL_ID, AWS_BEDROCK_GUARDRAIL_ARN],
+            ["test_guardrail_^id", "arn:aws:bedrock:us-west-2:123456789012:guardrail/test_guardrail_^id"],
+            keys,
+            values,
+        )
         self._validate_remote_resource_attributes("AWS::Bedrock::Guardrail", "test_guardrail_^^id")
-        self._mock_attribute([AWS_BEDROCK_GUARDRAIL_ID], [None])
+        self._mock_attribute([AWS_BEDROCK_GUARDRAIL_ID, AWS_BEDROCK_GUARDRAIL_ARN], [None, None])
 
         # Validate behaviour of AWS_BEDROCK_KNOWLEDGE_BASE_ID attribute, then remove it.
         self._mock_attribute([AWS_BEDROCK_KNOWLEDGE_BASE_ID], ["test_knowledgeBase_id"], keys, values)