Fix GRPC client not honouring call options (#5797)

harry671003 · web-flow · commit 96a76ce49958 · 2024-03-04T20:40:47.000-08:00
Signed-off-by: 🌲 Harry 🌊 John 🏔 &lt;johrry@amazon.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
 * [BUGFIX] Query Frontend: queries with negative offset should check whether it is cacheable or not. #5719
 * [BUGFIX] Redis Cache: pass `cache_size` config correctly. #5734
 * [BUGFIX] Distributor: Shuffle-Sharding with IngestionTenantShardSize == 0, default sharding strategy should be used #5189
+* [BUGFIX] Cortex: Fix GRPC stream clients not honoring overrides for call options. #5797
 
 
 ## 1.16.0 2023-11-20
diff --git a/pkg/util/grpcutil/util.go b/pkg/util/grpcutil/util.go
@@ -69,7 +69,7 @@ func HTTPHeaderPropagationClientInterceptor(ctx context.Context, method string,
 func HTTPHeaderPropagationStreamClientInterceptor(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string,
 	streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
 	ctx = injectForwardedHeadersIntoMetadata(ctx)
-	return streamer(ctx, desc, cc, method)
+	return streamer(ctx, desc, cc, method, opts...)
 }
 
 // injectForwardedHeadersIntoMetadata implements HTTPHeaderPropagationClientInterceptor and HTTPHeaderPropagationStreamClientInterceptor

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func HTTPHeaderPropagationClientInterceptor(ctx context.Context, method string,`
`69`	`69`	`func HTTPHeaderPropagationStreamClientInterceptor(ctx context.Context, desc grpc.StreamDesc, cc grpc.ClientConn, method string,`
`70`	`70`	`streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {`
`71`	`71`	`ctx = injectForwardedHeadersIntoMetadata(ctx)`
`72`		`- return streamer(ctx, desc, cc, method)`
	`72`	`+ return streamer(ctx, desc, cc, method, opts...)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`// injectForwardedHeadersIntoMetadata implements HTTPHeaderPropagationClientInterceptor and HTTPHeaderPropagationStreamClientInterceptor`