Skip to content

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

Merged
andrzej-stencel merged 5 commits into
8.19from
mergify/bp/8.19/pr-51684
Jul 15, 2026
Merged

[8.19](backport #51684) chore: update OTel Collector dependencies to v0.155.0/v1.61.0#51704
andrzej-stencel merged 5 commits into
8.19from
mergify/bp/8.19/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
#	x-pack/otel/distributions/beats-otel-collector/manifest.yaml
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 3, 2026
@mergify mergify Bot requested review from a team as code owners July 3, 2026 08:16
@mergify mergify Bot added the backport label Jul 3, 2026
@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 orestisfl and rdner and removed request for a team July 3, 2026 08:16
@mergify

mergify Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 539bc0e has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   x-pack/otel/distributions/beats-otel-collector/manifest.yaml

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.

@github-actions github-actions Bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Jul 3, 2026
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2026
@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

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

@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 failed Buildkite jobs are caused by unresolved cherry-pick conflict markers in the backport PR, not by independent beat/test failures. The check/update jobs fail because go.mod cannot be parsed, and the pre-commit jobs fail on check-merge-conflict.

Remediation

  • Resolve the backport conflicts in go.mod, go.sum, NOTICE.txt, and x-pack/otel/distributions/beats-otel-collector/manifest.yaml, keeping the intended OTel Collector v0.155.0 / v1.61.0 dependency updates.
  • After committing the resolved files, rerun the failed Buildkite pipeline or at least pre-commit run --all-files plus the affected make -C <beat> check update && make check-no-changes jobs.
Investigation details

Root Cause

This is a configuration / backport conflict failure. Mergify reported that cherry-picking 539bc0e2bfb921ea90dae91506839d6d08826762 into 8.19 left unmerged paths in NOTICE.txt, go.mod, go.sum, and x-pack/otel/distributions/beats-otel-collector/manifest.yaml. The PR diff also contains conflict markers in go.mod, for example around the github.com/prometheus/common and OTel dependency updates.

Because the conflict markers are committed in dependency/config files, every beat-specific check fails before reaching beat-specific tests.

Evidence

../go.mod:107: malformed module path "<<<<<<<": invalid char '<'
../go.mod:126: malformed module path "<<<<<<<": invalid char '<'
../go.mod:178: malformed module path "<<<<<<<": invalid char '<'
../go.mod:254: malformed module path "<<<<<<<": invalid char '<'
make: *** [../dev-tools/make/mage-install.mk:10: mage] Error 1
  • Representative log excerpt from filebeat-filebeat-run-pre-commit.txt:
check for merge conflicts................................................Failed
- hook id: check-merge-conflict

go.sum:242: Merge conflict string '<<<<<<<' found
x-pack/otel/distributions/beats-otel-collector/manifest.yaml:51: Merge conflict string '<<<<<<<' found
go.mod:107: Merge conflict string '<<<<<<<' found

Verification

Not run locally; the CI failure is deterministic from committed conflict markers and occurs before package tests can execute.


What is this? | From workflow: PR Buildkite Detective

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

@mergify

mergify Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

This pull request has not been merged yet. Could you please review and merge it @andrzej-stencel? 🙏

@andrzej-stencel

Copy link
Copy Markdown
Contributor

@copilot fix the conflicts in go.mod file by keeping the more recent versions of each dependency. Then run go mod tidy && make notice and commit the changes to the branch.

Copilot AI commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

@copilot fix the conflicts in go.mod file by keeping the more recent versions of each dependency. Then run go mod tidy && make notice and commit the changes to the branch.

Done. Resolved all conflict markers in go.mod and go.sum by keeping the more recent versions of each dependency (e.g. prometheus/common v0.68.1, bbolt v1.5.0, smithy-go v1.26.0, OTel v1.61.0/v0.155.0), then ran go mod tidy and make notice. Committed in 7a7f1ce.

@mergify

mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

This pull request has not been merged yet. Could you please review and merge it @andrzej-stencel? 🙏

@mergify

mergify Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@andrzej-stencel andrzej-stencel merged commit f5cd8e4 into 8.19 Jul 15, 2026
198 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/8.19/pr-51684 branch July 15, 2026 08:10
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.

2 participants