feat: Extract account/access key id and region for cross-account support #1081
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bjrara
reviewed
May 13, 2025
| @@ -168,6 +187,9 @@ private Attributes generateDependencyMetricAttributes(SpanData span, Resource re | |||
| setEgressOperation(span, builder); | |||
| setRemoteServiceAndOperation(span, builder); | |||
| setRemoteResourceTypeAndIdentifier(span, builder); | |||
| setRemoteResourceAccessKeyAndRegion(span, builder); | |||
| setRemoteResourceAccountIdAndRegion( | |||
There was a problem hiding this comment.
By reversing the order of these two functions, you won't need to remove AK later.
| remoteRegion = domainParts[1]; | ||
| } catch (Exception e) { | ||
| logger.log( | ||
| Level.WARNING, |
There was a problem hiding this comment.
I don't think it should be WARNING logs, it will blow user logs whenever there's a failure in the extraction.
There was a problem hiding this comment.
Downgraded to FINEST that has a low level value (300).
| queueUrl = queueUrl.replace("https://", ""); | ||
|
|
||
| String[] parts = queueUrl.split("/"); | ||
| remoteAccountId = parts[1]; |
There was a problem hiding this comment.
Please check the length before getting anything using hard-coded index to avoid unexpected exceptions.
| for (AttributeKey<String> attributeKey : ARN_ATTRIBUTES) { | ||
| if (isKeyPresent(span, attributeKey)) { | ||
| String arn = span.getAttributes().get(attributeKey); | ||
| remoteAccountId = arn.split(":")[4]; |
| } | ||
| } | ||
|
|
||
| if (!remoteAccountId.equals(UNKNOWN_REMOTE_ACCOUNT_ID) |
There was a problem hiding this comment.
Why not just set the default values to null or empty string? It seems you are not using UNKNOWN anywhere as assigned values.
| @@ -52,6 +52,8 @@ final class AwsSpanProcessingUtil { | |||
| static final String UNKNOWN_OPERATION = "UnknownOperation"; | |||
| static final String UNKNOWN_REMOTE_SERVICE = "UnknownRemoteService"; | |||
| static final String UNKNOWN_REMOTE_OPERATION = "UnknownRemoteOperation"; | |||
| static final String UNKNOWN_REMOTE_ACCOUNT_ID = "UnknownRemoteAccountId"; | |||
blairhyy-amazon
force-pushed
the
main
branch
2 times, most recently
from
e8f1f43 to
6df41d3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Changes in ADOT package to support cross-account observability in Java V1 & V2 SDK.
Related changes in upstream package: mxiamxia/opentelemetry-java-instrumentation#30
Testing Plan:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.