From c90d8505fdf823c48f5d27bb11bd04142fbbddbd Mon Sep 17 00:00:00 2001 From: Raj Nishtala Date: Wed, 9 Oct 2024 17:27:05 -0400 Subject: [PATCH] fix: the otel collector is now strict about type checking --- .../instrumentation/otelcol.instrumentation.conf.yaml | 2 +- .../conf/instrumentation/traces.gateway.conf.yaml | 2 +- .../helm/sumologic/conf/metrics/otelcol/processors.yaml | 8 ++++---- .../metadata_metrics_otc/additional_endpoints.output.yaml | 2 +- .../metadata_metrics_otc/allow_histograms.output.yaml | 2 +- .../goldenfile/metadata_metrics_otc/basic.output.yaml | 2 +- .../goldenfile/metadata_metrics_otc/custom.output.yaml | 2 +- .../goldenfile/metadata_metrics_otc/debug.output.yaml | 2 +- .../debug_with_sumologic_mock.output.yaml | 2 +- .../debug_with_sumologic_mock_http.output.yaml | 2 +- .../metadata_metrics_otc/filtered_app_metrics.output.yaml | 2 +- .../traces-gateway-disabled.output.yaml | 2 +- .../traces-gateway-disabled.sumologic-mock.output.yaml | 2 +- .../traces-gateway-enabled.sumologic-mock.output.yaml | 2 +- .../config-from-merge.output.yaml | 2 +- .../config-from-values-backward-compatibility.output.yaml | 2 +- .../sumologic-mock.output.yaml | 2 +- .../traces-gateway-true.output.yaml | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml index 25a2e6ee4..5223be817 100644 --- a/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml +++ b/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml @@ -56,7 +56,7 @@ exporters: resolver: dns: hostname: '{{ include "tracesgateway.exporter.loadbalancing.endpoint" . }}' - port: 4317 + port: '4317' {{- end }} receivers: jaeger: diff --git a/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml index 928743485..f708c7e4a 100644 --- a/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml +++ b/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml @@ -18,7 +18,7 @@ exporters: resolver: dns: hostname: '{{ include "tracesgateway.exporter.loadbalancing.endpoint" . }}' - port: 4317 + port: '4317' receivers: otlp: diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml index 50e49bf51..85de55897 100644 --- a/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml +++ b/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml @@ -70,10 +70,10 @@ memory_limiter: metricstransform: transforms: ## rename all prometheus_remote_write_$name metrics to $name - action: update - include: ^prometheus_remote_write_(.*)$$ - match_type: regexp - new_name: $$1 + - action: update + include: ^prometheus_remote_write_(.*)$$ + match_type: regexp + new_name: $$1 ## Configuration for Resource Processor resource: diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml index d956884a6..6eb25695f 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml @@ -81,7 +81,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml index 7168f02a2..1e25ca71a 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml @@ -81,7 +81,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml index 5522ab6b7..074fd5c50 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml @@ -81,7 +81,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml index 0df6ba27b..f57946a6f 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml @@ -158,7 +158,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml index c1ec269cc..c521af9c7 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml @@ -83,7 +83,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml index da9261618..9675330c0 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml @@ -106,7 +106,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml index 94ba3fd39..8e5231913 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml @@ -183,7 +183,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml index 05f58ab2d..06a11412a 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml @@ -105,7 +105,7 @@ data: spike_limit_percentage: 20 metricstransform: transforms: - action: update + - action: update include: ^prometheus_remote_write_(.*)$$ match_type: regexp new_name: $$1 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 bd942d12e..aa8c26ce4 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 @@ -26,7 +26,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" sumologic/metrics: client: k8s_%CURRENT_CHART_VERSION% compression: gzip diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml index 2f83ac5fe..e5c25d45b 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml @@ -28,7 +28,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" sumologic/metrics: client: k8s_%CURRENT_CHART_VERSION% compression: gzip diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml index 2f83ac5fe..e5c25d45b 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml @@ -28,7 +28,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" sumologic/metrics: client: k8s_%CURRENT_CHART_VERSION% compression: gzip diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml index b537090b5..37423dc5c 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml @@ -26,7 +26,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" extensions: health_check: endpoint: ${env:MY_POD_IP}:13133 diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml index f2d99cedb..490cff5a3 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml @@ -26,7 +26,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" extensions: health_check: endpoint: ${env:MY_POD_IP}:13133 diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml index 4b0e00803..fdf1c86bb 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml @@ -28,7 +28,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" extensions: health_check: endpoint: ${env:MY_POD_IP}:13133 diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml index 33e3adee0..1ee20d03e 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml @@ -26,7 +26,7 @@ data: resolver: dns: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic - port: 4317 + port: "4317" extensions: health_check: endpoint: ${env:MY_POD_IP}:13133