Skip to content

Conversation

@andrzej-stencel
Copy link
Contributor

@andrzej-stencel andrzej-stencel commented Oct 7, 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

@andrzej-stencel andrzej-stencel added enhancement New feature or request backport-9.2 Automated backport to the 9.2 branch labels Oct 7, 2025
@mergify
Copy link
Contributor

mergify bot commented Oct 7, 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.137.0 upstream/update-otel-to-v0.137.0
git merge upstream/main
git push upstream update-otel-to-v0.137.0

@andrzej-stencel andrzej-stencel marked this pull request as ready for review October 8, 2025 08:25
@andrzej-stencel andrzej-stencel requested a review from a team as a code owner October 8, 2025 08:25
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Oct 8, 2025
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 8, 2025

@andrzej-stencel andrzej-stencel merged commit 7ea323e into elastic:main Oct 8, 2025
23 checks passed
mergify bot pushed a commit that referenced this pull request Oct 8, 2025
* 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
@andrzej-stencel andrzej-stencel deleted the update-otel-to-v0.137.0 branch October 8, 2025 10:48
andrzej-stencel added a commit that referenced this pull request Oct 8, 2025
* 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

Co-authored-by: Andrzej Stencel <[email protected]>
@pkoutsovasilis pkoutsovasilis added the backport-8.19 Automated backport to the 8.19 branch label Oct 14, 2025
mergify bot pushed a commit that referenced this pull request Oct 14, 2025
* 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 pushed a commit that referenced this pull request Oct 16, 2025
* 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 added a commit that referenced this pull request Oct 16, 2025
….137.0 (#10543)

* feat: update OTel Collector components to v0.137.0 (#10391)

* 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

* fix: resolve conflicts

* fix: StartMockES

* [otel] Add back elastictrace processor

* fix: resolve gaps from rebasing

* fix: unit-tests

* fix: update beats to latest version on 8.19

* fix: otelconfig_test.go

---------

Co-authored-by: Andrzej Stencel <[email protected]>
Co-authored-by: Panos Koutsovasilis <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.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.2 Automated backport to the 9.2 branch 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