prefix AWS.SDK to the RemoteService for AWS SDK spans

Author: srprash

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

@@ -31,6 +31,7 @@
     is_local_root,
     should_generate_dependency_metric_attributes,
     should_generate_service_metric_attributes,
+    is_aws_sdk_span,
 )
 from amazon.opentelemetry.distro.metric_attribute_generator import (
     DEPENDENCY_METRIC,
@@ -268,11 +269,10 @@ def _get_db_statement_remote_operation(span: ReadableSpan, statement_key: str) -
 
 
 def _normalize_service_name(span: ReadableSpan, service_name: str) -> str:
-    """
-    TODO: Determine if problems in Java instrumentation are relevant here. Do we need normalization? If so, probably we
-     are looking for boto, not aws-sdk
-    """
-    return service_name
+    if is_aws_sdk_span(span): 
+      return "AWS.SDK." + service_name
+    
+    return service_name;
 
 
 def _generate_remote_service(span: ReadableSpan) -> str:

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

@@ -674,6 +674,28 @@ def test_both_metric_when_local_root_consumer_process(self):
         self.assertIsNotNone(service_attributes)
         self.assertIsNotNone(dependency_attributes)
 
+    def test_normalize_service_name_non_aws_sdk_span(self):
+        service_name: str = "non aws service";
+        self._mock_attribute([SpanAttributes.RPC_SERVICE], [service_name])
+        self.span_mock.kind = SpanKind.CLIENT
+
+        actual_attributes: Attributes = _GENERATOR.generate_metric_attributes_dict_from_span(
+            self.span_mock, self.resource
+        ).get(DEPENDENCY_METRIC)
+        self.assertEqual(actual_attributes.get(AWS_REMOTE_SERVICE), service_name)
+
+    def test_normalize_service_name_aws_sdk_span(self):
+        self._mock_attribute(
+            [SpanAttributes.RPC_SYSTEM, SpanAttributes.RPC_SERVICE],
+            ["aws-api", "EC2"]
+        )
+        self.span_mock.kind = SpanKind.CLIENT
+
+        actual_attributes: Attributes = _GENERATOR.generate_metric_attributes_dict_from_span(
+            self.span_mock, self.resource
+        ).get(DEPENDENCY_METRIC)
+        self.assertEqual(actual_attributes.get(AWS_REMOTE_SERVICE), "AWS.SDK.EC2")
+
     def _update_resource_with_service_name(self) -> None:
         self.resource: Resource = Resource(attributes={SERVICE_NAME: _SERVICE_NAME_VALUE})