Skip to content

[9.4](backport #51684) chore: update OTel Collector dependencies to v0.155.0/v1.61.0#51702

Open
mergify[bot] wants to merge 1 commit into
9.4from
mergify/bp/9.4/pr-51684
Open

[9.4](backport #51684) chore: update OTel Collector dependencies to v0.155.0/v1.61.0#51702
mergify[bot] wants to merge 1 commit into
9.4from
mergify/bp/9.4/pr-51684

Conversation

@mergify

@mergify mergify Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Proposed commit message

Updates the OpenTelemetry Collector dependencies to the current latest versions v0.155.0 and v1.61.0. See changes since v0.154.0/v1.60.0 for Core and Contrib.

Why is it important?

We want to be on the latest version to keep up with latest features and bug fixes.

Checklist

  • [ ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

make mage
(cd auditbeat && mage build)
(cd filebeat && mage build)
(cd metricbeat && mage build)
(cd x-pack/filebeat && mage build)
(cd x-pack/metricbeat && mage build)
```<hr>This is an automatic backport of pull request #51684 done by [Mergify](https://mergify.com).

…51684)

* chore: update OTel Collector dependencies to `v0.155.0`/`v1.61.0`

sed -i '' "s/\(go\.opentelemetry\.io\/collector.*\) v0\.154.0/\1 v0.155.0/" go.mod
sed -i '' "s/\(go\.opentelemetry\.io\/collector.*\) v1\.60.0/\1 v1.61.0/" go.mod
sed -i '' "s/\(github.com\/open-telemetry\/opentelemetry-collector-contrib\/.*\) v0\.154.0/\1 v0.155.0/" go.mod

* go mod tidy && make notice

* chore: update distro version

(cherry picked from commit 539bc0e)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify Bot requested review from a team as code owners July 3, 2026 08:15
@mergify mergify Bot added the backport label Jul 3, 2026
@mergify mergify Bot requested a review from a team as a code owner July 3, 2026 08:15
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 3, 2026
@mergify mergify Bot requested review from leehinman and orestisfl and removed request for a team July 3, 2026 08:15
@mergify

mergify Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 539bc0e has failed:

On branch mergify/bp/9.4/pr-51684
Your branch is up to date with 'origin/9.4'.

You are currently cherry-picking commit 539bc0e2b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .buildkite/x-pack/pipeline.xpack.otel.yml
	modified:   x-pack/otel/distributions/beats-otel-collector/manifest.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2026
@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • /test : Run the Buildkite pipeline.

@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2026
@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

TL;DR

All 33 Buildkite failures are caused by unresolved backport merge conflict markers committed into dependency files. The failed SHA still contains <<<<<<< HEAD / ======= / >>>>>>> ... in go.mod and go.sum, and the PR diff also shows unresolved NOTICE.txt chunks.

Remediation

  • Resolve the cherry-pick conflicts in NOTICE.txt, go.mod, and go.sum, keeping the intended OTel Collector v0.155.0 / v1.61.0 dependency updates and removing every conflict delimiter.
  • Regenerate/tidy dependency artifacts as appropriate, then validate with pre-commit run check-merge-conflict --all-files and a scoped check such as make -C x-pack/otel check before rerunning Buildkite.
Investigation details

Root Cause

This is a backport conflict, not an infrastructure failure. The PR is labeled conflicts, and the failed commit 847533faaac568d64c456f5643bcbfac7b423f82 includes unresolved conflict markers in module files:

  • go.mod:240 has <<<<<<< HEAD before the new github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.155.0 requirement.
  • go.mod:283 and go.mod:504 start additional unresolved chunks around OTel dependency requirements.
  • go.sum:880 starts an unresolved chunk between v0.154.0 and v0.155.0 OTel checksums.
  • The fetched PR diff also shows +<<<<<<< HEAD chunks in NOTICE.txt under OTel license sections for filestorage and xextension.

Evidence

  • Build: https://buildkite.com/elastic/beats/builds/48792
  • Jobs/steps: all reported Run check/update, Run check, and Run pre-commit failures share the same dependency-file conflict root cause.
  • Key log excerpt from Auditbeat: Run check/update:
go: errors parsing ../go.mod:
../go.mod:240: malformed module path "<<<<<<<": invalid char '<'
../go.mod:283: unknown directive: <<<<<<<
../go.mod:285: unknown directive: =======
../go.mod:291: unknown directive: >>>>>>>
../go.mod:504: malformed module path "<<<<<<<": invalid char '<'
  • Key log excerpt from Auditbeat: Run pre-commit:
check for merge conflicts................................................Failed
go.mod:240: Merge conflict string '<<<<<<<' found
go.mod:283: Merge conflict string '<<<<<<<' found
go.mod:504: Merge conflict string '<<<<<<<' found
go.sum:880: Merge conflict string '<<<<<<<' found
go.sum:907: Merge conflict string '=======' found
go.sum:936: Merge conflict string '>>>>>>>' found

Verification

I reviewed the Buildkite failure logs, PR metadata/diff, existing PR comments, and the file contents at failed SHA 847533faaac568d64c456f5643bcbfac7b423f82. I did not rerun tests because Go tooling cannot parse go.mod until the conflict markers are removed.


What is this? | From workflow: PR Buildkite Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant