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

Chore: Upgrade otel dependencies #86994

Merged
merged 8 commits into from Apr 30, 2024
Merged

Chore: Upgrade otel dependencies #86994

merged 8 commits into from Apr 30, 2024

Conversation

marefr
Copy link
Member

@marefr marefr commented Apr 26, 2024

Upgrades all otel dependencies to latest versions.

Dependent on grafana/grafana-plugin-sdk-go#967

@marefr marefr added no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes labels Apr 26, 2024
@marefr marefr added this to the 11.1.x milestone Apr 26, 2024
@marefr marefr self-assigned this Apr 26, 2024
@marefr marefr requested review from a team as code owners April 26, 2024 13:57
go.mod Outdated
@@ -469,3 +469,5 @@ exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible

// Use our fork xorm. go.work currently overrides this and points to the local ./pkg/util/xorm directory.
replace xorm.io/xorm => github.com/grafana/grafana/pkg/util/xorm v0.0.1

replace github.com/grafana/grafana-plugin-sdk-go => github.com/grafana/grafana-plugin-sdk-go v0.227.1-0.20240426134450-5fe9f7b9dfd4
Copy link
Member

Choose a reason for hiding this comment

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

should this be in go.work so that it is used in all sub-modules?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question. When new release of SDK is tagged the replace is removed and go.mod files updated in each module. I guess you mean for the purpose of testing these changes?

Copy link
Member Author

Choose a reason for hiding this comment

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

It would be nice with a similar command go mod edit -replace github.com/grafana/grafana-plugin-sdk-go=github.com/grafana/grafana-plugin-sdk-go@5fe9f7b9dfd42396cc596c72084afbb3ffc39f28 for go work. Guess that doesn't exist?

Copy link
Member Author

Choose a reason for hiding this comment

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

I did update go.work instead. Was a bit weird since I first had to add it to go.mod with a go mod edit as above and then go mod tidy and then move the replace line into go.work.

@marefr marefr requested a review from toddtreece April 30, 2024 10:54
go.work Outdated Show resolved Hide resolved
@marefr marefr requested a review from andresmgot April 30, 2024 11:28
Copy link
Contributor

@andresmgot andresmgot left a comment

Choose a reason for hiding this comment

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

LGTM

@marefr marefr merged commit 2fc9937 into main Apr 30, 2024
13 checks passed
@marefr marefr deleted the chore_upgr_otel branch April 30, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/backend no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes
Projects
Status: 🚀 Shipped
Development

Successfully merging this pull request may close these issues.

None yet

3 participants