Skip to content
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

[8.17](backport #6113) Update OTel to v0.114.0 #6176

Merged
merged 6 commits into from
Dec 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2024

What does this PR do?

Update OTel components to v0.114.0.

Why is it important?

We should be keeping the components up to date with upstream.

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 #6113 done by [Mergify](https://mergify.com).

* fix: remove Expand converter

It has been deprecated since v0.107.0 and was removed in v0.114.0.

* sed -i 's/ v0.113.0$/ v0.114.0/' go.mod

* sed -i 's/\(go\.opentelemetry\.io\/.*\) v1\.19\.0$/\1 v1.20.0/' go.mod

* mage otel:readme

* mage notice

* add changelog entry

* mage notice

* update one missed OTel dependency

The sed commands didn't update indirect dependencies.

* go mod tidy && mage notice

(cherry picked from commit 1ab3edc)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/run.go
@mergify mergify bot requested a review from a team as a code owner December 2, 2024 08:19
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 2, 2024
@mergify mergify bot requested review from blakerouse and kaanyalti and removed request for a team December 2, 2024 08:19
Copy link
Contributor Author

mergify bot commented Dec 2, 2024

Cherry-pick of 1ab3edc has failed:

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

You are currently cherry-picking commit 1ab3edcddc.
  (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/1732187698-update-otel-v0.114.0.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md
	both modified:   internal/pkg/otel/run.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

Copy link
Contributor Author

mergify bot commented Dec 2, 2024

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

@pierrehilbert pierrehilbert requested review from andrzej-stencel and removed request for blakerouse and kaanyalti December 2, 2024 09:13
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Dec 2, 2024
@elasticmachine
Copy link
Contributor

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

Copy link

@andrzej-stencel andrzej-stencel merged commit 8a91d5c into 8.17 Dec 2, 2024
14 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/8.17/pr-6113 branch December 2, 2024 13:23
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.

3 participants