prefix AWS.SDK to the RemoteService from v1 (#756)

Author: srprash

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v1/AwsSdkV1Test.java

@@ -59,22 +59,22 @@ protected String getKinesisSpanNamePrefix() {
 
   @Override
   protected String getS3ServiceName() {
-    return "Amazon S3";
+    return "AWS.SDK.Amazon S3";
   }
 
   @Override
   protected String getDynamoDbServiceName() {
-    return "AmazonDynamoDBv2";
+    return "AWS.SDK.AmazonDynamoDBv2";
   }
 
   @Override
   protected String getSqsServiceName() {
-    return "AmazonSQS";
+    return "AWS.SDK.AmazonSQS";
   }
 
   @Override
   protected String getKinesisServiceName() {
-    return "AmazonKinesis";
+    return "AWS.SDK.AmazonKinesis";
   }
 
   protected String getS3RpcServiceName() {

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java

@@ -216,10 +216,7 @@ private static void setEgressOperation(SpanData span, AttributesBuilder builder)
   // add `AWS.SDK.` as prefix to indicate the metrics resulted from current span is from AWS SDK
   private static String normalizeServiceName(SpanData span, String serviceName) {
     if (AwsSpanProcessingUtil.isAwsSDKSpan(span)) {
-      String scopeName = span.getInstrumentationScopeInfo().getName();
-      if (scopeName.contains("aws-sdk-2.")) {
-        return "AWS.SDK." + serviceName;
-      }
+      return "AWS.SDK." + serviceName;
     }
     return serviceName;
   }

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java

@@ -969,7 +969,7 @@ public void testNormalizeServiceNameAwsSdkV1Span() {
 
     Attributes actualAttributes =
         GENERATOR.generateMetricAttributeMapFromSpan(spanDataMock, resource).get(DEPENDENCY_METRIC);
-    assertThat(actualAttributes.get(AWS_REMOTE_SERVICE)).isEqualTo("Amazon S3");
+    assertThat(actualAttributes.get(AWS_REMOTE_SERVICE)).isEqualTo("AWS.SDK.Amazon S3");
   }
 
   @Test