Skip to content

Update dependencies for 2.48#12964

Merged
LeviHarrison merged 4 commits intoprometheus:mainfrom
LeviHarrison:bump-deps-2.48
Oct 15, 2023
Merged

Update dependencies for 2.48#12964
LeviHarrison merged 4 commits intoprometheus:mainfrom
LeviHarrison:bump-deps-2.48

Conversation

@LeviHarrison
Copy link
Copy Markdown
Contributor

@LeviHarrison LeviHarrison commented Oct 11, 2023 •
edited
Loading

github.com/digitalocean/godo was causing issues at it requires go 1.21 so I added a hack to not update that

@bboreham bboreham mentioned this pull request Oct 11, 2023
Merged
@roidelapluie
Copy link
Copy Markdown
Member

roidelapluie commented Oct 11, 2023

Can you revert the makefile? I don't think we want this permanently. Maybe a temporary exclude in the go.mod is isnough

@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 11, 2023

I think we would have to exclude every version that has this go requirement individually though (there is more than one) which could get messy/break at any time.

@roidelapluie
Copy link
Copy Markdown
Member

roidelapluie commented Oct 11, 2023

you could still revert the makefile for now.

@bboreham
Copy link
Copy Markdown
Member

bboreham commented Oct 12, 2023

Note there is a comment on the upstream PR that they un-did the change.

@roidelapluie
Copy link
Copy Markdown
Member

roidelapluie commented Oct 12, 2023

Let's use v1.104.1 then, thanks Bryan!

@LeviHarrison LeviHarrison force-pushed the bump-deps-2.48 branch 2 times, most recently from 17da6e1 to b7f2d87 Compare October 12, 2023 17:35
@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 12, 2023

👍🏻

@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 13, 2023

Looks like hashicorp/nomad#18311 broke nomad's go 1.20 compatibility

@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 13, 2023

As for the azure deprecation warnings, it looks like it's going to be a somewhat involved process to update to the new libraries (see https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/MIGRATION_GUIDE.md), so for now to get this release out I think we should just ignore it.

@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 14, 2023

Well looks like #11860 does this so I'll take a look at that

@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 14, 2023

Ok #11860 is good to be merged once rebased, so I guess I'll just pull it in here

@LeviHarrison
Update dependencies
2faa3ac 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
@LeviHarrison
Bump semconv version
ad26630 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
@roidelapluie
Copy link
Copy Markdown
Member

roidelapluie commented Oct 15, 2023

Ci fails

@bboreham
Build: downgrade nomad/api to v1.6.1 for compatibility with Go 1.20
f3a6de0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
@bboreham
Copy link
Copy Markdown
Member

bboreham commented Oct 15, 2023 •
edited
Loading

This error comes from the check that Prometheus code builds with the previous Go version:

/go/pkg/mod/github.com/hashicorp/nomad/api@v0.0.0-20231013131504-b697de9dda24/error_unexpected_response.go:11:2: package slices is not in GOROOT (/usr/local/go/src/slices)

I have pushed a commit to Levi's branch downgrading that one dependency to the latest stamped version before this change (hashicorp/nomad#18311).

@LeviHarrison
Copy link
Copy Markdown
Contributor Author

LeviHarrison commented Oct 15, 2023

Alright thanks 👍. Think we're good to go now?

@LeviHarrison
Remove exclude
8ff9904 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
bboreham
bboreham approved these changes Oct 15, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@bboreham bboreham left a comment

Choose a reason for hiding this comment

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

LGTM

@LeviHarrison LeviHarrison merged commit dcaca86 into prometheus:main Oct 15, 2023
LeviHarrison added a commit to LeviHarrison/prometheus that referenced this pull request Oct 15, 2023
@LeviHarrison
Update dependencies for 2.48 (prometheus#12964)
081dfc6
LeviHarrison added a commit to LeviHarrison/prometheus that referenced this pull request Oct 15, 2023
@LeviHarrison
Update dependencies for 2.48 (prometheus#12964)
d069216
LeviHarrison added a commit to LeviHarrison/prometheus that referenced this pull request Oct 15, 2023
@LeviHarrison
Update dependencies for 2.48 (prometheus#12964)
9146dde 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
LeviHarrison added a commit to LeviHarrison/prometheus that referenced this pull request Oct 15, 2023
@LeviHarrison
Update dependencies for 2.48 (prometheus#12964)
d87d8f5 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
LeviHarrison added a commit to LeviHarrison/prometheus that referenced this pull request Oct 15, 2023
@LeviHarrison
Update dependencies for 2.48 (prometheus#12964)
454a0a2 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
@simonpasquier simonpasquier mentioned this pull request Oct 16, 2023
Merged
pintohutch added a commit to GoogleCloudPlatform/prometheus that referenced this pull request Nov 21, 2023
@pintohutch
Bump semconv
13d14d2 
This fixed a failing unit test in tracing_test.go and was made upstream
in prometheus/prometheus#12964.
pintohutch added a commit to GoogleCloudPlatform/prometheus that referenced this pull request Nov 22, 2023
@pintohutch
Bump semconv
1a1b2b3 
This fixed a failing unit test in tracing_test.go and was made upstream
in prometheus/prometheus#12964.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bboreham bboreham bboreham approved these changes

@roidelapluie roidelapluie Awaiting requested review from roidelapluie

@csmarchbanks csmarchbanks Awaiting requested review from csmarchbanks

@cstyan cstyan Awaiting requested review from cstyan cstyan is a code owner

@bwplotka bwplotka Awaiting requested review from bwplotka bwplotka is a code owner

@tomwilkie tomwilkie Awaiting requested review from tomwilkie tomwilkie is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@LeviHarrison @roidelapluie @bboreham