Skip to content

[Chore] Update otel components to v0.127.0/v0.121.0#7686

Merged
jlind23 merged 15 commits intoelastic:mainfrom
khushijain21:updateotel
Apr 7, 2025
Merged

[Chore] Update otel components to v0.127.0/v0.121.0#7686
jlind23 merged 15 commits intoelastic:mainfrom
khushijain21:updateotel

Conversation

@khushijain21
Copy link
Contributor

@khushijain21 khushijain21 commented Apr 3, 2025

What does this PR do?

It updates all otel components except prometheus-receiver due to its dependency on higher prometheus version (which conflicts with beats code). We should update prometheus-receiver once the following issue is resolved. See elastic/beats#42916

This is a temporary solution to unblock us with otel related work on main branch.

This update was performed using following command

.ci/scripts/otel-update.sh v0.121.0 v1.27.0 v0.121.0 

and manually degraded the version of prometheus-receiver.
Skipping changelog for now.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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

Related issues

@mergify
Copy link
Contributor

mergify bot commented Apr 3, 2025

This pull request does not have a backport label. Could you fix it @khushijain21? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.
@khushijain21
Copy link
Contributor Author

/test

@khushijain21 khushijain21 requested a review from leehinman April 3, 2025 15:15
@mergify
Copy link
Contributor

mergify bot commented Apr 3, 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 updateotel upstream/updateotel
git merge upstream/main
git push upstream updateotel
@khushijain21
Copy link
Contributor Author

/test

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Apr 4, 2025
@elasticmachine
Copy link
Contributor

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

mauri870
mauri870 previously approved these changes Apr 4, 2025
Copy link
Member

@mauri870 mauri870 left a comment

Choose a reason for hiding this comment

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

I tested this manually: elastic-agent compiles, the collector appears to work as before, and all tests pass. I think it's fine to merge this.

One concern is the prometheusreceiver. The collector compiles, but does it actually work with the different version of the receiver? I suppose the best way to be sure is to create a configuration using prometheusreceiver and confirm that it works.

@khushijain21
Copy link
Contributor Author

khushijain21 commented Apr 4, 2025

One concern is the prometheusreceiver. The collector compiles, but does it actually work with the different version of the receiver? I suppose the best way to be sure is to create a configuration using prometheusreceiver and confirm that it works.

Well, one reason I wouldn't want to test it out - is because this is a temporary solution (to unblock us). We should soon be able to ramp the prometheus-receiver version and any concerns regarding version compatibility can rest

@khushijain21 khushijain21 requested a review from cmacknz April 4, 2025 11:52
@pkoutsovasilis
Copy link
Contributor

@khushijain21 @mauri870 what backports we need here?

@mauri870 mauri870 added the backport-8.x Automated backport to the 8.x branch with mergify label Apr 4, 2025
@mauri870
Copy link
Member

mauri870 commented Apr 4, 2025

@khushijain21 @mauri870 what backports we need here?

Based on the original PR, only 8.x which I just added.

@cmacknz
Copy link
Member

cmacknz commented Apr 4, 2025

Skipping changelog for now.

I think there should be a changelog for the bump to otel 0.121.0. There are tons of changes included in upstream releases so we shouldn't silently do these version bumps.

@khushijain21 khushijain21 requested a review from mauri870 April 4, 2025 16:18
cmacknz
cmacknz previously approved these changes Apr 4, 2025
Copy link
Member

@cmacknz cmacknz left a comment

Choose a reason for hiding this comment

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

Thanks for the updates!

@khushijain21 khushijain21 added the backport-9.0 Automated backport to the 9.0 branch label Apr 7, 2025
@khushijain21
Copy link
Contributor Author

/test

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @khushijain21

@khushijain21 khushijain21 enabled auto-merge (squash) April 7, 2025 05:55
@jlind23 jlind23 disabled auto-merge April 7, 2025 05:56
@jlind23 jlind23 enabled auto-merge (squash) April 7, 2025 05:58
@jlind23 jlind23 merged commit b2c19df into elastic:main Apr 7, 2025
13 checks passed
mergify bot pushed a commit that referenced this pull request Apr 7, 2025
* updateotel to v0.127.0 and v.121.0 respectively

* do not update prometheus receiver

* remove prometheus receiver dependency

* fix component.go

* fix component.go

* change flush_timeout

* revert permission

* replace pr-receiver

* add changelog

* fix changelog summary

---------

Co-authored-by: System Administrator <root@Khushis-MacBook-Pro.local>
(cherry picked from commit b2c19df)

# Conflicts:
#	go.mod
#	go.sum
mergify bot pushed a commit that referenced this pull request Apr 7, 2025
* updateotel to v0.127.0 and v.121.0 respectively

* do not update prometheus receiver

* remove prometheus receiver dependency

* fix component.go

* fix component.go

* change flush_timeout

* revert permission

* replace pr-receiver

* add changelog

* fix changelog summary

---------

Co-authored-by: System Administrator <root@Khushis-MacBook-Pro.local>
(cherry picked from commit b2c19df)

# Conflicts:
#	.golangci.yml
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/components.go
#	testing/integration/beat_receivers_test.go
khushijain21 added a commit that referenced this pull request Apr 7, 2025
* updateotel to v0.127.0 and v.121.0 respectively

* do not update prometheus receiver

* remove prometheus receiver dependency

* fix component.go

* fix component.go

* change flush_timeout

* revert permission

* replace pr-receiver

* add changelog

* fix changelog summary

---------

Co-authored-by: System Administrator <root@Khushis-MacBook-Pro.local>
khushijain21 pushed a commit that referenced this pull request Apr 8, 2025
…1.0 (#7717)

* [Chore] Update otel components to v0.127.0/v0.121.0 (#7686)
khushijain21 pushed a commit that referenced this pull request Apr 22, 2025
…1.0 (#7718)

* [Chore] Update otel components to v0.127.0/v0.121.0 (#7686)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x Automated backport to the 8.x branch with mergify backport-9.0 Automated backport to the 9.0 branch Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

7 participants