add support for stateMachineArn and activityArn from Step Functions service

Author: ezhang6811

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

@@ -51,6 +51,8 @@ internal sealed class AwsAttributeKeys
     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 AttributeAWSStepFunctionsActivityArn = "aws.stepfunctions.activity.arn";
+    internal static readonly string AttributeAWSStepFunctionsStateMachineArn = "aws.stepfunctions.state_machine.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

@@ -46,6 +46,7 @@ internal class AwsMetricAttributeGenerator : IMetricAttributeGenerator
     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 NormalizedStepFunctionsName = "AWS::StepFunctions";
     private static readonly string NormalizedBedrockServiceName = "AWS::Bedrock";
     private static readonly string NormalizedBedrockRuntimeServiceName = "AWS::BedrockRuntime";
     private static readonly string DbConnectionResourceType = "DB::Connection";
@@ -374,6 +375,8 @@ private static string NormalizeRemoteServiceName(Activity span, string serviceNa
                 case "AmazonSQS": // AWS SDK v1
                 case "Sqs": // AWS SDK v2
                     return NormalizedSQSServiceName;
+                case "SFN":
+                    return NormalizedStepFunctionsName;
                 case "Bedrock":
                 case "Bedrock Agent":
                 case "Bedrock Agent Runtime":
@@ -435,6 +438,16 @@ private static void SetRemoteResourceTypeAndIdentifier(Activity span, ActivityTa
                 remoteResourceIdentifier = EscapeDelimiters(GetQueueName((string?)span.GetTagItem(AttributeAWSSQSQueueUrl)));
                 cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSQSQueueUrl));
             }
+            else if (IsKeyPresent(span, AttributeAWSStepFunctionsActivityArn))
+            {
+                remoteResourceType = NormalizedStepFunctionsName + "::Activity";
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn));
+            }
+            else if (IsKeyPresent(span, AttributeAWSStepFunctionsStateMachineArn))
+            {
+                remoteResourceType = NormalizedStepFunctionsName + "::StateMachine";
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn));
+            }
             else if (IsKeyPresent(span, AttributeAWSBedrockGuardrailId))
             {
                 remoteResourceType = NormalizedBedrockServiceName + "::Guardrail";

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

@@ -17,6 +17,8 @@ internal static class AWSSemanticConventions
     public const string AttributeAWSKinesisStreamName = "aws.kinesis.stream_name";
     public const string AttributeAWSSecretsManagerSecretArn = "aws.secretsmanager.secret.arn";
     public const string AttributeAWSSnsTopicArn = "aws.sns.topic.arn";
+    public const string AttributeAWSStepFunctionsActivityArn = "aws.stepfunctions.activity.arn";
+    public const string AttributeAWSStepFunctionsStateMachineArn = "aws.stepfunctions.state_machine.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

@@ -14,6 +14,7 @@ internal class AWSServiceHelper
         { AWSServiceType.S3Service, new List<string> { "BucketName" } },
         { AWSServiceType.KinesisService, new List<string> { "StreamName" } },
         { AWSServiceType.SNSService, new List<string> { "TopicArn" } },
+        { AWSServiceType.StepFunctionsService, new List<string> { "ActivityArn", "StateMachineArn" } },
         { AWSServiceType.BedrockRuntimeService, new List<string> { "ModelId" } },
         { AWSServiceType.BedrockAgentService, new List<string> { "AgentId", "KnowledgeBaseId", "DataSourceId" } },
         { AWSServiceType.BedrockAgentRuntimeService, new List<string> { "AgentId", "KnowledgeBaseId" } },
@@ -36,6 +37,8 @@ internal class AWSServiceHelper
         { "StreamName", AWSSemanticConventions.AttributeAWSKinesisStreamName },
         { "TopicArn", AWSSemanticConventions.AttributeAWSSnsTopicArn },
         { "ARN", AWSSemanticConventions.AttributeAWSSecretsManagerSecretArn },
+        { "ActivityArn", AWSSemanticConventions.AttributeAWSStepFunctionsActivityArn },
+        { "StateMachineArn", AWSSemanticConventions.AttributeAWSStepFunctionsStateMachineArn },
         { "ModelId", AWSSemanticConventions.AttributeGenAiModelId },
         { "GuardrailId", AWSSemanticConventions.AttributeAWSBedrockGuardrailId },
         { "AgentId", AWSSemanticConventions.AttributeAWSBedrockAgentId },

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

@@ -7,6 +7,7 @@ internal class AWSServiceType
 {
     internal const string DynamoDbService = "DynamoDB";
     internal const string SecretsManagerService = "Secrets Manager";
+    internal const string StepFunctionsService = "SFN";
     internal const string SQSService = "SQS";
     internal const string SNSService = "SNS";
     internal const string S3Service = "S3";