Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update OpenTelemetry Collector to 0.94.0-sumo-2 #3576

Closed
wants to merge 3 commits into from
Closed

chore: update OpenTelemetry Collector to 0.94.0-sumo-2 #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5345718
chore: update OpenTelemetry Collector to 0.94.0-sumo-2
kasia-kujawa Feb 23, 2024
7d23f44
tests: only to tests metrics
kasia-kujawa Mar 11, 2024
42aeb2e
test(metrics): accept new otelcol_http_client* metrics
kasia-kujawa Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3576.changed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: update OpenTelemetry Collector to 0.94.0-sumo-2
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,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.94.0-sumo-2` |
| `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. | `{}` |
Expand Down Expand Up @@ -297,7 +297,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `opentelemetry-operator.instrumentation.nodejs.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` |
| `opentelemetry-operator.instrumentation.nodejs.image` | OpenTelemetry Operator NodeJS Instrumentation image. | `ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.40.0` |
| `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.94.0-sumo-2` |
| `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` |
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ processors:
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.94.0-sumo-2/pkg/processor/cascadingfilterprocessor
## for details.
cascading_filter:
## Max number of traces for which decisions are kept in memory
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ sumologic:
### Global configuration for OpenTelemetry Collector
otelcolImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.92.0-sumo-0"
tag: "0.94.0-sumo-2"

## 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.
Expand Down Expand Up @@ -2338,7 +2338,7 @@ opentelemetry-operator:
manager:
collectorImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.92.0-sumo-0"
tag: "0.94.0-sumo-2"
env:
{}
# ENABLE_WEBHOOKS: "true"
Expand Down
2 changes: 1 addition & 1 deletion docs/working-with-container-registries.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ One can then use `${REGISTRY_REPO_URL}:${TAG}` in `user-values.yaml` as such:
sumologic:
otelcol:
defaultImage:
tag: 0.92.0-sumo-0-fips
tag: 0.94.0-sumo-2-fips
```

## Upgrading while rehosting images
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otelcol/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
mode: statefulset
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
mode: statefulset
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
mode: statefulset
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- "--config=/conf/otelcol.instrumentation.conf.yaml"
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- "--config=/conf/traces.gateway.conf.yaml"
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
kubernetes.io/os: linux
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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/conf/traces.sampler.conf.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
kubernetes.io/os: linux
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.94.0-sumo-2"
imagePullPolicy: IfNotPresent
args:
- --config=/conf/traces.sampler.conf.yaml
Expand Down
7 changes: 7 additions & 0 deletions tests/integration/internal/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,16 @@ var (
// we accept them, but don't fail if they're not present
FlakyMetrics = []string{
"otelcol_otelsvc_k8s_pod_deleted",
"otelcol_http_client_duration_bucket",
"otelcol_http_client_duration_count",
"otelcol_http_client_duration_sum",
"otelcol_http_client_response_size",
"otelcol_http_client_request_size",
"otelcol_http_server_duration_sum",
"otelcol_http_server_response_content_length",
"otelcol_http_server_response_size",
"otelcol_http_server_request_content_length",
"otelcol_http_server_request_size",
"otelcol_http_server_duration_count",
"otelcol_http_server_duration_bucket",
"otelcol_processor_batch_batch_size_trigger_send",
Expand Down
55 changes: 28 additions & 27 deletions tests/integration/internal/stepfuncs/assess_funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,33 +346,34 @@ func WaitUntilExpectedLogsPresent(
tickDuration time.Duration,
) features.Func {
return func(ctx context.Context, t *testing.T, envConf *envconf.Config) context.Context {
k8s_internal.WaitUntilSumologicMockAvailable(ctx, t, waitDuration, tickDuration)

client, closeTunnelFunc := sumologicmock.NewClientWithK8sTunnel(ctx, t)
defer closeTunnelFunc()

assert.Eventually(t, func() bool {
logsCount, err := client.GetLogsCount(t, expectedLogsMetadata)
if err != nil {
log.ErrorS(err, "failed getting log counts from sumologic-mock")
return false
}
if logsCount < expectedLogsCount {
log.InfoS(
"received logs, less than expected",
"received", logsCount,
"expected", expectedLogsCount,
)
return false
}
log.InfoS(
"received enough logs",
"received", logsCount,
"expected", expectedLogsCount,
"metadata", expectedLogsMetadata,
)
return true
}, waitDuration, tickDuration)
// TODO: UNCOMMENT BEFORE THE MERGE - COMMENTED ONLY TO TEST ISSUE WITH NEW METRICS
// k8s_internal.WaitUntilSumologicMockAvailable(ctx, t, waitDuration, tickDuration)

// client, closeTunnelFunc := sumologicmock.NewClientWithK8sTunnel(ctx, t)
// defer closeTunnelFunc()

// assert.Eventually(t, func() bool {
// logsCount, err := client.GetLogsCount(t, expectedLogsMetadata)
// if err != nil {
// log.ErrorS(err, "failed getting log counts from sumologic-mock")
// return false
// }
// if logsCount < expectedLogsCount {
// log.InfoS(
// "received logs, less than expected",
// "received", logsCount,
// "expected", expectedLogsCount,
// )
// return false
// }
// log.InfoS(
// "received enough logs",
// "received", logsCount,
// "expected", expectedLogsCount,
// "metadata", expectedLogsMetadata,
// )
// return true
// }, waitDuration, tickDuration)
return ctx
}
}
Expand Down