Skip to content

chore: update OTel Collector libraries to v1.41.0/v0.135.0#46464

Merged
andrzej-stencel merged 12 commits into
elastic:mainfrom
andrzej-stencel:update-otel-to-v0.135.0
Sep 18, 2025
Merged

chore: update OTel Collector libraries to v1.41.0/v0.135.0#46464
andrzej-stencel merged 12 commits into
elastic:mainfrom
andrzej-stencel:update-otel-to-v0.135.0

Conversation

@andrzej-stencel
Copy link
Copy Markdown
Contributor

@andrzej-stencel andrzej-stencel commented Sep 9, 2025

Proposed commit message

Updates the OpenTelemetry Collector dependencies to the current latest versions v1.41.0/v0.135.0. See changelogs since v1.41.0/v0.135.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)

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 9, 2025

🤖 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!)

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Sep 9, 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 update-otel-to-v0.135.0 upstream/update-otel-to-v0.135.0
git merge upstream/main
git push upstream update-otel-to-v0.135.0

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Sep 9, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @andrzej-stencel? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@andrzej-stencel andrzej-stencel added the backport-skip Skip notification from the automated backport with mergify label Sep 9, 2025
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Sep 9, 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 update-otel-to-v0.135.0 upstream/update-otel-to-v0.135.0
git merge upstream/main
git push upstream update-otel-to-v0.135.0

@andrzej-stencel andrzej-stencel marked this pull request as ready for review September 10, 2025 13:43
@andrzej-stencel andrzej-stencel requested a review from a team as a code owner September 10, 2025 13:43
@andrzej-stencel andrzej-stencel added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 10, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 10, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@cmacknz
Copy link
Copy Markdown
Member

cmacknz commented Sep 10, 2025

Will approve once we stabilize CI again, this failure is appearing in a few places.

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Sep 11, 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 update-otel-to-v0.135.0 upstream/update-otel-to-v0.135.0
git merge upstream/main
git push upstream update-otel-to-v0.135.0

@andrzej-stencel andrzej-stencel requested a review from a team as a code owner September 12, 2025 14:51
Comment thread libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Sep 14, 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 update-otel-to-v0.135.0 upstream/update-otel-to-v0.135.0
git merge upstream/main
git push upstream update-otel-to-v0.135.0

@andrzej-stencel
Copy link
Copy Markdown
Contributor Author

Will approve once we stabilize CI again, this failure is appearing in a few places.

@cmacknz can you take a look now that the CI is green?

Comment thread libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
andrzej-stencel added a commit to andrzej-stencel/elastic-agent that referenced this pull request Sep 15, 2025
This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.
andrzej-stencel added a commit to andrzej-stencel/elastic-agent that referenced this pull request Sep 15, 2025
This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.
@andrzej-stencel andrzej-stencel merged commit 16c4d9a into elastic:main Sep 18, 2025
207 checks passed
@andrzej-stencel andrzej-stencel deleted the update-otel-to-v0.135.0 branch September 18, 2025 13:08
andrzej-stencel added a commit to elastic/elastic-agent that referenced this pull request Sep 22, 2025
* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
intxgo pushed a commit to intxgo/elastic-agent that referenced this pull request Sep 24, 2025
* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
@khushijain21
Copy link
Copy Markdown
Contributor

Any reason we are not backporting this to 8.19? I believe we wanted to keep the code as similar as possible between main and 8.19

@khushijain21 khushijain21 added backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch labels Sep 25, 2025
mergify Bot pushed a commit that referenced this pull request Sep 25, 2025
* 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
#	x-pack/filebeat/tests/integration/otel_test.go
#	x-pack/metricbeat/tests/integration/otel_test.go
mergify Bot pushed a commit that referenced this pull request Sep 25, 2025
* 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
khushijain21 pushed a commit that referenced this pull request Oct 7, 2025
….41.0`/`v0.135.0` (#46780)

* chore: update OTel Collector libraries to `v1.41.0`/`v0.135.0` (#46464)
khushijain21 pushed a commit that referenced this pull request Oct 14, 2025
…41.0`/`v0.135.0` (#46781)

* chore: update OTel Collector libraries to `v1.41.0`/`v0.135.0` (#46464)
mergify Bot pushed a commit to elastic/elastic-agent that referenced this pull request Oct 27, 2025
* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
(cherry picked from commit ecb0e06)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
mergify Bot pushed a commit to elastic/elastic-agent that referenced this pull request Oct 27, 2025
* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
(cherry picked from commit ecb0e06)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/manager/manager_test.go
swiatekm pushed a commit to elastic/elastic-agent that referenced this pull request Oct 27, 2025
* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
(cherry picked from commit ecb0e06)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
swiatekm pushed a commit to elastic/elastic-agent that referenced this pull request Oct 28, 2025
* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
(cherry picked from commit ecb0e06)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
swiatekm added a commit to elastic/elastic-agent that referenced this pull request Oct 28, 2025
…35.0 (#10849)

* feat: Update OTel Collector components to v0.135.0 (#9858)

* feat: Update OTel Collector components to v0.135.0

* chore: update Elastic OTel components

go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver

* test: fix test after upstream change

Logging was changed in open-telemetry/opentelemetry-collector#13606

* test: update gotestsum to latest

Not sure why it got downgraded to v1.7.0

* use Beats from branch to verify CI

This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.

* test: fix unit test

* revert "use Beats from branch to verify CI"

This reverts 4813ce3.

* update Beats to 16c4d9a1aa8c

This Beats commit has the update to OTel v0.135.0.

* fix collector's metric names

Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.

* update go-mod-replace allowlist

* mage notice

---------

Co-authored-by: Christos Markou <chrismarkou92@gmail.com>
(cherry picked from commit ecb0e06)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md

* Fix conflicts

* Fix unit tests

* Fix an api change in mockes

* Revert "Fix unit tests"

This reverts commit 81ea886.

* Bump beats dependency and fix tests

* mage notice

---------

Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch backport-skip Skip notification from the automated backport with mergify 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.

8 participants