Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 14, 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).

@mergify mergify bot requested a review from a team as a code owner October 14, 2025 15:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 14, 2025
@mergify mergify bot requested review from rubenruizdegauna and straistaru and removed request for a team October 14, 2025 15:23
@mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 2025

Cherry-pick of 7ea323e has failed:

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

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:
	new file:   changelog/fragments/1759863922-update-otel-to-v0.137.0.yaml

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 enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Oct 14, 2025
@elasticmachine
Copy link
Collaborator

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

@pkoutsovasilis pkoutsovasilis removed the conflicts There is a conflict in the backported pull request label Oct 15, 2025
@pkoutsovasilis
Copy link
Contributor

pkoutsovasilis commented Oct 15, 2025

@ebeahan @cmacknz in order to bump the otel dependencies we have to deprecate also elastictrace-processor as this doesn't exist anymore, any opinions?

@swiatekm
Copy link
Contributor

@ebeahan @cmacknz in order to bump the otel dependencies we have to deprecate also elastictrace-processor as this doesn't exist anymore, any opinions?

We'd need to backport #10378, but reading the comments in that PR, I'm not sure what the final decision was. @gregkalapos are we still replacing the elastic trace processor with a shim?

@pkoutsovasilis pkoutsovasilis requested a review from a team as a code owner October 15, 2025 10:58
@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 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/8.19/pr-10391 upstream/mergify/bp/8.19/pr-10391
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-10391

@pkoutsovasilis pkoutsovasilis force-pushed the mergify/bp/8.19/pr-10391 branch from 424ae8f to 386af85 Compare October 16, 2025 08:08
andrzej-stencel and others added 5 commits October 16, 2025 11:10
* 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:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
@pkoutsovasilis pkoutsovasilis force-pushed the mergify/bp/8.19/pr-10391 branch from 386af85 to b308fb9 Compare October 16, 2025 08:16
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

No conflicts, looks good.

@pkoutsovasilis pkoutsovasilis merged commit 3b9c3b6 into 8.19 Oct 16, 2025
17 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/8.19/pr-10391 branch October 16, 2025 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 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.

5 participants