From 2aa221e80dd26b2673bd84f705665264d0b06207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=B2=20Harry=20=F0=9F=8C=8A=20John=20=F0=9F=8F=94?= Date: Mon, 4 Mar 2024 19:39:50 -0800 Subject: [PATCH] Fix GRPC client not honouring call options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 🌲 Harry 🌊 John 🏔 --- CHANGELOG.md | 1 + pkg/util/grpcutil/util.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc3c6bf2a76..f15d8218222 100644 --- 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 index 6e60f2e5cb5..8da1c6916e7 100644 --- 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