From 55efeb9c4b541294118b2cbf5a1d717728dfdf55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 May 2026 14:33:24 +0000 Subject: [PATCH] Bump google.golang.org/grpc from 1.81.0 to 1.81.1 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.81.0 to 1.81.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.81.0...v1.81.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.81.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- .../grpc/internal/xds/rbac/matchers.go | 22 +++++++---- .../stats/opentelemetry/client_metrics.go | 20 +++------- .../stats/opentelemetry/client_tracing.go | 8 ++-- .../grpc/stats/opentelemetry/opentelemetry.go | 38 ++++++++++++++----- .../stats/opentelemetry/server_metrics.go | 7 ++-- .../stats/opentelemetry/server_tracing.go | 8 ++-- vendor/google.golang.org/grpc/version.go | 2 +- vendor/modules.txt | 2 +- 10 files changed, 64 insertions(+), 49 deletions(-) diff --git a/go.mod b/go.mod index 777a04df5a..da948bc9ea 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( go.uber.org/zap v1.28.0 golang.org/x/crypto v0.51.0 golang.org/x/term v0.43.0 - google.golang.org/grpc v1.81.0 + google.golang.org/grpc v1.81.1 google.golang.org/protobuf v1.36.11 gotest.tools v2.2.0+incompatible gotest.tools/v3 v3.5.2 diff --git a/go.sum b/go.sum index b45679d3ac..22e15151f3 100644 --- a/go.sum +++ b/go.sum @@ -987,8 +987,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go. google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/vendor/google.golang.org/grpc/internal/xds/rbac/matchers.go b/vendor/google.golang.org/grpc/internal/xds/rbac/matchers.go index e7fb95b816..fede2fe76d 100644 --- a/vendor/google.golang.org/grpc/internal/xds/rbac/matchers.go +++ b/vendor/google.golang.org/grpc/internal/xds/rbac/matchers.go @@ -435,17 +435,23 @@ func (am *authenticatedMatcher) match(data *rpcData) bool { return am.stringMatcher.Match("") } cert := data.certs[0] - // The order of matching as per the RBAC documentation (see package-level comments) - // is as follows: URI SANs, DNS SANs, and then subject name. - for _, uriSAN := range cert.URIs { - if am.stringMatcher.Match(uriSAN.String()) { - return true + // Use the first non-empty identity source in priority order: + // URI SANs, then DNS SANs, then Subject. + if len(cert.URIs) > 0 { + for _, uriSAN := range cert.URIs { + if am.stringMatcher.Match(uriSAN.String()) { + return true + } } + return false } - for _, dnsSAN := range cert.DNSNames { - if am.stringMatcher.Match(dnsSAN) { - return true + if len(cert.DNSNames) > 0 { + for _, dnsSAN := range cert.DNSNames { + if am.stringMatcher.Match(dnsSAN) { + return true + } } + return false } return am.stringMatcher.Match(cert.Subject.String()) } diff --git a/vendor/google.golang.org/grpc/stats/opentelemetry/client_metrics.go b/vendor/google.golang.org/grpc/stats/opentelemetry/client_metrics.go index 420482b446..91bda9ac7b 100644 --- a/vendor/google.golang.org/grpc/stats/opentelemetry/client_metrics.go +++ b/vendor/google.golang.org/grpc/stats/opentelemetry/client_metrics.go @@ -76,7 +76,7 @@ func getOrCreateCallInfo(ctx context.Context, cc *grpc.ClientConn, method string target: cc.CanonicalTarget(), method: determineMethod(method, opts...), } - ctx = setCallInfo(ctx, ci) + ctx = context.WithValue(ctx, callInfoKey{}, ci) } return ctx, ci } @@ -157,17 +157,6 @@ func (h *clientMetricsHandler) TagConn(ctx context.Context, _ *stats.ConnTagInfo // HandleConn exists to satisfy stats.Handler. func (h *clientMetricsHandler) HandleConn(context.Context, stats.ConnStats) {} -// getOrCreateRPCAttemptInfo retrieves or creates an rpc attemptInfo object -// and ensures it is set in the context along with the rpcInfo. -func getOrCreateRPCAttemptInfo(ctx context.Context) (context.Context, *attemptInfo) { - ri := getRPCInfo(ctx) - if ri != nil { - return ctx, ri.ai - } - ri = &rpcInfo{ai: &attemptInfo{}} - return setRPCInfo(ctx, ri), ri.ai -} - // TagRPC implements per RPC attempt context management for metrics. func (h *clientMetricsHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) context.Context { // Numerous stats handlers can be used for the same channel. The cluster @@ -187,17 +176,18 @@ func (h *clientMetricsHandler) TagRPC(ctx context.Context, info *stats.RPCTagInf } ctx = istats.SetLabels(ctx, labels) } - ctx, ai := getOrCreateRPCAttemptInfo(ctx) + ctx, ri := getOrCreateClientRPCInfo(ctx) + ai := ri.ai ai.startTime = time.Now() ai.xdsLabels = labels.TelemetryLabels ai.method = removeLeadingSlash(info.FullMethodName) - return setRPCInfo(ctx, &rpcInfo{ai: ai}) + return ctx } // HandleRPC handles per RPC stats implementation. func (h *clientMetricsHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) { - ri := getRPCInfo(ctx) + ri := clientRPCInfo(ctx) if ri == nil { logger.Error("ctx passed into client side stats handler metrics event handling has no client attempt data present") return diff --git a/vendor/google.golang.org/grpc/stats/opentelemetry/client_tracing.go b/vendor/google.golang.org/grpc/stats/opentelemetry/client_tracing.go index 868d6a2fc9..718a634d71 100644 --- a/vendor/google.golang.org/grpc/stats/opentelemetry/client_tracing.go +++ b/vendor/google.golang.org/grpc/stats/opentelemetry/client_tracing.go @@ -120,14 +120,14 @@ func (h *clientTracingHandler) HandleConn(context.Context, stats.ConnStats) {} // TagRPC implements per RPC attempt context management for traces. func (h *clientTracingHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) context.Context { - ctx, ai := getOrCreateRPCAttemptInfo(ctx) - ctx, ai = h.traceTagRPC(ctx, ai, info.NameResolutionDelay) - return setRPCInfo(ctx, &rpcInfo{ai: ai}) + ctx, ri := getOrCreateClientRPCInfo(ctx) + ctx, _ = h.traceTagRPC(ctx, ri.ai, info.NameResolutionDelay) + return ctx } // HandleRPC handles per RPC tracing implementation. func (h *clientTracingHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) { - ri := getRPCInfo(ctx) + ri := clientRPCInfo(ctx) if ri == nil { logger.Error("ctx passed into client side tracing handler trace event handling has no client attempt data present") return diff --git a/vendor/google.golang.org/grpc/stats/opentelemetry/opentelemetry.go b/vendor/google.golang.org/grpc/stats/opentelemetry/opentelemetry.go index 1031e9fa56..d976e60c99 100644 --- a/vendor/google.golang.org/grpc/stats/opentelemetry/opentelemetry.go +++ b/vendor/google.golang.org/grpc/stats/opentelemetry/opentelemetry.go @@ -183,10 +183,6 @@ type callInfo struct { type callInfoKey struct{} -func setCallInfo(ctx context.Context, ci *callInfo) context.Context { - return context.WithValue(ctx, callInfoKey{}, ci) -} - // getCallInfo returns the callInfo stored in the context, or nil // if there isn't one. func getCallInfo(ctx context.Context) *callInfo { @@ -200,19 +196,41 @@ type rpcInfo struct { ai *attemptInfo } -type rpcInfoKey struct{} +type clientRPCInfoKey struct{} +type serverRPCInfoKey struct{} -func setRPCInfo(ctx context.Context, ri *rpcInfo) context.Context { - return context.WithValue(ctx, rpcInfoKey{}, ri) +// clientRPCInfo returns the rpcInfo stored in the context for client, or nil +// if there isn't one. +func clientRPCInfo(ctx context.Context) *rpcInfo { + ri, _ := ctx.Value(clientRPCInfoKey{}).(*rpcInfo) + return ri } -// getRPCInfo returns the rpcInfo stored in the context, or nil +// serverRPCInfo returns the rpcInfo stored in the context for server, or nil // if there isn't one. -func getRPCInfo(ctx context.Context) *rpcInfo { - ri, _ := ctx.Value(rpcInfoKey{}).(*rpcInfo) +func serverRPCInfo(ctx context.Context) *rpcInfo { + ri, _ := ctx.Value(serverRPCInfoKey{}).(*rpcInfo) return ri } +func getOrCreateClientRPCInfo(ctx context.Context) (context.Context, *rpcInfo) { + ri := clientRPCInfo(ctx) + if ri != nil { + return ctx, ri + } + ri = &rpcInfo{ai: &attemptInfo{}} + return context.WithValue(ctx, clientRPCInfoKey{}, ri), ri +} + +func getOrCreateServerRPCInfo(ctx context.Context) (context.Context, *rpcInfo) { + ri := serverRPCInfo(ctx) + if ri != nil { + return ctx, ri + } + ri = &rpcInfo{ai: &attemptInfo{}} + return context.WithValue(ctx, serverRPCInfoKey{}, ri), ri +} + func removeLeadingSlash(mn string) string { return strings.TrimLeft(mn, "/") } diff --git a/vendor/google.golang.org/grpc/stats/opentelemetry/server_metrics.go b/vendor/google.golang.org/grpc/stats/opentelemetry/server_metrics.go index 75d922e797..4db7978034 100644 --- a/vendor/google.golang.org/grpc/stats/opentelemetry/server_metrics.go +++ b/vendor/google.golang.org/grpc/stats/opentelemetry/server_metrics.go @@ -196,16 +196,17 @@ func (h *serverMetricsHandler) TagRPC(ctx context.Context, info *stats.RPCTagInf method = "other" } } - ctx, ai := getOrCreateRPCAttemptInfo(ctx) + ctx, ri := getOrCreateServerRPCInfo(ctx) + ai := ri.ai ai.startTime = time.Now() ai.method = removeLeadingSlash(method) - return setRPCInfo(ctx, &rpcInfo{ai: ai}) + return ctx } // HandleRPC handles per RPC stats implementation. func (h *serverMetricsHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) { - ri := getRPCInfo(ctx) + ri := serverRPCInfo(ctx) if ri == nil { logger.Error("ctx passed into server side stats handler metrics event handling has no server call data present") return diff --git a/vendor/google.golang.org/grpc/stats/opentelemetry/server_tracing.go b/vendor/google.golang.org/grpc/stats/opentelemetry/server_tracing.go index 0e2181bf11..c267ba1ed0 100644 --- a/vendor/google.golang.org/grpc/stats/opentelemetry/server_tracing.go +++ b/vendor/google.golang.org/grpc/stats/opentelemetry/server_tracing.go @@ -40,9 +40,9 @@ func (h *serverTracingHandler) initializeTraces() { // TagRPC implements per RPC attempt context management for traces. func (h *serverTracingHandler) TagRPC(ctx context.Context, _ *stats.RPCTagInfo) context.Context { - ctx, ai := getOrCreateRPCAttemptInfo(ctx) - ctx, ai = h.traceTagRPC(ctx, ai) - return setRPCInfo(ctx, &rpcInfo{ai: ai}) + ctx, ri := getOrCreateServerRPCInfo(ctx) + ctx, _ = h.traceTagRPC(ctx, ri.ai) + return ctx } // traceTagRPC populates context with new span data using the TextMapPropagator @@ -67,7 +67,7 @@ func (h *serverTracingHandler) traceTagRPC(ctx context.Context, ai *attemptInfo) // HandleRPC handles per RPC tracing implementation. func (h *serverTracingHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) { - ri := getRPCInfo(ctx) + ri := serverRPCInfo(ctx) if ri == nil { logger.Error("ctx passed into server side tracing handler trace event handling has no server call data present") return diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index 7ac723c128..3ccfe515f7 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.81.0" +const Version = "1.81.1" diff --git a/vendor/modules.txt b/vendor/modules.txt index 6f7e7dba3c..00094f7400 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1959,7 +1959,7 @@ google.golang.org/genproto/googleapis/api/monitoredres google.golang.org/genproto/googleapis/rpc/code google.golang.org/genproto/googleapis/rpc/errdetails google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.81.0 +# google.golang.org/grpc v1.81.1 ## explicit; go 1.25.0 google.golang.org/grpc google.golang.org/grpc/attributes