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

update the opentelemetry module version from 0.97.0 to 0.102.1 #3784

Merged
merged 4 commits into from
Jun 19, 2024

Conversation

debasishbsws
Copy link
Contributor

What this PR does:

This PR basically try to update the opentelemetry module version from 0.97.0 to 0.102.1

The reason for this update is a high severity CVE GHSA-c74f-6mfw-mm4v that effect this software.

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
    There is no functionality change
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Even it dose not get merge, I want someone to update the module version to its latest. You can take this PR as a reference

@CLAassistant
Copy link

CLAassistant commented Jun 18, 2024

CLA assistant check
All committers have signed the CLA.

@yvrhdn
Copy link
Member

yvrhdn commented Jun 18, 2024

Thank you! I appreciate the quick PR, I was trying to make a similar update but got stuck on shim.go. I've approved the CI build.

Can you also update CHANGELOG.md?

Signed-off-by: debasishbsws <[email protected]>
@debasishbsws
Copy link
Contributor Author

Hey @kvrhdn I have Updated the CHANGELOG.md.

@yvrhdn
Copy link
Member

yvrhdn commented Jun 18, 2024

Thanks! Looks like CI is about two things:

  • unused parameter
modules/distributor/receiver/shim.go:195:57: unused-parameter: parameter 'settings' seems to be unused, consider removing or renaming it as _ (revive)
	mockProviderFactory := confmap.NewProviderFactory(func(settings confmap.ProviderSettings) confmap.Provider {
  • need to run go mod tidy in tempo-serverless

@debasishbsws
Copy link
Contributor Author

Looks like all the test are passing 😃

Copy link
Member

@yvrhdn yvrhdn left a comment

Choose a reason for hiding this comment

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

Verified with a quick test that the receiver config is being picked up 👍

Can you address the merge conflict then we are ready to merge I think 🙂

@yvrhdn yvrhdn merged commit d0b7922 into grafana:main Jun 19, 2024
14 checks passed
@yvrhdn
Copy link
Member

yvrhdn commented Jun 19, 2024

Once again, thank you for the quick PR!

@debasishbsws debasishbsws deleted the opentelemetry-cve branch June 19, 2024 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants