From 38660038fae121755bafa7a222aca2a5817d06fa Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Fri, 3 Nov 2023 11:28:11 -0700 Subject: [PATCH] envconfig: re-add AdvertiseCompressors temporarily --- internal/envconfig/envconfig.go | 3 +++ internal/grpcutil/compressor.go | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/internal/envconfig/envconfig.go b/internal/envconfig/envconfig.go index 9c915d9e4b2a..685a3cb41b13 100644 --- a/internal/envconfig/envconfig.go +++ b/internal/envconfig/envconfig.go @@ -28,6 +28,9 @@ import ( var ( // TXTErrIgnore is set if TXT errors should be ignored ("GRPC_GO_IGNORE_TXT_ERRORS" is not "false"). TXTErrIgnore = boolFromEnv("GRPC_GO_IGNORE_TXT_ERRORS", true) + // AdvertiseCompressors is set if registered compressor should be advertised + // ("GRPC_GO_ADVERTISE_COMPRESSORS" is not "false"). + AdvertiseCompressors = boolFromEnv("GRPC_GO_ADVERTISE_COMPRESSORS", true) // RingHashCap indicates the maximum ring size which defaults to 4096 // entries but may be overridden by setting the environment variable // "GRPC_RING_HASH_CAP". This does not override the default bounds diff --git a/internal/grpcutil/compressor.go b/internal/grpcutil/compressor.go index e8d866984b37..9f4090967980 100644 --- a/internal/grpcutil/compressor.go +++ b/internal/grpcutil/compressor.go @@ -20,6 +20,8 @@ package grpcutil import ( "strings" + + "google.golang.org/grpc/internal/envconfig" ) // RegisteredCompressorNames holds names of the registered compressors. @@ -38,5 +40,8 @@ func IsCompressorNameRegistered(name string) bool { // RegisteredCompressors returns a string of registered compressor names // separated by comma. func RegisteredCompressors() string { + if !envconfig.AdvertiseCompressors { + return "" + } return strings.Join(RegisteredCompressorNames, ",") }