Merge 2.11.5 back into main branch #1201
Merged
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.
Changes
Adaptive Sampling:
Other changes that were made to handle merge conflicts/build issues:
ParentBasedSampler) instead of wrapping theXrayRulesSamplerwith aParentBasedSampler. This ensures theXrayRulesSampler's adaptive sampling logic still takes effect in all cases. Ensure all XRay Sampler functionality is under ParentBased logic open-telemetry/opentelemetry-java-contrib#1488W3CBaggagePropagator.getInstance().inject(context.with(baggage), carrier, setter).Testing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.