-
Notifications
You must be signed in to change notification settings - Fork 64
AWS SDK v1.11 Patch Migration #1117
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 22, 2025
pxaws
reviewed
Jul 22, 2025
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkTracingRequestHandler.java
Show resolved
Hide resolved
pxaws
reviewed
Jul 22, 2025
...java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/RequestAccess.java
Show resolved
Hide resolved
pxaws
reviewed
Jul 22, 2025
...java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/RequestAccess.java
Show resolved
Hide resolved
pxaws
reviewed
Jul 22, 2025
...ntelemetry/javaagent/instrumentation/awssdk_v1_11/AwsSdkExperimentalAttributesExtractor.java
Show resolved
Hide resolved
pxaws
previously approved these changes
Jul 23, 2025
thpierce
reviewed
Jul 24, 2025
...ware/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AwsBedrockResourceType.java
Outdated
Show resolved
Hide resolved
...e/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AwsExperimentalAttributes.java
Outdated
Show resolved
Hide resolved
...ntelemetry/javaagent/instrumentation/awssdk_v1_11/AwsSdkExperimentalAttributesExtractor.java
Show resolved
Hide resolved
.../software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParser.java
Outdated
Show resolved
Hide resolved
...are/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParserTest.groovy
Outdated
Show resolved
Hide resolved
...java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/RequestAccess.java
Show resolved
Hide resolved
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkInstrumentationModule.java
Show resolved
Hide resolved
...on/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AdotAwsSdkTracingRequestHandler.java
Show resolved
Hide resolved
thpierce
approved these changes
Jul 24, 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.
Note: This is a continuation of #1115
Description of Changes
This implementation builds on the foundation established in PR #1115, transforming the structural setup into a fully functional SPI-based solution that will replace our current patching approach. This PR does not change the current ADOT functionality because patches have not been removed.
The next/final PR for v1.11 will remove the patches for aws-sdk-1.11 and have unit tests to ensure correct SPI functionality and behaviour. The final PR will also pass all the contract-tests once patches are removed.
Changes include:
NOTE: We are not copying entire files from upstream. Instead, we only migrated the new components that were added by our patches and the methods that use these AWS-specific components. I deliberately removed any code that was untouched by our patches to avoid duplicating upstream instrumentation code. This selective migration ensures we maintain only our AWS-specific additions while letting OTel handle its base functionality.
AwsBedrockResourceType
- patch creates new classAwsExperimentalAttributes
- patch on this otel fileAwsSdkExperimentalAttributesExtractor
- patch on this otel fileBedrockJsonParser
- patch creates new classRequestAccess
- patch on this otel fileBedrockJsonParserTest
- patch creates new classThese added files:
Testing
Related
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.