fix string issue with ARN attributes

ezhang6811 · ezhang6811 · commit b15433ecc91a · 2024-12-02T20:04:18.000Z
diff --git a/src/AWS.Distro.OpenTelemetry.AutoInstrumentation/AwsMetricAttributeGenerator.cs b/src/AWS.Distro.OpenTelemetry.AutoInstrumentation/AwsMetricAttributeGenerator.cs
@@ -427,13 +427,13 @@ private static void SetRemoteResourceTypeAndIdentifier(Activity span, ActivityTa
             else if (IsKeyPresent(span, AttributeAWSSecretsManagerSecretArn))
             {
                 remoteResourceType = NormalizedSecretsManagerServiceName + "::Secret";
-                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn)).Split(":").Last();
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn)).Split(':').Last();
                 cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn));
             }
             else if (IsKeyPresent(span, AttributeAWSSNSTopicArn))
             {
                 remoteResourceType = NormalizedSNSServiceName + "::Topic";
-                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn)).Split(":").Last();
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn)).Split(':').Last();
                 cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn));
             }
             else if (IsKeyPresent(span, AttributeAWSSQSQueueName))
@@ -451,13 +451,13 @@ private static void SetRemoteResourceTypeAndIdentifier(Activity span, ActivityTa
             else if (IsKeyPresent(span, AttributeAWSStepFunctionsActivityArn))
             {
                 remoteResourceType = NormalizedStepFunctionsName + "::Activity";
-                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn)).Split(":").Last();
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn)).Split(':').Last();
                 cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn));
             }
             else if (IsKeyPresent(span, AttributeAWSStepFunctionsStateMachineArn))
             {
                 remoteResourceType = NormalizedStepFunctionsName + "::StateMachine";
-                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn)).Split(":").Last();
+                remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn)).Split(':').Last();
                 cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn));
             }
             else if (IsKeyPresent(span, AttributeAWSBedrockGuardrailId))

Original file line number	Diff line number	Diff line change
`@@ -427,13 +427,13 @@ private static void SetRemoteResourceTypeAndIdentifier(Activity span, ActivityTa`
`427`	`427`	`else if (IsKeyPresent(span, AttributeAWSSecretsManagerSecretArn))`
`428`	`428`	`{`
`429`	`429`	`remoteResourceType = NormalizedSecretsManagerServiceName + "::Secret";`
`430`		`- remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn)).Split(":").Last();`
	`430`	`+ remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn)).Split(':').Last();`
`431`	`431`	`cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSecretsManagerSecretArn));`
`432`	`432`	`}`
`433`	`433`	`else if (IsKeyPresent(span, AttributeAWSSNSTopicArn))`
`434`	`434`	`{`
`435`	`435`	`remoteResourceType = NormalizedSNSServiceName + "::Topic";`
`436`		`- remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn)).Split(":").Last();`
	`436`	`+ remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn)).Split(':').Last();`
`437`	`437`	`cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSSNSTopicArn));`
`438`	`438`	`}`
`439`	`439`	`else if (IsKeyPresent(span, AttributeAWSSQSQueueName))`
`@@ -451,13 +451,13 @@ private static void SetRemoteResourceTypeAndIdentifier(Activity span, ActivityTa`
`451`	`451`	`else if (IsKeyPresent(span, AttributeAWSStepFunctionsActivityArn))`
`452`	`452`	`{`
`453`	`453`	`remoteResourceType = NormalizedStepFunctionsName + "::Activity";`
`454`		`- remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn)).Split(":").Last();`
	`454`	`+ remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn)).Split(':').Last();`
`455`	`455`	`cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsActivityArn));`
`456`	`456`	`}`
`457`	`457`	`else if (IsKeyPresent(span, AttributeAWSStepFunctionsStateMachineArn))`
`458`	`458`	`{`
`459`	`459`	`remoteResourceType = NormalizedStepFunctionsName + "::StateMachine";`
`460`		`- remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn)).Split(":").Last();`
	`460`	`+ remoteResourceIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn)).Split(':').Last();`
`461`	`461`	`cloudformationPrimaryIdentifier = EscapeDelimiters((string?)span.GetTagItem(AttributeAWSStepFunctionsStateMachineArn));`
`462`	`462`	`}`
`463`	`463`	`else if (IsKeyPresent(span, AttributeAWSBedrockGuardrailId))`