[chore] put back replace and add new packages in builder yaml #11909
+73
−10
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
added
Skip Changelog
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #11909 +/- ##
=======================================
Coverage 91.59% 91.59%
=======================================
Files 449 449
Lines 23761 23761
=======================================
Hits 21763 21763
Misses 1623 1623
Partials 375 375 ☔ View full report in Codecov by Sentry. |
songy23
changed the title
songy23
added
the
release:blocker
dmitryax
approved these changes
Dec 16, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 6, 2025
…n-test (#11940) #### Description PR #11793, which added code to automatically generate `replace` clauses in builder-integration-test in order to avoid issues in release PRs, caused [issues in a release PR](https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12358329683/job/34488569900?pr=11904), and was reverted in #11909. The issue ended up being that the `replace` clause for the root collector module (`go.opentelemetry.io/collector`) was missing, because ([cf. previous source code](https://github.com/open-telemetry/opentelemetry-collector/blob/6a47030ba2bf247ec2c533322d1beaf5eada8981/cmd/builder/test/test.sh#L118)) I was generating a list of module paths relative to the root, with an empty string for the root module, which bash helpfully ignored during the for loop below. This PR unreverts #11793, with a fix for the above issue. (We make sure to only strip the initial dot of the folder path _inside_ the for loop.) #### Link to tracking issue Fixes #11607, hopefully correctly this time. #### Testing I replicated the release PR in which the issues arose with a .1 patch version number, replicated the failure that was observed, and checked that the new script has the expected behavior. --------- Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com> Co-authored-by: Bogdan Drutu <bogdandrutu@gmail.com>
sfc-gh-sili
pushed a commit
to sfc-gh-sili/opentelemetry-collector
that referenced
this pull request
Jan 15, 2025
…n-test (open-telemetry#11940) #### Description PR open-telemetry#11793, which added code to automatically generate `replace` clauses in builder-integration-test in order to avoid issues in release PRs, caused [issues in a release PR](https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12358329683/job/34488569900?pr=11904), and was reverted in open-telemetry#11909. The issue ended up being that the `replace` clause for the root collector module (`go.opentelemetry.io/collector`) was missing, because ([cf. previous source code](https://github.com/open-telemetry/opentelemetry-collector/blob/6a47030ba2bf247ec2c533322d1beaf5eada8981/cmd/builder/test/test.sh#L118)) I was generating a list of module paths relative to the root, with an empty string for the root module, which bash helpfully ignored during the for loop below. This PR unreverts open-telemetry#11793, with a fix for the above issue. (We make sure to only strip the initial dot of the folder path _inside_ the for loop.) #### Link to tracking issue Fixes open-telemetry#11607, hopefully correctly this time. #### Testing I replicated the release PR in which the issues arose with a .1 patch version number, replicated the failure that was observed, and checked that the new script has the expected behavior. --------- Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com> Co-authored-by: Bogdan Drutu <bogdandrutu@gmail.com>
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.
This reverts commit 5272797 because it breaks releases, see https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12358329683/job/34488569900?pr=11904
and adds replace of the new x[consumer|experter|...] packages to the builder yaml