grpcproxy: use metadata instead of context withvalue in with client a…

…uth token Signed-off-by: Kristoffer Johansson <[email protected]>
etcd-io · Dec 9, 2024 · b65c4a6 · b65c4a6
1 parent 854bdd6
commit b65c4a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/server/proxy/grpcproxy/util.go b/server/proxy/grpcproxy/util.go
@@ -37,7 +37,8 @@ func getAuthTokenFromClient(ctx context.Context) string {
 func withClientAuthToken(ctx, ctxWithToken context.Context) context.Context {
 	token := getAuthTokenFromClient(ctxWithToken)
 	if token != "" {
-		ctx = context.WithValue(ctx, rpctypes.TokenFieldNameGRPCKey{}, token)
+		md := metadata.Pairs(rpctypes.TokenFieldNameGRPC, token)
+		return metadata.NewOutgoingContext(ctx, md)
 	}
 	return ctx
 }

diff --git a/server/proxy/grpcproxy/watch_broadcasts.go b/server/proxy/grpcproxy/watch_broadcasts.go
@@ -70,6 +70,7 @@ func (wbs *watchBroadcasts) coalesce(wb *watchBroadcast) {
 				wbs.watchers[w] = wbswb
 			}
 			wb.receivers = nil
+			watchersCoalescing.Inc()
 		}
 		wbswb.mu.Unlock()
 		wb.mu.Unlock()