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.x](backport #6384) Update OTel v0.116.0 #6390

Merged
merged 5 commits into from
Dec 19, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2024

What does this PR do?

Update OTel components to v0.116.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 #6384 done by [Mergify](https://mergify.com).

* sed -i 's/\(go\.opentelemetry\.io\/collector.*\) v0\.115\.0/\1 v0.116.0/' go.mod

* sed -i 's/\(go\.opentelemetry\.io\/collector.*\) v1\.21\.0/\1 v1.22.0/' go.mod

* sed -i 's/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) v0\.115\.0/\1 v0.116.0/' go.mod

* go mod tidy

* mage notice

* mage otel:readme

* add changelog entry

(cherry picked from commit b1fa909)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner December 18, 2024 17:48
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 18, 2024
@mergify mergify bot requested review from michel-laterman and swiatekm and removed request for a team December 18, 2024 17:48
Copy link
Contributor Author

mergify bot commented Dec 18, 2024

Cherry-pick of b1fa909 has failed:

On branch mergify/bp/8.x/pr-6384
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit b1fa909d3.
  (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:
	modified:   NOTICE.txt
	new file:   changelog/fragments/1734525166-update-otel-v0.116.0.yaml
	modified:   internal/pkg/otel/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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

@andrzej-stencel andrzej-stencel enabled auto-merge (squash) December 19, 2024 12:14
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@andrzej-stencel andrzej-stencel merged commit 21a3846 into 8.x Dec 19, 2024
13 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/8.x/pr-6384 branch December 19, 2024 14:58
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants