From 7e534035354a300d93acadc3cf714424c2484cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Thu, 10 Aug 2023 12:15:48 +0200 Subject: [PATCH] Revert "chore: use zstd compression for internal otlp data" This reverts commit c18580380e4c680b1351fca46c113f847cf8c4c5. --- .changelog/3197.fixed.txt | 1 + .../sumologic/conf/logs/collector/otelcloudwatch/config.yaml | 1 - deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml | 1 - deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml | 1 - deploy/helm/sumologic/values.yaml | 1 - docs/best-practices.md | 1 - tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml | 1 - tests/helm/testdata/goldenfile/logs_otc/options.output.yaml | 1 - .../testdata/goldenfile/metrics_collector_otc/basic.output.yaml | 1 - .../testdata/goldenfile/metrics_collector_otc/custom.output.yaml | 1 - .../traces-gateway-disabled.output.yaml | 1 - .../traces-gateway-enabled.output.yaml | 1 - 12 files changed, 1 insertion(+), 11 deletions(-) create mode 100644 .changelog/3197.fixed.txt diff --git a/.changelog/3197.fixed.txt b/.changelog/3197.fixed.txt new file mode 100644 index 0000000000..cca32e4026 --- /dev/null +++ b/.changelog/3197.fixed.txt @@ -0,0 +1 @@ +fix: disable zstd compression internally \ No newline at end of file diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml index 6ef73ccd9f..d4afb343bd 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml @@ -1,7 +1,6 @@ exporters: otlphttp: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 - compression: zstd sending_queue: queue_size: 10 diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index f7ae48eeac..97face2419 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -1,7 +1,6 @@ exporters: otlphttp: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 - compression: zstd sending_queue: queue_size: 10 diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml index d28c2dacce..32b05a737f 100644 --- a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml @@ -1,7 +1,6 @@ exporters: otlphttp: endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 - compression: zstd sending_queue: queue_size: 10000 num_consumers: 10 diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 169a2ae23c..b595b62367 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -3618,7 +3618,6 @@ otelcolInstrumentation: queue_size: 5000 otlphttp/traces: endpoint: 'http://{{ include "otelcolinstrumentation.exporter.endpoint" . }}:4318' - compression: zstd service: extensions: [health_check, memory_ballast, pprof] pipelines: diff --git a/docs/best-practices.md b/docs/best-practices.md index b819b2e6b5..63dc9db749 100644 --- a/docs/best-practices.md +++ b/docs/best-practices.md @@ -311,7 +311,6 @@ otellogs: exporters: otlphttp/extrafiles: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4319 - compression: zstd service: pipelines: logs/extrafiles: diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index cc03631199..3b060bd7ce 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: otlphttp: - compression: zstd endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index 97fe4fe2e0..bed359ccb0 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: otlphttp: - compression: zstd endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml index 2b3a497b4e..f5d872c440 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -56,7 +56,6 @@ spec: exporters: otlphttp: endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 - compression: zstd sending_queue: queue_size: 10000 num_consumers: 10 diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml index 277ff71300..4e72be7185 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -78,7 +78,6 @@ spec: exporters: otlphttp: endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 - compression: zstd sending_queue: queue_size: 10000 num_consumers: 10 diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml index 651f207c82..fae399c389 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml @@ -14,7 +14,6 @@ data: otelcol.instrumentation.conf.yaml: | exporters: otlphttp/traces: - compression: zstd endpoint: http://RELEASE-NAME-sumologic-traces-sampler.sumologic:4318 sumologic/metrics: compress_encoding: gzip diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml index 9f1f5aa1a7..88de14397a 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml @@ -14,7 +14,6 @@ data: otelcol.instrumentation.conf.yaml: | exporters: otlphttp/traces: - compression: zstd endpoint: http://RELEASE-NAME-sumologic-traces-gateway.sumologic:4318 sumologic/metrics: compress_encoding: gzip