diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAttributeKeys.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAttributeKeys.java index 10cf3e9d1e..b73794b9db 100644 --- a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAttributeKeys.java +++ b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAttributeKeys.java @@ -64,9 +64,6 @@ private AwsAttributeKeys() {} static final AttributeKey AWS_SECRET_ARN = AttributeKey.stringKey("aws.secretsmanager.secret.arn"); - static final AttributeKey AWS_LAMBDA_NAME = - AttributeKey.stringKey("aws.lambda.function.name"); - static final AttributeKey AWS_LAMBDA_ARN = AttributeKey.stringKey("aws.lambda.function.arn"); diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java index 1fcfe02395..4e1b0f0dce 100644 --- a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java +++ b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java @@ -47,7 +47,6 @@ import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_GUARDRAIL_ARN; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_GUARDRAIL_ID; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_KNOWLEDGE_BASE_ID; -import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LAMBDA_NAME; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LAMBDA_RESOURCE_ID; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LOCAL_OPERATION; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LOCAL_SERVICE; @@ -493,11 +492,6 @@ private static void setRemoteResourceTypeAndIdentifier(SpanData span, Attributes Optional.ofNullable(escapeDelimiters(span.getAttributes().get(AWS_SECRET_ARN)))); cloudformationPrimaryIdentifier = Optional.ofNullable(escapeDelimiters(span.getAttributes().get(AWS_SECRET_ARN))); - } else if (isKeyPresent(span, AWS_LAMBDA_NAME)) { - remoteResourceType = Optional.of(NORMALIZED_LAMBDA_SERVICE_NAME + "::Function"); - remoteResourceIdentifier = - getLambdaResourceNameFromAribitraryName( - Optional.ofNullable(escapeDelimiters(span.getAttributes().get(AWS_LAMBDA_NAME)))); } else if (isKeyPresent(span, AWS_LAMBDA_RESOURCE_ID)) { remoteResourceType = Optional.of(NORMALIZED_LAMBDA_SERVICE_NAME + "::EventSourceMapping"); remoteResourceIdentifier = @@ -519,16 +513,6 @@ private static void setRemoteResourceTypeAndIdentifier(SpanData span, Attributes } } - // NOTE: "name" in this case can be either the lambda name or lambda arn - private static Optional getLambdaResourceNameFromAribitraryName( - Optional arbitraryName) { - if (arbitraryName != null && arbitraryName.get().startsWith("arn:aws:lambda:")) { - Arn resourceArn = Arn.fromString(arbitraryName.get()); - return Optional.of(resourceArn.getResource().toString().split(":")[1]); - } - return arbitraryName; - } - private static Optional getSecretsManagerResourceNameFromArn(Optional stringArn) { Arn resourceArn = Arn.fromString(stringArn.get()); return Optional.of(resourceArn.getResource().toString().split(":")[1]); diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java index c51188a6e8..0598aa9ec5 100644 --- a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java +++ b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java @@ -26,7 +26,6 @@ import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_DATA_SOURCE_ID; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_GUARDRAIL_ID; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_KNOWLEDGE_BASE_ID; -import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LAMBDA_NAME; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LAMBDA_RESOURCE_ID; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LOCAL_OPERATION; import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LOCAL_SERVICE; @@ -802,11 +801,6 @@ public void testSdkClientSpanWithRemoteResourceAttributes() { validateRemoteResourceAttributes("AWS::SecretsManager::Secret", "secretName"); mockAttribute(AWS_SECRET_ARN, null); - // Validate behaviour of AWS_LAMBDA_NAME, then remove it. - mockAttribute(AWS_LAMBDA_NAME, "arn:aws:lambda:us-east-1:123456789012:function:functionName"); - validateRemoteResourceAttributes("AWS::Lambda::Function", "functionName"); - mockAttribute(AWS_LAMBDA_NAME, null); - // Validate behaviour of AWS_LAMBDA_RESOURCE_ID mockAttribute(AWS_LAMBDA_RESOURCE_ID, "eventSourceId"); validateRemoteResourceAttributes("AWS::Lambda::EventSourceMapping", "eventSourceId");