Skip to content

[9.1] (backport #9858) feat: Update OTel Collector components to v0.135.0#10849

Merged
swiatekm merged 7 commits into
9.1from
mergify/bp/9.1/pr-9858
Oct 28, 2025
Merged

[9.1] (backport #9858) feat: Update OTel Collector components to v0.135.0#10849
swiatekm merged 7 commits into
9.1from
mergify/bp/9.1/pr-9858

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 27, 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
```<hr>This is an automatic backport of pull request #9858 done by [Mergify](https://mergify.com).

@mergify mergify Bot requested a review from a team as a code owner October 27, 2025 07:20
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Oct 27, 2025
@mergify mergify Bot requested review from michalpristas and swiatekm and removed request for a team October 27, 2025 07:20
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 27, 2025

Cherry-pick of ecb0e06 has failed:

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

You are currently cherry-picking commit ecb0e0644.
  (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:   .ci/scripts/update-otel.sh
	modified:   .golangci.yml
	new file:   changelog/fragments/1757406841-update-otel-components-to-v0.135.0.yaml
	modified:   internal/pkg/otel/manager/manager_test.go
	modified:   internal/pkg/otel/translate/otelconfig_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

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

@github-actions github-actions Bot added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Oct 27, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 27, 2025

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

@elasticmachine
Copy link
Copy Markdown
Contributor

⏳ Build in-progress, with failures

Failed CI Steps

History

cc @swiatekm

andrzej-stencel and others added 7 commits October 28, 2025 12:17
* 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
This reverts commit 81ea886.
@swiatekm swiatekm merged commit 986816d into 9.1 Oct 28, 2025
30 checks passed
@swiatekm swiatekm deleted the mergify/bp/9.1/pr-9858 branch October 28, 2025 16:15
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-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants