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

vendor: OTEL v0.46.1 / v1.21.0 #47245

Merged
merged 1 commit into from Feb 23, 2024
Merged

vendor: OTEL v0.46.1 / v1.21.0 #47245

merged 1 commit into from Feb 23, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 29, 2024

- Description for the changelog

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

@thaJeztah
Copy link
Member Author

thaJeztah commented Jan 31, 2024

Looks like this needs some local changes (either temporary //nolint for the release branches if we want to backport, or changes in code);

api/server/router/grpc/grpc.go:24:69: SA1019: otelgrpc.StreamServerInterceptor is deprecated: Use [NewServerHandler] instead. (staticcheck)
	stream := grpc.StreamInterceptor(grpc_middleware.ChainStreamServer(otelgrpc.StreamServerInterceptor(), grpcerrors.StreamServerInterceptor))
	                                                                   ^
api/server/router/grpc/grpc.go:49:15: SA1019: otelgrpc.UnaryServerInterceptor is deprecated: Use [NewServerHandler] instead. (staticcheck)
	withTrace := otelgrpc.UnaryServerInterceptor()
	             ^
libcontainerd/supervisor/remote_daemon.go:304:32: SA1019: otelgrpc.UnaryClientInterceptor is deprecated: Use [NewClientHandler] instead. (staticcheck)
					grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
					                          ^
libcontainerd/supervisor/remote_daemon.go:305:33: SA1019: otelgrpc.StreamClientInterceptor is deprecated: Use [NewClientHandler] instead. (staticcheck)
					grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
					                           ^
daemon/daemon.go:965:29: SA1019: otelgrpc.UnaryClientInterceptor is deprecated: Use [NewClientHandler] instead. (staticcheck)
		grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
		                          ^
daemon/daemon.go:966:30: SA1019: otelgrpc.StreamClientInterceptor is deprecated: Use [NewClientHandler] instead. (staticcheck)
		grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
		                           ^

StreamServerInterceptor, UnaryServerInterceptor, and StreamClientInterceptor were deprecated in open-telemetry/opentelemetry-go-contrib@23bd4ed

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Comment on lines +965 to +966
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()), //nolint:staticcheck // TODO(thaJeztah): ignore SA1019 for deprecated options: see https://github.com/moby/moby/issues/47437
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()), //nolint:staticcheck // TODO(thaJeztah): ignore SA1019 for deprecated options: see https://github.com/moby/moby/issues/47437
Copy link
Member Author

Choose a reason for hiding this comment

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

After discussion on Slack, I added some nolint tags for now, and created a tracking ticket to update this code; #47437

@thaJeztah thaJeztah marked this pull request as ready for review February 23, 2024 15:23
Copy link
Contributor

@vvoland vvoland left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

Let me bring this one in, so that we can rebase the BuildKit update.

The PR on the BuildKit side is not needed for this to work (we just used that also to verify on both sides)

@thaJeztah thaJeztah merged commit 0eecd59 into moby:master Feb 23, 2024
126 checks passed
@thaJeztah thaJeztah deleted the bump_otel branch February 23, 2024 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants