[8.19] Fix merge conflicts in NOTICE files for otel 1.41.0 → 1.42.0 bump#6569
Merged
swiatekm merged 2 commits intomergify/bp/8.19/pr-6535from Mar 11, 2026
Merged
[8.19] Fix merge conflicts in NOTICE files for otel 1.41.0 → 1.42.0 bump#6569swiatekm merged 2 commits intomergify/bp/8.19/pr-6535from
swiatekm merged 2 commits intomergify/bp/8.19/pr-6535from
Conversation
…h v1.42.0 Co-authored-by: swiatekm <[email protected]>
Copilot
AI
changed the title
[WIP] Bump go.opentelemetry.io/otel from 1.41.0 to 1.42.0
[8.19] Fix merge conflicts in NOTICE files for otel 1.41.0 → 1.42.0 bump
Mar 11, 2026
swiatekm
approved these changes
Mar 11, 2026
swiatekm
requested review from
blakerouse and
ycombinator
and removed request for
a team
swiatekm
added a commit
that referenced
this pull request
Mar 11, 2026
…m 1.41.0 to 1.42.0 (#6557) * build(deps): bump go.opentelemetry.io/otel from 1.41.0 to 1.42.0 (#6535) * build(deps): bump go.opentelemetry.io/otel from 1.41.0 to 1.42.0 Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.41.0 to 1.42.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.41.0...v1.42.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-version: 1.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit aef48a3) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod * [8.19] build(deps): bump go.opentelemetry.io/otel from 1.41.0 to 1.42.0 (#6567) * Initial plan * fix: resolve go.mod merge conflicts for otel 1.41.0 -> 1.42.0 bump Co-authored-by: swiatekm <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: swiatekm <[email protected]> * [8.19] Fix merge conflicts in NOTICE files for otel 1.41.0 → 1.42.0 bump (#6569) * Initial plan * Fix merge conflicts in NOTICE.txt and NOTICE-fips.txt, regenerate with v1.42.0 Co-authored-by: swiatekm <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: swiatekm <[email protected]> --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <[email protected]> Co-authored-by: swiatekm <[email protected]>
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
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.
Backporting the
go.opentelemetry.io/otelbump from 1.41.0 to 1.42.0 left unresolved merge conflicts in bothNOTICE.txtandNOTICE-fips.txt.Changes
mage check:noticeto fully regenerate both files, ensuringgo.opentelemetry.io/otel v1.42.0is correctly reflected and all stale v1.41.0 references are removed💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.