core/runtime/v2: remove uses of otelgrpc.UnaryClientInterceptor

thaJeztah · thaJeztah · commit ed19c542003c · 2025-12-07T23:01:06.000+01:00
The otelgrpc.UnaryClientInterceptor and otelgrpc.StreamClientInterceptor
options were deprecated and removed in favor of NewClientHandler.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/core/runtime/v2/shim.go b/core/runtime/v2/shim.go
@@ -305,8 +305,7 @@ func makeConnection(ctx context.Context, id string, params client.BootstrapParam
 	case "grpc":
 		gopts := []grpc.DialOption{
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
-			grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),   //nolint:staticcheck // Ignore SA1019. Deprecation assumes use of [grpc.NewClient] but we are not using that here.
-			grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()), //nolint:staticcheck // Ignore SA1019. Deprecation assumes use of [grpc.NewClient] but we are not using that here.
+			grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
 		}
 		return grpcDialContext(params.Address, onClose, gopts...)
 	default:
diff --git a/docs/tracing.md b/docs/tracing.md
@@ -79,8 +79,7 @@ func clientWithTrace() error {
 
     dialOpts := []grpc.DialOption{
         grpc.WithTransportCredentials(insecure.NewCredentials()),
-        grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
-        grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
+        grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
     }
     client, ctx, cancel, err := commands.NewClient(context, containerd.WithDialOpts(dialOpts))
     if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,7 @@ func clientWithTrace() error {`
`79`	`79`
`80`	`80`	`dialOpts := []grpc.DialOption{`
`81`	`81`	`grpc.WithTransportCredentials(insecure.NewCredentials()),`
`82`		`- grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),`
`83`		`- grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),`
	`82`	`+ grpc.WithStatsHandler(otelgrpc.NewClientHandler()),`
`84`	`83`	`}`
`85`	`84`	`client, ctx, cancel, err := commands.NewClient(context, containerd.WithDialOpts(dialOpts))`
`86`	`85`	`if err != nil {`