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
SumoLogic · Oct 10, 2024 · e11f6db · e11f6db
1 parent 91f005e
commit e11f6db
Show file tree

Hide file tree

Showing 41 changed files with 45 additions and 51 deletions.
diff --git a/.changelog/3855.changed.txt b/.changelog/3855.changed.txt
@@ -0,0 +1 @@
+chore: Upgrading otel to v0.108.0-sumo-0
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...lm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml b/...lm/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/...denfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml b/...denfile/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/...ldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml b/...ldenfile/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
@@ -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
@@ -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"