Release/v2.11.1 #1094
Merged
Release/v2.11.1 #1094
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
*Issue #, if available:* *Description of changes:* By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
*Issue #, if available:* We have done the ADOT Java v2.11.0 and as part of the process, we need to merge the changes we made for this release back to the main branch. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. *Description of changes:* * Using GH UI created a new branch based on release/v.2.11.x * Using GH UI created this PR to main * Update otelSnapshotVersion to 2.12.0 in `aws-otel-java-instrumentation.patch` and `dependencyManagement/build.gradle.kts` * Rebased from main By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Michael He <[email protected]> Co-authored-by: ADOT Patch workflow <[email protected]>
A follow up from the 2.11.0 release. We are updating the image tags so the newly released one gets scanned. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
…y#1085) ## What does this pull request do? Cherry picks the Lambda Topology fix from our Lambda Layer v1 branch. Original PR: aws-observability#1016 ## Test strategy Unit tests and followed e2e test strategy used in the [original PR](aws-observability#1016) to sanity check correct behavior in service topology. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
### Description of changes: Since upstream has updated the HTTP semantic conventions, the X-Ray Remote Sampler has been outdated as it's been looking at the older attributes that are no longer emitted. I've created a patch to temporarily fix this until the change is merged upstream. To create the patch file: 1. Cloned the [opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib/) repo 2. Ran `git checkout v1.39.0` to checkout to the same version used by the latest release (2.11.0) 3. Made the changes in the `SamplingRuleApplier.java`, `SamplingRuleApplierTest.java` and the `version.gradle.kts` files 4. Generated the patch file by running `git diff > opentelemetry-java-contrib.patch`. This should be a temporary patch. I'm creating another CR in upstream to fix this issue. Once it's fixed, we will need to update the [io.opentelemetry.contrib:opentelemetry-aws-xray](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/284eed6a7e50237b2a677258bef58e8bf01c71d9/dependencyManagement/build.gradle.kts#L76) version to the latest one. ### Testing: **Testing Setup:** 1. Created a local build of the ADOT Distro by running the following: ``` ./gradlew clean ./scripts/local_patch.sh //applies the patches including the new contrib patch ./gradlew build //this builds everything under the adot repo including the sample apps. ``` 2. Used the [SpringBoot](https://github.com/aws-observability/aws-otel-java-instrumentation/tree/284eed6a7e50237b2a677258bef58e8bf01c71d9/sample-apps/springboot) sample app which includes both the `outgoing-http-call` and the `/aws-sdk-call` APIs 3. Started the AWS Adot Collector in a docker container to retrieve Sampling Rules and to export traces to X-Ray 4. Started the Sample App using the following: ``` JAVA_TOOL_OPTIONS=" -javaagent:/Volumes/workplace/otel/aws-otel-java-instrumentation/otelagent/build/libs/aws-opentelemetry-agent-2.11.0-SNAPSHOT.jar" \ OTEL_METRICS_EXPORTER=none \ OTEL_LOGS_EXPORTER=none \ OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \ OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \ OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \ OTEL_RESOURCE_ATTRIBUTES="service.name=$YOUR_SVC_NAME" \ java -jar /Volumes/workplace/otel/aws-otel-java-instrumentation/sample-apps/springboot/build/libs/springboot-2.11.0-SNAPSHOT.jar ``` **Manual Testing:** For the manual testing. I created three sampling rules 1. Default one with zero sampling 6. Second one with path = `/aws-sdk-call` with 100% sampling 7. Third one with path = `/outgoing-http-call` with 100% sampling 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:**  By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
srprash
approved these changes
Jun 5, 2025
liustve
merged commit b435fb1
into
aws-observability:release/v2.11.x
11 of 16 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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:
Merges changes from mainline to v2.11.1
Namely: #1085 and #1089
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.