[chore] update test for confmap changes #32660
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
mx-psi
previously approved these changes
Apr 24, 2024
|
Doesn't look like this worked 🤔 |
|
This passes if core applies open-telemetry/opentelemetry-collector#9862. |
Oh, okay, so we need to merge the two PRs together |
atoulme
requested review from
djaglowski,
MovieStoreGuy,
andrzej-stencel,
crobert-1,
dashpole,
jmacd,
dmitryax,
codeboten,
fatsheep9146,
jpkrohling,
Aneurysm9,
TylerHelmuth,
yurishkuro,
bogdandrutu and
evan-bradley
as code owners
atoulme
force-pushed
the
fix_test_confmap
branch
3 times, most recently
from
a6622e9 to
192795a
Compare
…l via confmap first
Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>
Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>
crobert-1
reviewed
May 23, 2024
atoulme
force-pushed
the
fix_test_confmap
branch
2 times, most recently
from
515cccf to
830fdaa
Compare
dmitryax
reviewed
May 24, 2024
| @@ -222,6 +222,7 @@ jobs: | |||
| - name: Gen genotelcontribcol | |||
| run: | | |||
| make genotelcontribcol | |||
| git diff | |||
There was a problem hiding this comment.
yes, it's probably not hurting to leave it
There was a problem hiding this comment.
ah ok I'll remove it
dmitryax
approved these changes
May 24, 2024
dmitryax
pushed a commit
that referenced
this pull request
May 24, 2024
Follow up to #32660 - remove debug statement
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:
Update test to be compatible with confmap changes to unmarshal via confmap first