From 9ff8014ab3c6dc077cbf2f85d6eef5f83d284691 Mon Sep 17 00:00:00 2001 From: Hisar Balik Date: Sun, 18 Feb 2024 23:47:57 +0100 Subject: [PATCH] feat: Update OTEL image version to 0.94.0 (#796) --- docs/contributor/telemetry-load-test/README.md | 7 +++++-- .../assets/log-fluentbit-test-setup.yaml | 2 +- .../assets/metric-agent-test-setup.yaml | 2 +- .../telemetry-load-test/assets/metric-load-test-setup.yaml | 2 +- .../telemetry-load-test/assets/trace-load-test-setup.yaml | 2 +- main.go | 2 +- sec-scanners-config.yaml | 2 +- test/testkit/mocks/backend/deployment.go | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/contributor/telemetry-load-test/README.md b/docs/contributor/telemetry-load-test/README.md index 28306d9e9..96015d545 100644 --- a/docs/contributor/telemetry-load-test/README.md +++ b/docs/contributor/telemetry-load-test/README.md @@ -95,6 +95,7 @@ A typical test result output looks like the following example: | 0.91 | 19815 | 19815 | 0 | 137, 139 | 1, 1 | 13158 | 38929 | 0 | 117, 98 | 1.3, 1.3 | 9574 | 1280 | 509 | 1929, 1726 | 0.7, 0.7 | 9663 | 1331 | 510 | 2029, 1686 | 0.7, 0.7 | | 0.92 | 21146 | 21146 | 0 | 72, 50 | 1, 1 | 12757 | 38212 | 0 | 90, 111 | 1.3, 1.1 | 3293 | 2918 | 204 | 866, 873 | 0.6, 0.6 | 9694 | 1399 | 510 | 1730, 1796 | 0.7, 0.7 | | 0.93 | 19708 | 19708 | 0 | 69, 62 | 1, 1 | 12355 | 37068 | 0 | 158, 140 | 1.5, 1.2 | 319 | 324 | 237 | 874, 1106 | 0.1, 0 | 8209 | 865 | 510 | 1755, 1650 | 0.4, 0.4 | +| 0.94 | 19933 | 19934 | 0 | 110, 76 | 1, 1 | 13083 | 39248 | 0 | 94, 152 | 1.2, 1.4 | 299 | 299 | 214 | 1003, 808 | 0.1, 0 | 8644 | 916 | 169 | 1578, 1706 | 0.5, 0.5 | @@ -184,7 +185,8 @@ Each test scenario has its own test scripts responsible for preparing test scena |-------------:|:----------------------------:|:----------------------------:|:-------------------:|:--------------------:|:-------------:|:----------------------------:|:----------------------------:|:-------------------:|:--------------------:|:-------------:|:----------------------------:|:----------------------------:|:-------------------:|:--------------------:|:-------------:|:----------------------------:|:----------------------------:|:-------------------:|:--------------------:|:-------------:| | | Receiver Accepted Metric/sec | Exporter Exported Metric/sec | Exporter Queue Size | Pod Memory Usage(MB) | Pod CPU Usage | Receiver Accepted Metric/sec | Exporter Exported Metric/sec | Exporter Queue Size | Pod Memory Usage(MB) | Pod CPU Usage | Receiver Accepted Metric/sec | Exporter Exported Metric/sec | Exporter Queue Size | Pod Memory Usage(MB) | Pod CPU Usage | Receiver Accepted Metric/sec | Exporter Exported Metric/sec | Exporter Queue Size | Pod Memory Usage(MB) | Pod CPU Usage | | 0.92 | 5992 | 5993 | 0 | 225, 178 | 1.6, 1.5 | 4882 | 14647 | 0 | 165, 255 | 1.7, 1.8 | 635 | 636 | 114 | 770, 707 | 0, 0 | 965 | 1910 | 400 | 1694, 1500 | 0.1, 0.1 | -| 0.93 | 5592 | 5593 | 0 | 104,100 | 1.6,1.5 | 4721 | 14164 | 0 | 161,175 | 1.8,1.7 | 723 | 634 | 217 | 805,889 | 1.4,1.4 | 1492 | 1740 | 419 | 1705,1535 | 0.2,0 | +| 0.93 | 5592 | 5593 | 0 | 104, 100 | 1.6, 1.5 | 4721 | 14164 | 0 | 161, 175 | 1.8, 1.7 | 723 | 634 | 217 | 805, 889 | 1.4, 1.4 | 1492 | 1740 | 419 | 1705, 1535 | 0.2, 0 | +| 0.94 | 5836 | 5835 | 0 | 164, 244 | 1.6, 1.4 | 4873 | 14619 | 0 | 157, 228 | 1.8, 1.5 | 870 | 667 | 297 | 954, 782 | 0.3, 0.8 | 1443 | 1811 | 59 | 903, 1075 | 0, 0.1 | @@ -211,7 +213,8 @@ Each test scenario has its own test scripts responsible for preparing test scena |-------------:|:----------------------------:|:----------------------------:|:-------------------:|:--------------------:|:-------------:|:----------------------------:|:----------------------------:|:-------------------:|:--------------------:|:-------------:| | | Receiver Accepted Metric/sec | Exporter Exported Metric/sec | Exporter Queue Size | Pod Memory Usage(MB) | Pod CPU Usage | Receiver Accepted Metric/sec | Exporter Exported Metric/sec | Exporter Queue Size | Pod Memory Usage(MB) | Pod CPU Usage | | 0.92 | 20123 | 20137 | 0 | 704, 747 | 0.2, 0.2 | 19952 | 15234 | 0 | 751, 736 | 0.3, 0.2 | -| 0.93 | 19949 | 19946 | 0 | 704,729 | 0.2,0.2 | 16699 | 16591 | 107 | 852,771 | 0.2,0.2 | +| 0.93 | 19949 | 19946 | 0 | 704, 729 | 0.2, 0.2 | 16699 | 16591 | 107 | 852, 771 | 0.2, 0.2 | +| 0.94 | 19957 | 19950 | 0 | 727, 736 | 0.2, 0.4 | 19825 | 19824 | 0 | 1046, 1090 | 0.2, 0.2 | diff --git a/docs/contributor/telemetry-load-test/assets/log-fluentbit-test-setup.yaml b/docs/contributor/telemetry-load-test/assets/log-fluentbit-test-setup.yaml index 662fa1bf8..d8aa5a3d8 100644 --- a/docs/contributor/telemetry-load-test/assets/log-fluentbit-test-setup.yaml +++ b/docs/contributor/telemetry-load-test/assets/log-fluentbit-test-setup.yaml @@ -84,7 +84,7 @@ spec: containers: - args: - --config=/etc/collector/config.yaml - image: europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.93.0-fdc9e6c4 + image: europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979 imagePullPolicy: IfNotPresent name: otel-collector securityContext: diff --git a/docs/contributor/telemetry-load-test/assets/metric-agent-test-setup.yaml b/docs/contributor/telemetry-load-test/assets/metric-agent-test-setup.yaml index 31d7920ea..1edc0eb4b 100644 --- a/docs/contributor/telemetry-load-test/assets/metric-agent-test-setup.yaml +++ b/docs/contributor/telemetry-load-test/assets/metric-agent-test-setup.yaml @@ -112,7 +112,7 @@ spec: securityContext: fsGroup: 101 containers: - - image: otel/opentelemetry-collector-contrib:0.92.0 + - image: europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979 name: otel-collector resources: limits: diff --git a/docs/contributor/telemetry-load-test/assets/metric-load-test-setup.yaml b/docs/contributor/telemetry-load-test/assets/metric-load-test-setup.yaml index 22603d2c3..fd70a66e0 100644 --- a/docs/contributor/telemetry-load-test/assets/metric-load-test-setup.yaml +++ b/docs/contributor/telemetry-load-test/assets/metric-load-test-setup.yaml @@ -130,7 +130,7 @@ spec: securityContext: fsGroup: 101 containers: - - image: otel/opentelemetry-collector-contrib:0.92.0 + - image: europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979 name: otel-collector resources: limits: diff --git a/docs/contributor/telemetry-load-test/assets/trace-load-test-setup.yaml b/docs/contributor/telemetry-load-test/assets/trace-load-test-setup.yaml index 50f65af14..3ea32d57c 100644 --- a/docs/contributor/telemetry-load-test/assets/trace-load-test-setup.yaml +++ b/docs/contributor/telemetry-load-test/assets/trace-load-test-setup.yaml @@ -189,7 +189,7 @@ spec: securityContext: fsGroup: 101 containers: - - image: otel/opentelemetry-collector-contrib:0.91.0 + - image: europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979 name: otel-collector resources: limits: diff --git a/main.go b/main.go index bd0711322..e65a25506 100644 --- a/main.go +++ b/main.go @@ -125,7 +125,7 @@ var ( ) const ( - otelImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.93.0-fdc9e6c4" + otelImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979" overridesConfigMapName = "telemetry-override-config" overridesConfigMapKey = "override-config" fluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:2.2.2-b5220c17" diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 0df073b75..5635efde6 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,7 +1,7 @@ module-name: telemetry protecode: - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main - - europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.93.0-fdc9e6c4 + - europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979 - europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:2.2.2-b5220c17 - europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20240123-4f99d571 whitesource: diff --git a/test/testkit/mocks/backend/deployment.go b/test/testkit/mocks/backend/deployment.go index 5ef7a4159..884ca9503 100644 --- a/test/testkit/mocks/backend/deployment.go +++ b/test/testkit/mocks/backend/deployment.go @@ -12,7 +12,7 @@ import ( const ( replicas int32 = 1 - otelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.93.0-fdc9e6c4" + otelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.94.0-fc04f979" nginxImage = "europe-docker.pkg.dev/kyma-project/prod/external/nginx:1.23.3" fluentDImage = "europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluentd:v1.16-debian-1" )