8000 Bump dependencies by milosgajdos · Pull Request #4498 · distribution/distribution · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Bump dependencies #4498

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

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Bump dependencies #4498

merged 4 commits into from
Nov 6, 2024

Conversation

milosgajdos
Copy link
Member
@milosgajdos milosgajdos commented Oct 26, 2024

In preparation to the next release we're going to bump some deps such as various cloud SDKs we can test i.e. AWS, Google Cloud, etc.

NOTE: I'd LOVE to bump the Azure packages, but I've no way of verifying if the new versions worked with this repo; for AWS we have integration tests and for Google I test it manually on my GCP account against a GCS bucket. I've never used Azure and I'd like to avoid releasing something that's not proven to work 😞

Uh oh!

There was an error while loading. Please reload this page.

In preparation to the next release we're going to bump some deps such as
various cloud SDKs we can test i.e. AWS, Google Cloud, etc.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@github-actions github-actions bot added the dependencies Pull requests that update a dependency file label Oct 26, 2024
Also bump the golangci version

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@thaJeztah
Copy link
Member

NOTE: I'd LOVE to bump the Azure packages, but I've no way of verifying if the new versions worked with this repo

@cpuguy83 do you have recommendations here, or know someone who's able to help?

github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

wondering what's referring to opencensus (some package that hasn't switched to OTEL yet?)

Copy link
Member Author
@milosgajdos milosgajdos Oct 27, 2024

Choose a reason for hiding this comment

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

No idea, tbh. When I bumped the latest Google storage module this got pulled in as an indirect dep

go.mod Outdated
8000
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0
go.opentelemetry.io/otel v1.29.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0
Copy link
Member

Choose a reason for hiding this comment

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

otel doesn't always define dependencies between these, but it's good to keep them aligned.

Can you update the remaining v1.21.0 ones to v1.29.0, and the remaining v0.46.1 ones to v0.54.0?

Copy link
Member Author
@milosgajdos milosgajdos Oct 27, 2024

Choose a reason for hiding this comment

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

Not sure I follow. You want all otel "sub" modules (emphasis on sub because otel is a complete mess -- good intentions gone completely awry) to be bumped to 1.29? I think Google storage bump pulled in 1.29 maybe it needs that specific version?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, basically for the go.opentelemetry.io/contrib/exporters/xxx and go.opentelemetry.io/contrib/instrumentation/xxx ones to be on v0.54.0, and the go.opentelemetry.io/otel/xxx ones to be on v1.29.0

But I had a quick try, and looks like if you update go.opentelemetry.io/contrib/exporters/autoexport to v0.54.0 that all the other ones come with it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, yah, that should be done in 3ac2285

@@ -4,6 +4,7 @@ ARG GO_VERSION=1.23.2
ARG ALPINE_VERSION=3.20
ARG GOLANGCI_LINT_VERSION=v1.61.0
ARG BUILDTAGS=""
ARG TIMEOUT="5m"
Copy link
Member

Choose a reason for hiding this comment

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

This one's only used in the linting stage, so no need to set a default here

@@ -13,7 +14,11 @@ WORKDIR /src

FROM base
ENV GOFLAGS="-buildvcs=false"
ARG TIMEOUT
Copy link
Member

Choose a reason for hiding this comment

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

can set the default here;

ARG TIMEOUT=5m

ARG TIMEOUT
ARG BUILDTAGS
ENV TIMEOUT=${TIMEOUT}
ENV BUILDTAGS=${BUILDTAGS}
Copy link
Member

Choose a reason for hiding this comment

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

No need to persist these in an env-var; it's only used in the RUN, and not used at runtime (I don't even think we even run the image, only used the build to run the linter)

Copy link
Member Author

Choose a reason for hiding this comment

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

The scope and propagation are kinda sad in Dockerfiles (https://docs.docker.com/build/building/variables/#scoping); I feel like I often need a PhD to get those right

@milosgajdos
Copy link
Member Author

Anything else that needs addressing in this PR @thaJeztah ?

@thaJeztah
Copy link
Member

Can you squash the last two commits? We can probably do the remaining OTEL ones separately.

Add a timeout to the lint:
By default it is set to 1m

Remove ARGs where not needed.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
We want to be consistent in our deps so tracking down issue does not end
up in a murder mystery hunt. This commit picks a specific otel versions
that are unified in this codebase.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos
Copy link
Member Author

@thaJeztah commits, squashed, wanna give this another look?

@milosgajdos milosgajdos requested a review from davidspek November 6, 2024 06:35
@Jamstah
Copy link
Collaborator
Jamstah commented Nov 6, 2024

Lgtm. I would bump Azure too, this is an RC after all.

@milosgajdos milosgajdos merged commit d67b46a into distribution:main Nov 6, 2024
17 checks passed
@milosgajdos milosgajdos deleted the bump-deps branch November 6, 2024 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0