Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 22, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 7, 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


This is an automatic backport of pull request #7686 done by [Mergify](https://mergify.com).

* 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
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 7, 2025
@mergify mergify bot requested a review from a team as a code owner April 7, 2025 06:00
@mergify mergify bot requested review from kaanyalti and andrzej-stencel and removed request for a team April 7, 2025 06:00
Copy link
Contributor Author

mergify bot commented Apr 7, 2025

Cherry-pick of b2c19df has failed:

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

You are currently cherry-picking commit b2c19df3e.
  (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/1743783374-update-otel-v0.121.0.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .golangci.yml
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md
	both modified:   internal/pkg/otel/components.go
	deleted by us:   testing/integration/beat_receivers_test.go

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 the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Apr 7, 2025
@elasticmachine
Copy link
Contributor

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

Copy link
Contributor Author

mergify bot commented Apr 7, 2025

This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏

@andrzej-stencel andrzej-stencel changed the title [9.0](backport #7686) [Chore] Update otel components to v0.127.0/v0.121.0 [9.0](backport #7686) [Chore] Update otel components to v1.27.0/v0.121.0 Apr 7, 2025
Copy link
Contributor Author

mergify bot commented Apr 14, 2025

This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏

Copy link
Contributor Author

mergify bot commented Apr 15, 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/9.0/pr-7686 upstream/mergify/bp/9.0/pr-7686
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-7686

Copy link
Contributor Author

mergify bot commented Apr 21, 2025

This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏

@khushijain21 khushijain21 force-pushed the mergify/bp/9.0/pr-7686 branch from b063ad7 to ab63a51 Compare April 22, 2025 04:30
@khushijain21 khushijain21 requested review from a team as code owners April 22, 2025 04:30
Copy link
Contributor Author

mergify bot commented Apr 22, 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/9.0/pr-7686 upstream/mergify/bp/9.0/pr-7686
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-7686

@khushijain21 khushijain21 force-pushed the mergify/bp/9.0/pr-7686 branch from b6ed3d7 to 8ce90b1 Compare April 22, 2025 05:00
Copy link
Contributor Author

mergify bot commented Apr 22, 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/9.0/pr-7686 upstream/mergify/bp/9.0/pr-7686
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-7686

Copy link

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @khushijain21

@khushijain21 khushijain21 enabled auto-merge (squash) April 22, 2025 09:17
@khushijain21 khushijain21 merged commit 8a24295 into 9.0 Apr 22, 2025
12 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/9.0/pr-7686 branch April 22, 2025 09:18
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 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.

2 participants