-
Notifications
You must be signed in to change notification settings - Fork 63
Base of AWS SDK v1.11 SPI Implementation #1115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
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
pxaws
reviewed
Jul 14, 2025
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkClientInstrumentation.java
Show resolved
Hide resolved
pxaws
previously approved these changes
Jul 15, 2025
thpierce
reviewed
Jul 16, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see any unit tests, and I'm realizing we didn't have any unit tests in the V2 impl either. Why do you think we don't need unit tests?
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkInstrumentationModule.java
Show resolved
Hide resolved
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkClientInstrumentation.java
Outdated
Show resolved
Hide resolved
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkClientInstrumentation.java
Show resolved
Hide resolved
thpierce
reviewed
Jul 16, 2025
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkClientInstrumentation.java
Show resolved
Hide resolved
thpierce
approved these changes
Jul 16, 2025
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.
This PR is similar to #1111, as it sets a base SPI implementation for AWS SDK v1.11.
Issue
This is the skeleton set up for the SPI, which aims to remove the patch for aws-sdk v1.11 by using OTel's InstrumentationModule SPI extension. This instrumentation is essentially complementing the upstream java agent. It is completely separate from upstream and instruments after the Otel agent.
Description of Changes
This PR sets up the foundational structure for AWS SDK v1.11 Instrumentation, moving away from the current patching approach. It doesn't modify current ADOT functionality or the upstream span. It just registers the ADOT SPI implementation and sets up the interceptor hooks.
Core Components
AdotAwsSdkInstrumentationModule
InstrumentationModule
SPItypeInstrumentations
methodAdotAwsSdkClientInstrumentation
AdotAwsSdkTracingRequestHandler
RequestHandler2
beforeRequest
: Captures final SDK request after upstream modificationsafterAttempt
: Processes response before span closure in upstreamResources Folder
Key Design Decisions
Instrumentation Ordering
Lifecycle Hook Points
beforeRequest
: Last point to access modified requestafterAttempt
: Final opportunity to enrich span before closureTesting
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.