chore: update OpenTelemetry Collector to 0.102.1-sumo-0

SumoLogic · Jun 7, 2024 · 2ac5631 · 2ac5631
1 parent 2fc9148
commit 2ac5631
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 25 deletions.
diff --git a/.changelog/3755.changed.txt b/.changelog/3755.changed.txt
@@ -0,0 +1,3 @@
+chore: update OpenTelemetry Collector to 0.102.1-sumo-0
+
+This change fixes [CVE-2024-36129](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v).
diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md
@@ -168,7 +168,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.100.0-sumo-0`                                                                                                                                                                     |
+| `sumologic.otelcolImage.tag`                                                          | Default image tag for OpenTelemetry Collector. This can be overridden for specific components.                                                                                                                                                                                                             | `0.102.1-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.                                                                                                                                                                                                                                                                       | `{}`                                                                                                                                                                                 |
@@ -320,7 +320,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `opentelemetry-operator.instrumentation.nodejs.image`                                 | OpenTelemetry Operator NodeJS Instrumentation image. Deprecated, please use `repository` and `tag` instead.                                                                                                                                                                                                | `""`                                                                                                                                                                                 |
 | `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.100.0-sumo-0`                                                                                                                                                                     |
+| `opentelemetry-operator.manager.collectorImage.tag`                                   | The default collector image tag for OpenTelemetryCollector CRDs.                                                                                                                                                                                                                                           | `0.102.1-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/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.100.0-sumo-0"
+    tag: "0.102.1-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.
@@ -2556,7 +2556,7 @@ opentelemetry-operator:
       repository: public.ecr.aws/sumologic/opentelemetry-operator
     collectorImage:
       repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
-      tag: "0.100.0-sumo-0"
+      tag: "0.102.1-sumo-0"
     env:
       {}
       # ENABLE_WEBHOOKS: "true"

diff --git a/docs/README.md b/docs/README.md
@@ -107,7 +107,7 @@ The following table displays the currently used software versions for our Helm c
 
 | Name                                      | Version |
 | ----------------------------------------- | ------- |
-| OpenTelemetry Collector                   | 0.100.0 |
+| OpenTelemetry Collector                   | 0.102.1 |
 | OpenTelemetry Operator                    | 0.49.0  |
 | kube-prometheus-stack/Prometheus Operator | 40.5.0  |
 | Falco                                     | 3.8.7   |

diff --git a/docs/working-with-container-registries.md b/docs/working-with-container-registries.md
@@ -67,7 +67,7 @@ One can then use `${REGISTRY_REPO_URL}:${TAG}` in `user-values.yaml` as such:
 sumologic:
   otelcol:
     defaultImage:
-      tag: 0.100.0-sumo-0-fips
+      tag: 0.102.1-sumo-0-fips
 ```
 
 ## Upgrading while rehosting images

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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
           imagePullPolicy: IfNotPresent
           args:
             - --config=/etc/otel/config.yaml

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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+  image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+  image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+  image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
   mode: statefulset
   replicas: 1
   serviceAccount: RELEASE-NAME-sumologic-metrics

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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
           imagePullPolicy: IfNotPresent
           args:
             - "--config=/conf/traces.gateway.conf.yaml"

diff --git 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.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
@@ -32,7 +32,7 @@ spec:
         kubernetes.io/os: linux
       containers:
         - name: otelcol
-          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0"
+          image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
@@ -265,6 +265,8 @@ var (
 		"otelcol_processor_groupbyattrs_log_groups_bucket",
 		"otelcol_processor_groupbyattrs_log_groups_count",
 		"otelcol_processor_groupbyattrs_log_groups_sum",
+		"otelcol_fileconsumer_reading_files",
+		"otelcol_fileconsumer_open_files",
 	}
 	TracingOtelcolMetrics = []string{ // not used by any App
 		"otelcol_loadbalancer_num_backend_updates",