From aa6c5a62710683e24f2ba7c491f9243ed4bc43ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Mon, 13 May 2024 12:53:09 +0200 Subject: [PATCH] chore: bump receiver-mock to 2.22.0 --- .changelog/3696.changed.txt | 1 + deploy/helm/sumologic/README.md | 4 ++-- .../helm/sumologic/conf/events/otelcol/config.yaml | 1 - .../conf/logs/collector/otelcloudwatch/config.yaml | 1 + .../conf/logs/collector/otelcol/config.yaml | 2 ++ deploy/helm/sumologic/conf/logs/otelcol/config.yaml | 5 ----- deploy/helm/sumologic/values.yaml | 6 +++--- docs/README.md | 2 +- docs/best-practices.md | 4 ++-- tests/helm/logs_test.go | 12 ++---------- .../testdata/goldenfile/events_otc/basic.output.yaml | 1 - .../goldenfile/events_otc/options.output.yaml | 1 - .../events_otc_statefulset/basic.output.yaml | 2 +- .../events_otc_statefulset/proxy.output.yaml | 2 +- .../testdata/goldenfile/logs_otc/basic.output.yaml | 1 + .../goldenfile/logs_otc_cloudwatch/basic.output.yaml | 2 +- .../logs_otc_daemonset/additional.output.yaml | 2 +- .../goldenfile/logs_otc_daemonset/basic.output.yaml | 2 +- .../multiple_multiline.output.yaml | 4 ++++ .../goldenfile/metadata_logs_otc/otel.output.yaml | 4 ---- .../metadata_logs_otc/templates.output.yaml | 4 ---- .../metadata_logs_otc_statefulset/basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../metrics_collector_otc/basic.output.yaml | 2 +- .../metrics_collector_otc/custom.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../traces-gateway-deployment/basic.output.yaml | 2 +- .../traces-sampler-deployment/basic.output.yaml | 2 +- tests/integration/internal/constants.go | 9 ++------- tests/integration/yamls/receiver-mock.yaml | 2 +- 30 files changed, 34 insertions(+), 54 deletions(-) create mode 100644 .changelog/3696.changed.txt diff --git a/.changelog/3696.changed.txt b/.changelog/3696.changed.txt new file mode 100644 index 0000000000..963d3176f0 --- /dev/null +++ b/.changelog/3696.changed.txt @@ -0,0 +1 @@ +chore: update OpenTelemetry Collector to v0.99.0-sumo-0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index ddd2657556..d446ca632d 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -165,7 +165,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.92.0-sumo-0` | +| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.99.0-sumo-0` | | `sumologic.otelcolImage.addFipsSuffix` | Add a `-fips` suffix to all image tags. See [docs/security-best-practices.md](/docs/security-best-practices.md) for more information. | `false` | | `sumologic.podLabels` | Additional labels for the pods. | `{}` | | `sumologic.podAnnotations` | Additional annotations for the pods. | `{}` | @@ -448,7 +448,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `opentelemetry-operator.instrumentation.python.metrics.enabled` | Flag to control metrics export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.python.traces.enabled` | Flag to control traces export from Python instrumentation in `Instrumentation` resource. | `true` | | `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.92.0-sumo-0` | +| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.99.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/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml index 052a272823..e342887b21 100644 --- a/deploy/helm/sumologic/conf/events/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/events/otelcol/config.yaml @@ -3,7 +3,6 @@ exporters: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic.events.exporter.endpoint" . }} log_format: {{ include "sumologic.events.exporter.format" . }} - clear_logs_timestamp: false # this only affects the otlp format sending_queue: enabled: true {{- if .Values.sumologic.events.persistence.enabled }} diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml index 6c2a61db3a..a0864018d2 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml @@ -67,6 +67,7 @@ processors: is_first_entry: attributes.log matches {{ .Values.sumologic.logs.multiline.first_line_regex | quote }} source_identifier: resource["cloudwatch.log.stream"] type: recombine + max_unmatched_batch_size: 1 receivers: awscloudwatch: region: {{ .Values.sumologic.logs.collector.otelcloudwatch.region }} diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index ed3163e8bb..42b155f2f4 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -238,6 +238,7 @@ receivers: source_identifier: attributes["log.file.path"] output: clean-up-log-file-path type: recombine + max_unmatched_batch_size: 1 {{- end }} ## merge-multiline-logs merges incoming log records into multiline logs. @@ -252,6 +253,7 @@ receivers: source_identifier: attributes["log.file.path"] output: clean-up-log-file-path type: recombine + max_unmatched_batch_size: 1 {{- end }} - field: attributes["log.file.path"] diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index dae6167816..8c239cd905 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -3,8 +3,6 @@ exporters: {{ if .Values.sumologic.logs.container.enabled }} sumologic/containers: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - json_logs: - add_timestamp: false log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -18,8 +16,6 @@ exporters: {{ if .Values.sumologic.logs.systemd.enabled }} sumologic/systemd: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true @@ -35,7 +31,6 @@ exporters: client: {{ include "sumologic.sumo_client" . }} endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp - clear_logs_timestamp: false sending_queue: enabled: true num_consumers: 10 diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index de8d6893f8..b87dc65f20 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -240,7 +240,7 @@ sumologic: ### Global configuration for OpenTelemetry Collector otelcolImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.92.0-sumo-0" + tag: "0.99.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. @@ -3773,7 +3773,7 @@ tracesSampler: spike_limit_percentage: 20 ## Smart cascading filtering rules with preset limits. - ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.92.0-sumo-0/pkg/processor/cascadingfilterprocessor + ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.99.0-sumo-0/pkg/processor/cascadingfilterprocessor ## for details. cascading_filter: ## Max number of traces for which decisions are kept in memory @@ -4659,7 +4659,7 @@ opentelemetry-operator: manager: collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.92.0-sumo-0" + tag: "0.99.0-sumo-0" env: {} resources: limits: diff --git a/docs/README.md b/docs/README.md index 7d0552d688..3e9d02537d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -110,7 +110,7 @@ The following table displays the currently used software versions for our Helm c | Name | Version | | ----------------------------------------- | ------- | -| OpenTelemetry Collector | 0.92.0 | +| OpenTelemetry Collector | 0.99.0 | | OpenTelemetry Operator | 0.49.0 | | kube-prometheus-stack/Prometheus Operator | 40.5.0 | | Falco | 3.8.7 | diff --git a/docs/best-practices.md b/docs/best-practices.md index 27efb3119e..079cc2f8c6 100644 --- a/docs/best-practices.md +++ b/docs/best-practices.md @@ -353,8 +353,8 @@ metadata: ``` In the example above, two internally defined processors were used in metadata pipeline: -[batch](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.92.0/processor/batchprocessor) and -[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.92.0/processor/memorylimiterprocessor). If you need to +[batch](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.99.0/processor/batchprocessor) and +[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.99.0/processor/memorylimiterprocessor). If you need to change the parameters of these processors in any way, you can define your own and use them in this pipeline. ## Removing attributes from systemd logs diff --git a/tests/helm/logs_test.go b/tests/helm/logs_test.go index aa9d8dc660..30c649b003 100644 --- a/tests/helm/logs_test.go +++ b/tests/helm/logs_test.go @@ -210,17 +210,13 @@ func TestMetadataLogFormat(t *testing.T) { Exporters struct { Containers struct { LogFormat string `yaml:"log_format"` - JsonLogs struct { - FlattenBody bool `yaml:"flatten_body"` - } `yaml:"json_logs"` } `yaml:"sumologic/containers"` } } testCases := []struct { - logFormat string - expectedExporterLogFormat string - expectedExporterFlattenBody bool + logFormat string + expectedExporterLogFormat string }{ { logFormat: "json", @@ -256,7 +252,6 @@ sumologic: err := yaml.Unmarshal([]byte(otelConfigYaml), &otelConfig) require.NoError(t, err) require.Equal(t, testCase.expectedExporterLogFormat, otelConfig.Exporters.Containers.LogFormat) - require.False(t, otelConfig.Exporters.Containers.JsonLogs.FlattenBody) }) } } @@ -269,9 +264,6 @@ func TestMetadataLogFormatOTLP(t *testing.T) { Exporters struct { SumoLogic struct { LogFormat string `yaml:"log_format"` - JsonLogs struct { - FlattenBody bool `yaml:"flatten_body"` - } `yaml:"json_logs"` } `yaml:"sumologic"` } Processors map[string]interface{} diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml index 84244dab2c..169ba8526a 100644 --- a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_EVENTS_SOURCE} log_format: json diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml index 741dd6d52c..72307f6be9 100644 --- a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_EVENTS_SOURCE} log_format: json 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 9399df916f..33f57484e9 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml @@ -71,7 +71,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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 53407421da..c60fce7a77 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml @@ -58,7 +58,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index 8c17984d39..30237193e9 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -149,6 +149,7 @@ data: id: merge-multiline-logs is_first_entry: body matches "^\\[?\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}" + max_unmatched_batch_size: 1 output: clean-up-log-file-path source_identifier: attributes["log.file.path"] type: recombine 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 e7b229f14d..93e62291c8 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.92.0-sumo-0 + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otelcol/config.yaml 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 c7ac4dbeb9..69d1f4b79d 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -45,7 +45,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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 2c354246ab..fe9ada0639 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -36,7 +36,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index 4dc1900f28..af063b3b57 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -155,6 +155,7 @@ data: id: merge-multiline-logs-0 is_first_entry: body matches "@@@Log beginning" + max_unmatched_batch_size: 1 output: clean-up-log-file-path source_identifier: attributes["log.file.path"] type: recombine @@ -163,6 +164,7 @@ data: id: merge-multiline-logs-1 is_first_entry: body matches "---Log beginning" + max_unmatched_batch_size: 1 output: clean-up-log-file-path source_identifier: attributes["log.file.path"] type: recombine @@ -171,6 +173,7 @@ data: id: merge-multiline-logs-2 is_first_entry: 'body matches ": : : Log beginning"' + max_unmatched_batch_size: 1 output: clean-up-log-file-path source_identifier: attributes["log.file.path"] type: recombine @@ -179,6 +182,7 @@ data: id: merge-multiline-logs is_first_entry: body matches "^\\[?\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}" + max_unmatched_batch_size: 1 output: clean-up-log-file-path source_identifier: attributes["log.file.path"] type: recombine diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml index 11e57b8813..7dc3c8cb47 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml @@ -15,8 +15,6 @@ data: exporters: sumologic/containers: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true @@ -25,8 +23,6 @@ data: storage: file_storage sumologic/systemd: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml index f514a1c5a0..4eef3cde40 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml @@ -15,8 +15,6 @@ data: exporters: sumologic/containers: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true @@ -25,8 +23,6 @@ data: storage: file_storage sumologic/systemd: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true 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 521b52a3f4..d4b1e7296f 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 @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-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 index 0ec9888b55..3b6e42ebf7 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 @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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 d093975f3e..8daedf6028 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.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml index 6cf37229a3..ef0d1b2f0b 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -17,7 +17,7 @@ metadata: podKey: podValue spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-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 index 0109c8d4aa..4fa75ea5f9 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml @@ -56,7 +56,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0 + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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 99177a8981..75429b2ed7 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml @@ -36,7 +36,7 @@ spec: restartPolicy: Always containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-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 index 0d8444a2ce..1d3712b56f 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml @@ -30,7 +30,7 @@ spec: serviceAccountName: RELEASE-NAME-sumologic containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.92.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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 28d46a0fe6..ffdf30e986 100644 --- a/tests/integration/internal/constants.go +++ b/tests/integration/internal/constants.go @@ -25,13 +25,13 @@ const ( LogsGeneratorNamespace = "logs-generator" LogsGeneratorName = "logs-generator" - LogsGeneratorImage = "sumologic/kubernetes-tools:2.14.0" + LogsGeneratorImage = "sumologic/kubernetes-tools:2.22.0" OverrideNamespace = "test-override" TracesGeneratorNamespace = "customer-trace-tester" TracesGeneratorName = "customer-trace-tester" - TracesGeneratorImage = "sumologic/kubernetes-tools:2.14.0" + TracesGeneratorImage = "sumologic/kubernetes-tools:2.22.0" MultilineLogsNamespace = "multiline-logs-generator" MultilineLogsPodName = "multiline-logs-generator" @@ -226,13 +226,8 @@ var ( "otelcol_processor_groupbyattrs_metric_groups_sum", "otelcol_processor_groupbyattrs_num_non_grouped_metrics", "otelcol_processor_refused_metric_points", - "otelcol_http_server_request_content_length", "otelcol_processor_batch_metadata_cardinality", - "otelcol_http_server_duration_count", - "otelcol_http_server_duration_sum", "otelcol_otelsvc_k8s_service_table_size", - "otelcol_http_server_duration_bucket", - "otelcol_http_server_response_content_length", "otelcol_otelsvc_k8s_owner_table_size", "otelcol_exporter_send_failed_metric_points", } diff --git a/tests/integration/yamls/receiver-mock.yaml b/tests/integration/yamls/receiver-mock.yaml index 9190d21f49..ebeb0d6661 100644 --- a/tests/integration/yamls/receiver-mock.yaml +++ b/tests/integration/yamls/receiver-mock.yaml @@ -26,7 +26,7 @@ spec: - ports: - containerPort: 3000 - containerPort: 3001 - image: sumologic/kubernetes-tools:2.14.0 + image: sumologic/kubernetes-tools:2.22.0 name: receiver-mock args: - receiver-mock