Skip to content

Commit c8d9180

Browse files
authored
Set gRPC compression default to snappy in all cases (#4696)
* Re add snappy compression in gRPC Signed-off-by: Joe Elliott <[email protected]> * manifest Signed-off-by: Joe Elliott <[email protected]> * changelog Signed-off-by: Joe Elliott <[email protected]> * manifest Signed-off-by: Joe Elliott <[email protected]> * changelog Signed-off-by: Joe Elliott <[email protected]> --------- Signed-off-by: Joe Elliott <[email protected]>
1 parent 1354986 commit c8d9180

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
* [BUGFIX] Return the operand as the only value if the tag is already filtered in the query [#4673](https://github.com/grafana/tempo/pull/4673) (@mapno)
3939
* [BUGFIX] Fix memcached settings for docker compose example [#4346](https://github.com/grafana/tempo/pull/4695) (@ruslan-mikhailov)
4040

41+
# v2.7.1
42+
43+
* [CHANGE] Default to snappy compression for all gRPC communications internal to Tempo. We feel this is a nice balance of resource usage and network traffic. For a discussion on alternatives see https://github.com/grafana/tempo/discussions/4683. [#4696](https://github.com/grafana/tempo/pull/4696) (@joe-elliott)
44+
4145
# v2.7.0
4246

4347
* [CHANGE] Disable gRPC compression in the querier and distributor for performance reasons [#4429](https://github.com/grafana/tempo/pull/4429) (@carles-grafana)

cmd/tempo/app/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ func (c *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) {
118118

119119
// Everything else
120120
flagext.DefaultValues(&c.IngesterClient)
121-
c.IngesterClient.GRPCClientConfig.GRPCCompression = ""
121+
c.IngesterClient.GRPCClientConfig.GRPCCompression = "snappy"
122122
flagext.DefaultValues(&c.GeneratorClient)
123-
c.GeneratorClient.GRPCClientConfig.GRPCCompression = ""
123+
c.GeneratorClient.GRPCClientConfig.GRPCCompression = "snappy"
124124
c.Overrides.RegisterFlagsAndApplyDefaults(f)
125125

126126
c.Distributor.RegisterFlagsAndApplyDefaults(util.PrefixConfig(prefix, "distributor"), f)

docs/sources/tempo/configuration/manifest.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ ingester_client:
214214
grpc_client_config:
215215
max_recv_msg_size: 104857600
216216
max_send_msg_size: 104857600
217-
grpc_compression: ""
217+
grpc_compression: snappy
218218
rate_limit: 0
219219
rate_limit_burst: 0
220220
backoff_on_ratelimits: false
@@ -245,7 +245,7 @@ metrics_generator_client:
245245
grpc_client_config:
246246
max_recv_msg_size: 104857600
247247
max_send_msg_size: 104857600
248-
grpc_compression: ""
248+
grpc_compression: snappy
249249
rate_limit: 0
250250
rate_limit_burst: 0
251251
backoff_on_ratelimits: false
@@ -284,7 +284,7 @@ querier:
284284
grpc_client_config:
285285
max_recv_msg_size: 104857600
286286
max_send_msg_size: 16777216
287-
grpc_compression: ""
287+
grpc_compression: snappy
288288
rate_limit: 0
289289
rate_limit_burst: 0
290290
backoff_on_ratelimits: false

modules/querier/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet)
6161
GRPCClientConfig: grpcclient.Config{
6262
MaxRecvMsgSize: 100 << 20,
6363
MaxSendMsgSize: 16 << 20,
64-
GRPCCompression: "",
64+
GRPCCompression: "snappy",
6565
BackoffConfig: backoff.Config{ // the max possible backoff should be lesser than QueryTimeout, with room for actual query response time
6666
MinBackoff: 100 * time.Millisecond,
6767
MaxBackoff: 1 * time.Second,

0 commit comments

Comments
 (0)