Skip to content

Commit 25c57f2

Browse files
pkcllpkcll
committed
beholder: enable compression for metric, traces, logs by default
1 parent e973dc2 commit 25c57f2

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎pkg/beholder/client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ func newTracerProvider(config Config, resource *sdkresource.Resource, auth Auth,
364364
// No auth
365365
default:
366366
}
367-
if config.TraceCompressionEnabled {
367+
if !config.TraceCompressionDisabled {
368368
exporterOpts = append(exporterOpts, otlptracegrpc.WithCompressor(grpcCompressorGzip))
369369
}
370370
if config.TraceRetryConfig != nil {
@@ -406,7 +406,7 @@ func newMeterProvider(cfg Config, resource *sdkresource.Resource, auth Auth, cre
406406
otlpmetricgrpc.WithTLSCredentials(creds),
407407
otlpmetricgrpc.WithEndpoint(cfg.OtelExporterGRPCEndpoint),
408408
}
409-
if cfg.MetricCompressionEnabled {
409+
if !cfg.MetricCompressionDisabled {
410410
opts = append(opts, otlpmetricgrpc.WithCompressor(grpcCompressorGzip))
411411
}
412412

@@ -459,7 +459,7 @@ func newLoggerOpts(cfg Config, auth Auth, creds credentials.TransportCredentials
459459
otlploggrpc.WithEndpoint(cfg.OtelExporterGRPCEndpoint),
460460
otlploggrpc.WithDialOption(grpc.WithStatsHandler(otelgrpc.NewClientHandler(otelOpts...))),
461461
}
462-
if cfg.LogCompressionEnabled {
462+
if !cfg.LogCompressionDisabled {
463463
opts = append(opts, otlploggrpc.WithCompressor(grpcCompressorGzip))
464464
}
465465
// Log exporter auth

‎pkg/beholder/config.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ type Config struct {
2929
TraceBatchTimeout time.Duration
3030
TraceSpanExporter trace.SpanExporter // optional additional exporter
3131
TraceRetryConfig *RetryConfig
32-
// TraceCompressionEnabled enables gRPC compression for traces (uses "gzip").
33-
TraceCompressionEnabled bool
32+
// TraceCompressionDisabled disables gRPC compression for traces (compression uses "gzip" by default).
33+
TraceCompressionDisabled bool
3434

3535
// OTel Metric
3636
MetricReaderInterval time.Duration
3737
MetricRetryConfig *RetryConfig
3838
MetricViews []metric.View
39-
// MetricCompressionEnabled enables gRPC compression for metrics (uses "gzip").
40-
MetricCompressionEnabled bool
39+
// MetricCompressionDisabled disables gRPC compression for metrics (compression uses "gzip" by default).
40+
MetricCompressionDisabled bool
4141

4242
// Custom Events via Chip Ingress Emitter
4343
ChipIngressEmitterEnabled bool
@@ -54,8 +54,8 @@ type Config struct {
5454
LogRetryConfig *RetryConfig
5555
LogStreamingEnabled bool // Enable logs streaming to the OTel log exporter
5656
LogLevel zapcore.Level // Log level for telemetry streaming
57-
// LogCompressionEnabled enables gRPC compression for logs (uses "gzip").
58-
LogCompressionEnabled bool
57+
// LogCompressionDisabled disables gRPC compression for logs (compression uses "gzip" by default).
58+
LogCompressionDisabled bool
5959

6060
// Auth
6161
// AuthHeaders serves two purposes:

‎pkg/beholder/config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ func ExampleConfig() {
6464
}
6565
fmt.Printf("%+v\n", *config.LogRetryConfig)
6666
// Output:
67-
// {InsecureConnection:true CACertFile: OtelExporterGRPCEndpoint:localhost:4317 OtelExporterHTTPEndpoint:localhost:4318 ResourceAttributes:[{Key:package_name Value:{vtype:4 numeric:0 stringly:beholder slice:<nil>}} {Key:sender Value:{vtype:4 numeric:0 stringly:beholderclient slice:<nil>}}] EmitterExportTimeout:1s EmitterExportInterval:1s EmitterExportMaxBatchSize:512 EmitterMaxQueueSize:2048 EmitterBatchProcessor:true TraceSampleRatio:1 TraceBatchTimeout:1s TraceSpanExporter:<nil> TraceRetryConfig:<nil> TraceCompressionEnabled:false MetricReaderInterval:1s MetricRetryConfig:<nil> MetricViews:[] MetricCompressionEnabled:false ChipIngressEmitterEnabled:false ChipIngressEmitterGRPCEndpoint: ChipIngressInsecureConnection:false LogExportTimeout:1s LogExportInterval:1s LogExportMaxBatchSize:512 LogMaxQueueSize:2048 LogBatchProcessor:true LogRetryConfig:<nil> LogStreamingEnabled:false LogLevel:info LogCompressionEnabled:false AuthHeaders:map[] AuthHeadersTTL:0s AuthKeySigner:<nil> AuthPublicKeyHex:}
67+
// {InsecureConnection:true CACertFile: OtelExporterGRPCEndpoint:localhost:4317 OtelExporterHTTPEndpoint:localhost:4318 ResourceAttributes:[{Key:package_name Value:{vtype:4 numeric:0 stringly:beholder slice:<nil>}} {Key:sender Value:{vtype:4 numeric:0 stringly:beholderclient slice:<nil>}}] EmitterExportTimeout:1s EmitterExportInterval:1s EmitterExportMaxBatchSize:512 EmitterMaxQueueSize:2048 EmitterBatchProcessor:true TraceSampleRatio:1 TraceBatchTimeout:1s TraceSpanExporter:<nil> TraceRetryConfig:<nil> TraceCompressionDisabled:false MetricReaderInterval:1s MetricRetryConfig:<nil> MetricViews:[] MetricCompressionDisabled:false ChipIngressEmitterEnabled:false ChipIngressEmitterGRPCEndpoint: ChipIngressInsecureConnection:false LogExportTimeout:1s LogExportInterval:1s LogExportMaxBatchSize:512 LogMaxQueueSize:2048 LogBatchProcessor:true LogRetryConfig:<nil> LogStreamingEnabled:false LogLevel:info LogCompressionDisabled:false AuthHeaders:map[] AuthHeadersTTL:0s AuthKeySigner:<nil> AuthPublicKeyHex:}
6868
// {InitialInterval:5s MaxInterval:30s MaxElapsedTime:1m0s}
6969
}

‎pkg/loop/config.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ const (
7070
envTelemetryLogExportMaxBatchSize = "CL_TELEMETRY_LOG_EXPORT_MAX_BATCH_SIZE"
7171
envTelemetryLogExportInterval = "CL_TELEMETRY_LOG_EXPORT_INTERVAL"
7272
envTelemetryLogMaxQueueSize = "CL_TELEMETRY_LOG_MAX_QUEUE_SIZE"
73-
envTelemetryTraceCompressionEnabled = "CL_TELEMETRY_TRACE_COMPRESSION_ENABLED"
74-
envTelemetryMetricCompressionEnabled = "CL_TELEMETRY_METRIC_COMPRESSION_ENABLED"
75-
envTelemetryLogCompressionEnabled = "CL_TELEMETRY_LOG_COMPRESSION_ENABLED"
73+
envTelemetryTraceCompressionDisabled = "CL_TELEMETRY_TRACE_COMPRESSION_DISABLED"
74+
envTelemetryMetricCompressionDisabled = "CL_TELEMETRY_METRIC_COMPRESSION_DISABLED"
75+
envTelemetryLogCompressionDisabled = "CL_TELEMETRY_LOG_COMPRESSION_DISABLED"
7676

7777
envChipIngressEndpoint = "CL_CHIP_INGRESS_ENDPOINT"
7878
envChipIngressInsecureConnection = "CL_CHIP_INGRESS_INSECURE_CONNECTION"
@@ -136,9 +136,9 @@ type EnvConfig struct {
136136
TelemetryLogExportMaxBatchSize int
137137
TelemetryLogExportInterval time.Duration
138138
TelemetryLogMaxQueueSize int
139-
TelemetryTraceCompressionEnabled bool
140-
TelemetryMetricCompressionEnabled bool
141-
TelemetryLogCompressionEnabled bool
139+
TelemetryTraceCompressionDisabled bool
140+
TelemetryMetricCompressionDisabled bool
141+
TelemetryLogCompressionDisabled bool
142142

143143
ChipIngressEndpoint string
144144
ChipIngressInsecureConnection bool
@@ -215,9 +215,9 @@ func (e *EnvConfig) AsCmdEnv() (env []string) {
215215
add(envTelemetryLogExportMaxBatchSize, strconv.Itoa(e.TelemetryLogExportMaxBatchSize))
216216
add(envTelemetryLogExportInterval, e.TelemetryLogExportInterval.String())
217217
add(envTelemetryLogMaxQueueSize, strconv.Itoa(e.TelemetryLogMaxQueueSize))
218-
add(envTelemetryTraceCompressionEnabled, strconv.FormatBool(e.TelemetryTraceCompressionEnabled))
219-
add(envTelemetryMetricCompressionEnabled, strconv.FormatBool(e.TelemetryMetricCompressionEnabled))
220-
add(envTelemetryLogCompressionEnabled, strconv.FormatBool(e.TelemetryLogCompressionEnabled))
218+
add(envTelemetryTraceCompressionDisabled, strconv.FormatBool(e.TelemetryTraceCompressionDisabled))
219+
add(envTelemetryMetricCompressionDisabled, strconv.FormatBool(e.TelemetryMetricCompressionDisabled))
220+
add(envTelemetryLogCompressionDisabled, strconv.FormatBool(e.TelemetryLogCompressionDisabled))
221221

222222
add(envChipIngressEndpoint, e.ChipIngressEndpoint)
223223
add(envChipIngressInsecureConnection, strconv.FormatBool(e.ChipIngressInsecureConnection))
@@ -415,17 +415,17 @@ func (e *EnvConfig) parse() error {
415415
if err != nil {
416416
return fmt.Errorf("failed to parse %s: %w", envTelemetryLogMaxQueueSize, err)
417417
}
418-
e.TelemetryTraceCompressionEnabled, err = getBool(envTelemetryTraceCompressionEnabled)
418+
e.TelemetryTraceCompressionDisabled, err = getBool(envTelemetryTraceCompressionDisabled)
419419
if err != nil {
420-
return fmt.Errorf("failed to parse %s: %w", envTelemetryTraceCompressionEnabled, err)
420+
return fmt.Errorf("failed to parse %s: %w", envTelemetryTraceCompressionDisabled, err)
421421
}
422-
e.TelemetryMetricCompressionEnabled, err = getBool(envTelemetryMetricCompressionEnabled)
422+
e.TelemetryMetricCompressionDisabled, err = getBool(envTelemetryMetricCompressionDisabled)
423423
if err != nil {
424-
return fmt.Errorf("failed to parse %s: %w", envTelemetryMetricCompressionEnabled, err)
424+
return fmt.Errorf("failed to parse %s: %w", envTelemetryMetricCompressionDisabled, err)
425425
}
426-
e.TelemetryLogCompressionEnabled, err = getBool(envTelemetryLogCompressionEnabled)
426+
e.TelemetryLogCompressionDisabled, err = getBool(envTelemetryLogCompressionDisabled)
427427
if err != nil {
428-
return fmt.Errorf("failed to parse %s: %w", envTelemetryLogCompressionEnabled, err)
428+
return fmt.Errorf("failed to parse %s: %w", envTelemetryLogCompressionDisabled, err)
429429
}
430430
// Optional
431431
e.ChipIngressEndpoint = os.Getenv(envChipIngressEndpoint)

‎pkg/loop/server.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (s *Server) start(opts ...ServerOpt) error {
155155
OtelExporterGRPCEndpoint: s.EnvConfig.TelemetryEndpoint,
156156
ResourceAttributes: append(attributes, s.EnvConfig.TelemetryAttributes.AsStringAttributes()...),
157157
TraceSampleRatio: s.EnvConfig.TelemetryTraceSampleRatio,
158-
TraceCompressionEnabled: s.EnvConfig.TelemetryTraceCompressionEnabled,
158+
TraceCompressionDisabled: s.EnvConfig.TelemetryTraceCompressionDisabled,
159159
EmitterBatchProcessor: s.EnvConfig.TelemetryEmitterBatchProcessor,
160160
EmitterExportTimeout: s.EnvConfig.TelemetryEmitterExportTimeout,
161161
EmitterExportInterval: s.EnvConfig.TelemetryEmitterExportInterval,
@@ -168,11 +168,11 @@ func (s *Server) start(opts ...ServerOpt) error {
168168
LogExportMaxBatchSize: s.EnvConfig.TelemetryLogExportMaxBatchSize,
169169
LogExportInterval: s.EnvConfig.TelemetryLogExportInterval,
170170
LogMaxQueueSize: s.EnvConfig.TelemetryLogMaxQueueSize,
171-
LogCompressionEnabled: s.EnvConfig.TelemetryLogCompressionEnabled,
171+
LogCompressionDisabled: s.EnvConfig.TelemetryLogCompressionDisabled,
172172
ChipIngressEmitterEnabled: s.EnvConfig.ChipIngressEndpoint != "",
173173
ChipIngressEmitterGRPCEndpoint: s.EnvConfig.ChipIngressEndpoint,
174174
ChipIngressInsecureConnection: s.EnvConfig.ChipIngressInsecureConnection,
175-
MetricCompressionEnabled: s.EnvConfig.TelemetryMetricCompressionEnabled,
175+
MetricCompressionDisabled: s.EnvConfig.TelemetryMetricCompressionDisabled,
176176
}
177177

178178
// Configure beholder auth - the client will determine rotating vs static mode

0 commit comments

Comments
 (0)