From e11f6db7caa1d2d01b063d112c379064aa9bead6 Mon Sep 17 00:00:00 2001 From: Raj Nishtala <113392743+rnishtala-sumo@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:32:45 -0400 Subject: [PATCH] chore: Upgrade otel collector to v108 (#3855) * chore: Upgrading otel to v0.108.0-sumo-0 * chore: Update documentation * fix: the otel collector is now strict about type checking * Remove the otelsvc metrics from the default list --- .changelog/3855.changed.txt | 1 + deploy/helm/sumologic/README.md | 4 ++-- .../instrumentation/otelcol.instrumentation.conf.yaml | 2 +- .../conf/instrumentation/traces.gateway.conf.yaml | 2 +- .../helm/sumologic/conf/metrics/otelcol/processors.yaml | 8 ++++---- deploy/helm/sumologic/values.yaml | 4 ++-- .../goldenfile/events_otc_statefulset/basic.output.yaml | 2 +- .../goldenfile/events_otc_statefulset/common.output.yaml | 2 +- .../goldenfile/events_otc_statefulset/proxy.output.yaml | 2 +- .../goldenfile/logs_otc_cloudwatch/basic.output.yaml | 2 +- .../logs_otc_daemonset/additional-complex.output.yaml | 2 +- .../goldenfile/logs_otc_daemonset/additional.output.yaml | 2 +- .../goldenfile/logs_otc_daemonset/basic.output.yaml | 2 +- .../daemonset/additional-complex.output.yaml | 2 +- .../logs_otc_windows/daemonset/additional.output.yaml | 2 +- .../logs_otc_windows/daemonset/basic.output.yaml | 2 +- .../metadata_logs_otc_statefulset/basic.output.yaml | 2 +- .../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 +- .../metadata_metrics_otc_statefulset/basic.output.yaml | 2 +- .../goldenfile/metrics_collector_otc/basic.output.yaml | 2 +- .../goldenfile/metrics_collector_otc/debug.output.yaml | 2 +- .../goldenfile/metrics_collector_otc/kubelet.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 +- .../otelcol-instrumentation-statefulset/basic.output.yaml | 2 +- .../traces-gateway-deployment/basic.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 +- .../traces-sampler-deployment/basic.output.yaml | 2 +- .../persistence-enabled.output.yaml | 2 +- tests/integration/internal/constants.go | 7 ------- 41 files changed, 45 insertions(+), 51 deletions(-) create mode 100644 .changelog/3855.changed.txt diff --git a/.changelog/3855.changed.txt b/.changelog/3855.changed.txt new file mode 100644 index 000000000..45e901d36 --- /dev/null +++ b/.changelog/3855.changed.txt @@ -0,0 +1 @@ +chore: Upgrading otel to v0.108.0-sumo-0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 70ea7acd6..f430b15e8 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -169,7 +169,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `sumologic.noProxy` | List of comma separated hostnames which should be excluded from the proxy | `kubernetes.default.svc` | | `sumologic.pullSecrets` | Optional list of secrets that will be used for pulling images for Sumo Logic's deployments and statefulsets. | `Nil` | | `sumologic.otelcolImage.repository` | Default image repository for OpenTelemetry Collector. This can be overridden for specific components. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.104.0-sumo-1` | +| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.108.0-sumo-0` | | `sumologic.otelcolImage.addFipsSuffix` | Add a `-fips` suffix to all image tags. See [help.sumologic.com/docs/send-data/kubernetes/security-best-practices](https://help.sumologic.com/docs/send-data/kubernetes/security-best-practices/) for more information. | `false` | | `sumologic.podLabels` | Additional labels for the pods. | `{}` | | `sumologic.podAnnotations` | Additional annotations for the pods. | `{}` | @@ -322,7 +322,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `opentelemetry-operator.manager.autoInstrumentationImage.nodejs.tag` | OpenTelemetry Operator NodeJS Instrumentation image tag. | `0.40.0` | | `opentelemetry-operator.manager.image.repository` | The default operator image repository for OpenTelemetry. | `public.ecr.aws/sumologic/opentelemetry-operator` | | `opentelemetry-operator.manager.collectorImage.repository` | The default collector image repository for OpenTelemetryCollector CRDs. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.104.0-sumo-1` | +| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.108.0-sumo-0` | | `opentelemetry-operator.manager.resources.limits.cpu` | Used to set limit CPU for OpenTelemetry-Operator Manager. | `250m` | | `opentelemetry-operator.manager.resources.limits.memory` | Used to set limit Memory for OpenTelemetry-Operator Manager. | `512Mi` | | `opentelemetry-operator.manager.resources.requests.cpu` | Used to set requested CPU for OpenTelemetry-Operator Manager. | `150m` | 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/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 7b7894d9e..bde36ffe5 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -264,7 +264,7 @@ sumologic: ### Global configuration for OpenTelemetry Collector otelcolImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.104.0-sumo-1" + tag: "0.108.0-sumo-0" ## Add a -fips suffix to all image tags. With default tags, this results in FIPS-compliant otel images. ## See https://github.com/SumoLogic/sumologic-otel-collector/blob/main/docs/fips.md for more information. @@ -2487,7 +2487,7 @@ opentelemetry-operator: repository: public.ecr.aws/sumologic/opentelemetry-operator collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.104.0-sumo-1" + tag: "0.108.0-sumo-0" autoInstrumentationImage: java: repository: public.ecr.aws/sumologic/autoinstrumentation-java diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml index a5b794b79..3b7f4122f 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml @@ -72,7 +72,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml index 9a33da064..d3a706523 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml @@ -73,7 +73,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml index 318886352..dd76a718b 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml @@ -60,7 +60,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml index 187515c82..a5dd83ccc 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otelcol/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml index c4c792547..c5e989157 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml @@ -54,7 +54,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml index f1235ca13..0ea9ae5df 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -47,7 +47,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml index 933c7340a..386decfe3 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -38,7 +38,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml index f61ba2214..2d61d73b3 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml @@ -62,7 +62,7 @@ spec: - "otelcol-sumo.exe" args: - --config=etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml index 9b7cba3b2..9cc67c30a 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml @@ -52,7 +52,7 @@ spec: - "otelcol-sumo.exe" args: - --config=etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml index 7d9553de9..14020b1aa 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml @@ -43,7 +43,7 @@ spec: - "otelcol-sumo.exe" args: - --config=etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml index 1b52fb834..7516b1e95 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml @@ -39,7 +39,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml 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/metadata_metrics_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml index d187dabfc..62c656f14 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml @@ -58,7 +58,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml 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 ad2b69cd3..a99694366 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml index 2fa705da4..c9bac1f76 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml index 4d0fd2fe6..28fc742d2 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics 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/otelcol-instrumentation-statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml index 1dcfb7b7b..99602c577 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - "--config=/conf/otelcol.instrumentation.conf.yaml" diff --git a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml index 6963d5bcf..474acfea2 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml @@ -37,7 +37,7 @@ spec: restartPolicy: Always containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - "--config=/conf/traces.gateway.conf.yaml" 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 diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml index b19797d86..a4274a88a 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml @@ -32,7 +32,7 @@ spec: kubernetes.io/os: linux containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml index 8ae106105..a61bd708d 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml @@ -32,7 +32,7 @@ spec: kubernetes.io/os: linux containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml diff --git a/tests/integration/internal/constants.go b/tests/integration/internal/constants.go index cbbd2d8e5..7222e3f10 100644 --- a/tests/integration/internal/constants.go +++ b/tests/integration/internal/constants.go @@ -235,11 +235,6 @@ var ( "otelcol_exporter_requests_records", "otelcol_exporter_requests_sent", "otelcol_exporter_sent_metric_points", - "otelcol_otelsvc_k8s_other_added", - "otelcol_otelsvc_k8s_other_updated", - "otelcol_otelsvc_k8s_pod_added", - "otelcol_otelsvc_k8s_pod_table_size", - "otelcol_otelsvc_k8s_pod_updated", "otelcol_processor_accepted_metric_points", "otelcol_processor_inserted_metric_points", "otelcol_processor_batch_batch_send_size_count", @@ -251,8 +246,6 @@ var ( "otelcol_processor_groupbyattrs_num_non_grouped_metrics", "otelcol_processor_refused_metric_points", "otelcol_processor_batch_metadata_cardinality", - "otelcol_otelsvc_k8s_service_table_size", - "otelcol_otelsvc_k8s_owner_table_size", "otelcol_exporter_send_failed_metric_points", } LogsOtelcolMetrics = []string{