[aws-xray] Update SamplerRulesApplier to recognize new HTTP/URL semconv. #1959
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
laurit
reviewed
Jun 12, 2025
| httpTarget = (String) entry.getValue(); | ||
| } else if (entry.getKey().equals(HTTP_URL)) { | ||
| } else if (entry.getKey().equals(HTTP_URL) || entry.getKey().equals(UrlAttributes.URL_FULL)) { |
There was a problem hiding this comment.
server instrumentations don't fill url.full, would that be an issue?
laurit
reviewed
Jun 12, 2025
| httpUrl = (String) entry.getValue(); | ||
| } else if (entry.getKey().equals(HTTP_METHOD)) { | ||
| } else if (entry.getKey().equals(HTTP_METHOD) | ||
| || entry.getKey().equals(HttpAttributes.HTTP_REQUEST_METHOD)) { |
There was a problem hiding this comment.
there is also http.request.method_original that could be used to get the request method when http.request.method is _OTHER
laurit
reviewed
Jun 12, 2025
| httpUrl = (String) entry.getValue(); | ||
| } else if (entry.getKey().equals(HTTP_METHOD)) { | ||
| } else if (entry.getKey().equals(HTTP_METHOD) | ||
| || entry.getKey().equals(HttpAttributes.HTTP_REQUEST_METHOD)) { | ||
| httpMethod = (String) entry.getValue(); | ||
| } else if (entry.getKey().equals(NET_HOST_NAME)) { |
There was a problem hiding this comment.
net.host.name is not filled any more, try server.address instead, http.host is also not filled (also replaced with server.address)
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:
The HTTP/URL semantic conventions were updated making the X-Ray Sampler outdated since it only recognizes the older HTTP semantic conventions. I've updated the SamplingRuleApplier to look at both the old and new conventions for backwards compatibility.
Testing:
Updated unit tests and are now passing.
Manual Testing:
For the manual testing. I created three sampling rules in the X-Ray console
/aws-sdk-callwith 100% sampling/outgoing-http-callwith 100% samplingI used a sample app with two APIs:
Before the change, calling any of the above APIs wasn't being matched when it should. After the change, the rules were being matched and each rule showed the correct stats.
Before the change:
After the change:
