Skip to content

[9.1](backport #46464) chore: update OTel Collector libraries to v1.41.0/v0.135.0#46781

Merged
khushijain21 merged 11 commits into
9.1from
mergify/bp/9.1/pr-46464
Oct 14, 2025
Merged

[9.1](backport #46464) chore: update OTel Collector libraries to v1.41.0/v0.135.0#46781
khushijain21 merged 11 commits into
9.1from
mergify/bp/9.1/pr-46464

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 25, 2025

Proposed commit message

Updates the OpenTelemetry Collector dependencies to the current latest versions v1.41.0/v0.135.0. See changelogs since v1.36.0/v0.130.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 #46464 done by [Mergify](https://mergify.com).

* chore: update OTel Collector libraries to `v1.41.0`/`v0.135.0`

* fix(auditbeat): update ebpfevents to `v0.8.0`

Resolves dependency conflict on github.com/cilium/ebpf.

* make notice

* test: fix TestFilebeatOTelE2E integration test

The property `flush_timeout` has been required since v0.134.0.
I believe this is a result of fixing config validation in open-telemetry/opentelemetry-collector#13611.

* test: fix unit tests

(cherry picked from commit 16c4d9a)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Sep 25, 2025
@mergify mergify Bot requested review from a team as code owners September 25, 2025 04:27
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 25, 2025

Cherry-pick of 16c4d9a has failed:

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

You are currently cherry-picking commit 16c4d9a1a.
  (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:   libbeat/otelbeat/beatconverter/beatconverter_test.go
	modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
	modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go
	modified:   x-pack/filebeat/tests/integration/otel_test.go
	modified:   x-pack/metricbeat/tests/integration/otel_test.go

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

@mergify mergify Bot removed the request for review from a team September 25, 2025 04:27
@mergify mergify Bot requested a review from rdner September 25, 2025 04:27
@mergify mergify Bot added the backport label Sep 25, 2025
@mergify mergify Bot requested a review from mauri870 September 25, 2025 04:27
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Sep 25, 2025
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 25, 2025
@github-actions
Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@github-actions github-actions Bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 25, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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 Sep 25, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 25, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.1/pr-46464 upstream/mergify/bp/9.1/pr-46464
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-46464

@khushijain21 khushijain21 enabled auto-merge (squash) September 26, 2025 08:16
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 29, 2025

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 6, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.1/pr-46464 upstream/mergify/bp/9.1/pr-46464
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-46464

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 6, 2025

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

@khushijain21 khushijain21 enabled auto-merge (squash) October 7, 2025 11:24
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 13, 2025

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

@pierrehilbert
Copy link
Copy Markdown
Contributor

There is something strange here
version = "9.1.2-SNAPSHOT" -> null

@pkoutsovasilis do you know what could lead us to use this old version?

@pkoutsovasilis
Copy link
Copy Markdown
Contributor

@pierrehilbert although not fully familiar with beats CI, I do believe that this is the reason you see here 9.1.2 for the FIPS ECH integration tests

STACK_VERSION="9.1.2-SNAPSHOT"

@pierrehilbert
Copy link
Copy Markdown
Contributor

#47081

@khushijain21 khushijain21 merged commit a7b2ac9 into 9.1 Oct 14, 2025
207 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/9.1/pr-46464 branch October 14, 2025 11:46
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 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.

5 participants