Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2025

What does this PR do?

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

Also updates Elastic OTel components to versions compatible with upstream v0.137.0.

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 #10391 done by [Mergify](https://mergify.com).

* sed -i 's/\(go\.opentelemetry\.io\/collector.*\) v0\.135.0/\1 v0.137.0/' go.mod

* sed -i 's/\(go\.opentelemetry\.io\/collector.*\) v1\.41\.0/\1 v1.43.0/' go.mod

* sed -i 's/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) v0\.135\.0/\1 v0.137.0/' go.mod

* go mod tidy

* update Elastic components

* remove Elastic Trace processor

In anticipation of #10378

* go get go.opentelemetry.io/[email protected]

* go mod tidy

* add changelog entry

(cherry picked from commit 7ea323e)

# Conflicts:
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner October 8, 2025 10:43
@mergify mergify bot requested review from michalpristas and straistaru and removed request for a team October 8, 2025 10:43
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 8, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 8, 2025

Cherry-pick of 7ea323e has failed:

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

You are currently cherry-picking commit 7ea323ea1.
  (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:   NOTICE-fips.txt
	modified:   NOTICE.txt
	new file:   changelog/fragments/1759863922-update-otel-to-v0.137.0.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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 enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Oct 8, 2025
@elasticmachine
Copy link
Collaborator

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

@swiatekm swiatekm self-requested a review October 8, 2025 10:54
@andrzej-stencel andrzej-stencel marked this pull request as draft October 8, 2025 11:22
@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @andrzej-stencel

@andrzej-stencel andrzej-stencel marked this pull request as ready for review October 8, 2025 20:53
@andrzej-stencel andrzej-stencel merged commit 41df190 into 9.2 Oct 8, 2025
21 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/9.2/pr-10391 branch October 8, 2025 20:54
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 enhancement New feature or 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