set destination name only if not phone number

emdneto · emdneto · commit b739af273c76 · 2025-02-07T08:45:46.000-03:00
Signed-off-by: emdneto &lt;9735060+emdneto@users.noreply.github.com&gt;
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/sns.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/sns.py
@@ -81,10 +81,10 @@ def extract_attributes(
         )
         attributes[SpanAttributes.MESSAGING_DESTINATION] = destination_name
 
-        # TODO: Use SpanAttributes.MESSAGING_DESTINATION_NAME when opentelemetry-semantic-conventions 0.42b0 is released
-        attributes["messaging.destination.name"] = cls._extract_input_arn(
-            call_context
-        )
+        if not is_phone_number:
+            attributes[SpanAttributes.MESSAGING_DESTINATION_NAME] = (
+                cls._extract_input_arn(call_context)
+            )
         call_context.span_name = (
             f"{'phone_number' if is_phone_number else destination_name} send"
         )
diff --git a/tox.ini b/tox.ini
@@ -421,11 +421,6 @@ test_deps =
   opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
   opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
   opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-pass_env =
-  AWS_ACCESS_KEY_ID
-  AWS_SECRET_ACCESS_KEY
-  AWS_SESSION_TOKEN
-  AWS_DEFAULT_REGION
 
 deps =
   lint: -r dev-requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ def extract_attributes(`
`81`	`81`	`)`
`82`	`82`	`attributes[SpanAttributes.MESSAGING_DESTINATION] = destination_name`
`83`	`83`
`84`		`- # TODO: Use SpanAttributes.MESSAGING_DESTINATION_NAME when opentelemetry-semantic-conventions 0.42b0 is released`
`85`		`- attributes["messaging.destination.name"] = cls._extract_input_arn(`
`86`		`- call_context`
`87`		`- )`
	`84`	`+ if not is_phone_number:`
	`85`	`+ attributes[SpanAttributes.MESSAGING_DESTINATION_NAME] = (`
	`86`	`+ cls._extract_input_arn(call_context)`
	`87`	`+ )`
`88`	`88`	`call_context.span_name = (`
`89`	`89`	`f"{'phone_number' if is_phone_number else destination_name} send"`
`90`	`90`	`)`