Skip to content

Conversation

@andrzej-stencel
Copy link
Contributor

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

What does this PR do?

Updates the OpenTelemetry Collector dependencies to the current latest version v0.135.0. See changelogs since v1.36.0/v0.130.0 for Core and Contrib.

Why is it important?

We should be keeping the OTel components up to date with upstream as much as possible.

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/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

How to test this PR locally

go build . sudo ./elastic-agent otel
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
@mergify
Copy link
Contributor

mergify bot commented Sep 10, 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 
Not sure why it got downgraded to v1.7.0
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.
ChrsMark
ChrsMark previously approved these changes Sep 16, 2025
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM regarding the version upgrade.

This Beats commit has the update to OTel v0.135.0.
@andrzej-stencel andrzej-stencel marked this pull request as ready for review September 18, 2025 18:14
@andrzej-stencel andrzej-stencel requested review from a team as code owners September 18, 2025 18:14
florianl
florianl previously approved these changes Sep 19, 2025
swiatekm
swiatekm previously approved these changes Sep 19, 2025
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Looked through all the changelogs and didn't see any breaking changes related to the components we ship.

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @andrzej-stencel

@andrzej-stencel andrzej-stencel enabled auto-merge (squash) September 22, 2025 07:39
@andrzej-stencel andrzej-stencel merged commit ecb0e06 into elastic:main Sep 22, 2025
23 checks passed
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>
@andrzej-stencel andrzej-stencel deleted the update-otel-to-v0.135.0 branch September 29, 2025 12:54
@khushijain21 khushijain21 added backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch labels Oct 27, 2025
mergify bot pushed a commit 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 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 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 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 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 Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

9 participants