[tailsamplingprocessor] [chore] Fix merge of #37797 and #37035 #37931
Conversation
This file contains 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
songy23
approved these changes
Feb 14, 2025
|
still failing http://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/13330971221/job/37234850573?pr=37931 if it's a lot of work to fix it, I'd suggest we revert http://github.com/open-telemetry/opentelemetry-collector-contrib/pull/37797. It is blocking mainline |
jpkrohling
approved these changes
Feb 14, 2025
|
@songy23 It's fine, I fixed the test as well |
|
Except @jpkrohling sniped me to it just before I pushed, that works too haha |
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
Two PRs were merged recently on the tailsamplingprocessor, #37797 and #37035. #37035 changed the signature of an internal function in a way that broke #37797. The result is that the component fails to build. This PR fixes that.
This wasn't noticed before merging because 1. there were no merge conflicts, 2. the latest rebase of #37797 was before #37035 was merged, and 3. there is no merge queue to perform final checks.