add support for SNS TopicArn and Secrets Manager SecretArn attributes

Author: ezhang6811

src/AWS.Distro.OpenTelemetry.AutoInstrumentation/AwsAttributeKeys.cs

@@ -49,6 +49,8 @@ internal sealed class AwsAttributeKeys
     internal static readonly string AttributeAWSSQSQueueUrl = "aws.queue_url";
 
     internal static readonly string AttributeAWSS3Bucket = "aws.s3.bucket";
+    internal static readonly string AttributeAWSSecretsManagerSecretArn = "aws.secretsmanager.secret.arn";
+    internal static readonly string AttributeAWSSNSTopicArn = "aws.sns.topic.arn";
 
     internal static readonly string AttributeAWSBedrockGuardrailId = "aws.bedrock.guardrail.id";
     internal static readonly string AttributeAWSBedrockAgentId = "aws.bedrock.agent.id";

src/AWS.Distro.OpenTelemetry.AutoInstrumentation/AwsMetricAttributeGenerator.cs

@@ -43,6 +43,8 @@ internal class AwsMetricAttributeGenerator : IMetricAttributeGenerator
     private static readonly string NormalizedDynamoDBServiceName = "AWS::DynamoDB";
     private static readonly string NormalizedKinesisServiceName = "AWS::Kinesis";
     private static readonly string NormalizedS3ServiceName = "AWS::S3";
+    private static readonly string NormalizedSecretsManagerServiceName = "AWS::SecretsManager";
+    private static readonly string NormalizedSNSServiceName = "AWS::SNS";
     private static readonly string NormalizedSQSServiceName = "AWS::SQS";
     private static readonly string NormalizedBedrockServiceName = "AWS::Bedrock";
     private static readonly string NormalizedBedrockRuntimeServiceName = "AWS::BedrockRuntime";
@@ -361,6 +363,10 @@ private static string NormalizeRemoteServiceName(Activity span, string serviceNa
                 case "Amazon S3": // AWS SDK v1
                 case "S3": // AWS SDK v2
                     return NormalizedS3ServiceName;
+                case "Secrets Manager":
+                    return NormalizedSecretsManagerServiceName;
+                case "SNS":
+                    return NormalizedSNSServiceName;
                 case "AmazonSQS": // AWS SDK v1
                 case "Sqs": // AWS SDK v2
                     return NormalizedSQSServiceName;
@@ -403,6 +409,16 @@ private static void SetRemoteResourceTypeAndIdentifier(Activity span, ActivityTa
                 remoteResourceType = NormalizedS3ServiceName + "::Bucket";
                 remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSS3Bucket));
             }
+            else if (IsKeyPresent(span, AttributeAWSSecretsManagerSecretArn))
+            {
+                remoteResourceType = NormalizedSecretsManagerServiceName + "::Secret";
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn));
+            }
+            else if (IsKeyPresent(span, AttributeAWSSNSTopicArn))
+            {
+                remoteResourceType = NormalizedSNSServiceName + "::Topic";
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn));
+            }
             else if (IsKeyPresent(span, AttributeAWSSQSQueueName))
             {
                 remoteResourceType = NormalizedSQSServiceName + "::Queue";

src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSSemanticConventions.cs

@@ -15,6 +15,8 @@ internal static class AWSSemanticConventions
     public const string AttributeAWSSQSQueueName = "aws.sqs.queue_name";
     public const string AttributeAWSS3BucketName = "aws.s3.bucket";
     public const string AttributeAWSKinesisStreamName = "aws.kinesis.stream_name";
+    public const string AttributeAWSSecretsManagerSecretArn = "aws.secretsmanager.secret.arn";
+    public const string AttributeAWSSnsTopicArn = "aws.sns.topic.arn";
 
     // AWS Bedrock service attributes not yet defined in semantic conventions
     public const string AttributeAWSBedrockGuardrailId = "aws.bedrock.guardrail.id";

src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSServiceHelper.cs

@@ -13,13 +13,15 @@ internal class AWSServiceHelper
         { AWSServiceType.SQSService, new List<string> { "QueueUrl", "QueueName" } },
         { AWSServiceType.S3Service, new List<string> { "BucketName" } },
         { AWSServiceType.KinesisService, new List<string> { "StreamName" } },
+        { AWSServiceType.SNSService, new List<string> { "TopicArn" } },
         { AWSServiceType.BedrockRuntimeService, new List<string> { "ModelId" } },
         { AWSServiceType.BedrockAgentService, new List<string> { "AgentId", "KnowledgeBaseId", "DataSourceId" } },
         { AWSServiceType.BedrockAgentRuntimeService, new List<string> { "AgentId", "KnowledgeBaseId" } },
     };
 
     internal static IReadOnlyDictionary<string, List<string>> ServiceResponseParameterMap = new Dictionary<string, List<string>>()
     {
+        { AWSServiceType.SecretsManagerService, new List<string> { "ARN" } },
         { AWSServiceType.SQSService, new List<string> { "QueueUrl" } },
         { AWSServiceType.BedrockService, new List<string> { "GuardrailId" } },
         { AWSServiceType.BedrockAgentService, new List<string> { "AgentId", "DataSourceId" } },
@@ -32,6 +34,8 @@ internal class AWSServiceHelper
         { "QueueName", AWSSemanticConventions.AttributeAWSSQSQueueName },
         { "BucketName", AWSSemanticConventions.AttributeAWSS3BucketName },
         { "StreamName", AWSSemanticConventions.AttributeAWSKinesisStreamName },
+        { "TopicArn", AWSSemanticConventions.AttributeAWSSnsTopicArn },
+        { "ARN", AWSSemanticConventions.AttributeAWSSecretsManagerSecretArn },
         { "ModelId", AWSSemanticConventions.AttributeGenAiModelId },
         { "GuardrailId", AWSSemanticConventions.AttributeAWSBedrockGuardrailId },
         { "AgentId", AWSSemanticConventions.AttributeAWSBedrockAgentId },

src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSServiceType.cs

@@ -6,6 +6,7 @@ namespace OpenTelemetry.Instrumentation.AWS.Implementation;
 internal class AWSServiceType
 {
     internal const string DynamoDbService = "DynamoDB";
+    internal const string SecretsManagerService = "Secrets Manager";
     internal const string SQSService = "SQS";
     internal const string SNSService = "SNS";
     internal const string S3Service = "S3";