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

Use the custom opentelemetry branch that has cve-2024-36129 appiled #6940

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

mattdurham
Copy link
Collaborator

PR Description

This changes the go.mod to use a custom fork of otel that is derived from our existing custom fork, that has the changes applied. Manually ran to ensure the default was being set and appropriate action taken.

PR Checklist

  • CHANGELOG.md updated
  • Documentation added

### Breaking changes


- Applied OpenTelemetry [CVE-2024-36129](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) fixes. (@mattdurham)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I used a slightly different type of note from Alloy here since its a fork.

@clayton-cornell clayton-cornell requested a review from a team June 6, 2024 16:06
Copy link
Contributor

@clayton-cornell clayton-cornell left a comment

Choose a reason for hiding this comment

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

Approving for docs. The change here is small. Over to the @grafana/grafana-agent-maintainers for dev review.

@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Jun 6, 2024
@mattdurham mattdurham merged commit 8e6a087 into main Jun 7, 2024
11 checks passed
@mattdurham mattdurham deleted the update_otel_cve-2024-36129 branch June 7, 2024 13:04
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Jul 8, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants