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

khushijain21 · 2025-04-03T06:28:42Z

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

Supersedes [chore] Update prometheus to match OTel v0.120.0 beats#42748, Update OTel components to v0.120.x #7663

mergify · 2025-04-03T06:29:37Z

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 · 2025-04-03T08:24:58Z

/test

mergify · 2025-04-03T18:46:54Z

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

testing/integration/beat_receivers_test.go

…otel

khushijain21 · 2025-04-04T02:28:02Z

/test

elasticmachine · 2025-04-04T06:41:55Z

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

mauri870

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 · 2025-04-04T11:16:44Z

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

pkoutsovasilis · 2025-04-04T12:36:35Z

@khushijain21 @mauri870 what backports we need here?

mauri870 · 2025-04-04T13:16:40Z

@khushijain21 @mauri870 what backports we need here?

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

cmacknz · 2025-04-04T15:51:53Z

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.

cmacknz

Thanks for the updates!

khushijain21 · 2025-04-07T04:15:14Z

/test

elastic-sonarqube · 2025-04-07T05:14:04Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

elasticmachine · 2025-04-07T05:51:47Z

💚 Build Succeeded

Buildkite Build
Commit: 8630ca3

History

💔 Build #19639 failed 8630ca3
💚 Build #19623 succeeded 5528e62
💛 Build #19597 was flaky 63e705d
💔 Build #19587 failed 488a088
💔 Build #19586 failed 488a088

cc @khushijain21

* 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 <[email protected]> (cherry picked from commit b2c19df) # Conflicts: # go.mod # go.sum

* 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 <[email protected]> (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

* 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 <[email protected]>

…1.0 (#7717) * [Chore] Update otel components to v0.127.0/v0.121.0 (#7686)

…1.0 (#7718) * [Chore] Update otel components to v0.127.0/v0.121.0 (#7686)

khushijain21 added 3 commits April 3, 2025 11:36

updateotel to v0.127.0 and v.121.0 respectively

5c4ef97

do not update prometheus receiver

4395322

remove prometheus receiver dependency

d60b10e

khushijain21 requested a review from a team as a code owner April 3, 2025 06:28

khushijain21 requested review from andrzej-stencel and michel-laterman April 3, 2025 06:28

mergify bot assigned khushijain21 Apr 3, 2025

khushijain21 added 2 commits April 3, 2025 12:05

fix component.go

a61e29e

fix component.go

13a8638

khushijain21 added the skip-changelog label Apr 3, 2025

khushijain21 added 2 commits April 3, 2025 18:52

Merge branch 'main' into updateotel

2470bc6

change flush_timeout

5f94206

khushijain21 requested a review from leehinman April 3, 2025 15:15

mauri870 reviewed Apr 3, 2025

View reviewed changes

testing/integration/beat_receivers_test.go Show resolved Hide resolved

System Administrator and others added 2 commits April 4, 2025 07:08

Merge remote-tracking branch 'refs/remotes/upstream/main' into update…

00ccf07

…otel

revert permission

488a088

Merge branch 'main' into updateotel

63e705d

pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Apr 4, 2025

khushijain21 requested a review from pkoutsovasilis April 4, 2025 08:26

mauri870 previously approved these changes Apr 4, 2025

View reviewed changes

khushijain21 requested a review from cmacknz April 4, 2025 11:52

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

khushijain21 removed the skip-changelog label Apr 4, 2025

add changelog

912892a

khushijain21 requested a review from mauri870 April 4, 2025 16:18

Merge branch 'main' into updateotel

5528e62

cmacknz previously approved these changes Apr 4, 2025

View reviewed changes

fix changelog summary

92793c9

khushijain21 dismissed cmacknz’s stale review via 92793c9 April 7, 2025 02:55

Merge branch 'main' into updateotel

8630ca3

khushijain21 added the backport-9.0 Automated backport to the 9.0 branch label Apr 7, 2025

khushijain21 enabled auto-merge (squash) April 7, 2025 05:55

jlind23 approved these changes Apr 7, 2025

View reviewed changes

jlind23 disabled auto-merge April 7, 2025 05:56

jlind23 enabled auto-merge (squash) April 7, 2025 05:58

jlind23 merged commit b2c19df into elastic:main Apr 7, 2025
13 checks passed

mergify bot mentioned this pull request Apr 7, 2025

[8.x](backport #7686) [Chore] Update otel components to v1.27.0/v0.121.0 #7717

Merged

8 tasks

mergify bot mentioned this pull request Apr 7, 2025

[9.0](backport #7686) [Chore] Update otel components to v1.27.0/v0.121.0 #7718

Merged

8 tasks

andrzej-stencel mentioned this pull request Apr 7, 2025

Update OTel components to v0.120.x #6912

Closed

3 tasks

This was referenced Apr 7, 2025

[chore] Update prometheus to match OTel v0.120.0 elastic/beats#42748

Closed

Update OTel components to v0.120.x #7663

Closed

khushijain21 pushed a commit that referenced this pull request Apr 8, 2025

[8.x](backport #7686) [Chore] Update otel components to v1.27.0/v0.12…

2934a3a

…1.0 (#7717) * [Chore] Update otel components to v0.127.0/v0.121.0 (#7686)

leehinman mentioned this pull request Apr 12, 2025

make including prometheus optional elastic/beats#43516

Closed

khushijain21 pushed a commit that referenced this pull request Apr 22, 2025

[9.0](backport #7686) [Chore] Update otel components to v1.27.0/v0.12…

8a24295

…1.0 (#7718) * [Chore] Update otel components to v0.127.0/v0.121.0 (#7686)

swiatekm mentioned this pull request Apr 25, 2025

[9.0](backport #6801) [e2e] Add tests for self monitoring agent logs in otel mode #7950

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

khushijain21 commented Apr 3, 2025 •

edited by mauri870

Loading

Uh oh!

mergify bot commented Apr 3, 2025

Uh oh!

khushijain21 commented Apr 3, 2025

Uh oh!

mergify bot commented Apr 3, 2025

Uh oh!

Uh oh!

khushijain21 commented Apr 4, 2025

Uh oh!

elasticmachine commented Apr 4, 2025

Uh oh!

mauri870 left a comment

Uh oh!

khushijain21 commented Apr 4, 2025 •

edited

Loading

Uh oh!

pkoutsovasilis commented Apr 4, 2025

Uh oh!

mauri870 commented Apr 4, 2025 •

edited

Loading

Uh oh!

cmacknz commented Apr 4, 2025

Uh oh!

cmacknz left a comment

Uh oh!

khushijain21 commented Apr 7, 2025

Uh oh!

elastic-sonarqube bot commented Apr 7, 2025

Uh oh!

elasticmachine commented Apr 7, 2025

Uh oh!

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

khushijain21 commented Apr 3, 2025 • edited by mauri870 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Checklist

How to test this PR locally

Related issues

Uh oh!

mergify bot commented Apr 3, 2025

Uh oh!

khushijain21 commented Apr 3, 2025

Uh oh!

mergify bot commented Apr 3, 2025

Uh oh!

Uh oh!

khushijain21 commented Apr 4, 2025

Uh oh!

elasticmachine commented Apr 4, 2025

Uh oh!

mauri870 left a comment

Choose a reason for hiding this comment

Uh oh!

khushijain21 commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkoutsovasilis commented Apr 4, 2025

Uh oh!

mauri870 commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmacknz commented Apr 4, 2025

Uh oh!

cmacknz left a comment

Choose a reason for hiding this comment

Uh oh!

khushijain21 commented Apr 7, 2025

Uh oh!

elastic-sonarqube bot commented Apr 7, 2025

Quality Gate passed

Uh oh!

elasticmachine commented Apr 7, 2025

💚 Build Succeeded

History

Uh oh!

Uh oh!

Uh oh!

khushijain21 commented Apr 3, 2025 •

edited by mauri870

Loading

khushijain21 commented Apr 4, 2025 •

edited

Loading

mauri870 commented Apr 4, 2025 •

edited

Loading