Skip to content

Comments

otel: remove deprecated usages of otelgrpc#47919

Merged
thaJeztah merged 2 commits intomoby:masterfrom
laurazard:fix-deprecated-otel
Jun 10, 2024
Merged

otel: remove deprecated usages of otelgrpc#47919
thaJeztah merged 2 commits intomoby:masterfrom
laurazard:fix-deprecated-otel

Conversation

@laurazard
Copy link
Member

@laurazard laurazard commented Jun 6, 2024

- What I did

- How I did it

Based a lot off of the work in Buildkit: moby/buildkit#4753

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Screenshot 2024-06-06 at 12 01 50

@laurazard laurazard force-pushed the fix-deprecated-otel branch 2 times, most recently from 62e281f to 1c39157 Compare June 6, 2024 12:44
Comment on lines +11 to +13
"github.com/moby/buildkit/util/stack"
"github.com/moby/buildkit/util/tracing"
Copy link
Member

Choose a reason for hiding this comment

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

We were already depending on these, correct? (just making sure we want to couple more or less on BuildKit here)

I don't think any of this would end up on the client-side, but just in case, we should also do a test "vendor" PR from this branch in docker/cli to make sure we don't reintroduce BuildKit as a dependency there.

Copy link
Member Author

Choose a reason for hiding this comment

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

For sure. This is still drafted, it was just a first pass, so I'll make sure of that before I mark the PR as ready.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I should've waited until no longer draft; just peeking (happy to see you're working on this!)

Copy link
Member Author

Choose a reason for hiding this comment

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

We already depended on these, and I don't think these changes should end up in the CLI due to where they happened, but can do a test vendor PR there to confirm.

"github.com/docker/docker/pkg/pidfile"
"github.com/docker/docker/pkg/process"
"github.com/docker/docker/pkg/system"
"github.com/moby/buildkit/util/grpcerrors"
Copy link
Member

Choose a reason for hiding this comment

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

Also /cc @dmcgowan who's looking at unifying some error-handling code and types (just in case any of this relates to that)

@laurazard laurazard force-pushed the fix-deprecated-otel branch 5 times, most recently from 58bb0a5 to aded766 Compare June 7, 2024 11:04
@thaJeztah thaJeztah added this to the 27.0.0 milestone Jun 7, 2024
@laurazard laurazard marked this pull request as ready for review June 7, 2024 12:11
@laurazard
Copy link
Member Author

@jsternberg I'd appreciate a look from you as well

@laurazard laurazard force-pushed the fix-deprecated-otel branch from aded766 to 854130e Compare June 7, 2024 13:35
@laurazard
Copy link
Member Author

I need to amend this, there's a missing call to unaryInterceptor I think that's causing a few tests to block forever.

@thaJeztah
Copy link
Member

I need to amend this, there's a missing call to unaryInterceptor I think that's causing a few tests to block forever.

CI looks happy though, or doesn't it reproduce in CI? 😅

@laurazard
Copy link
Member Author

Nevermind 😅 There was a failing test before, so I assumed from the changes that it was that, but if CI's green I'm happy.

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

let's bring this one in 👍 Thanks!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Development

Successfully merging this pull request may close these issues.

OTEL: update code to remove use of some deprecated options

3 participants