From e8761a71313595056175df0e0ff4ffd7035797f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 13:44:35 +0000 Subject: [PATCH 1/3] chore: bump github.com/onsi/ginkgo/v2 from 2.22.1 to 2.22.2 (#1724) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 67c139f4b..0909ba686 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-logr/zapr v1.3.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 - github.com/onsi/ginkgo/v2 v2.22.1 + github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/client_model v0.6.1 diff --git a/go.sum b/go.sum index 9f5e18fac..1c7820c10 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= -github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= +github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= +github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From b2c28d0eaaaa9bcddd1621e8450f5e804c236187 Mon Sep 17 00:00:00 2001 From: Hisar Balik Date: Tue, 7 Jan 2025 16:04:32 +0100 Subject: [PATCH 2/3] feat: Bump OTel image version to 0.116.0 (#1701) --- .env | 4 ++-- docs/contributor/benchmarks/README.md | 3 +++ internal/images/images.go | 2 +- internal/otelcollector/config/metric/gateway/config.go | 1 + internal/otelcollector/config/metric/gateway/connectors.go | 1 + .../otelcollector/config/metric/gateway/connectors_test.go | 1 + .../otelcollector/config/metric/gateway/testdata/config.yaml | 1 + .../config/metric/gateway/testdata/config_otlp_disabled.yaml | 1 + sec-scanners-config.yaml | 2 +- test/testkit/images.go | 2 +- 10 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.env b/.env index a12083e6d..43d922b1d 100644 --- a/.env +++ b/.env @@ -17,6 +17,6 @@ ENV_GORELEASER_VERSION=v1.23.0 ## Default Docker Images DEFAULT_FLUENTBIT_EXPORTER_IMAGE="europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f" DEFAULT_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2" -DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.115.0-main" +DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main" DEFAULT_SELFMONITOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.0.1-857b814" -DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.115.0" \ No newline at end of file +DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.116.0" \ No newline at end of file diff --git a/docs/contributor/benchmarks/README.md b/docs/contributor/benchmarks/README.md index 4ceca20f2..732e1f1b9 100644 --- a/docs/contributor/benchmarks/README.md +++ b/docs/contributor/benchmarks/README.md @@ -121,6 +121,7 @@ A typical test result output looks like the following example: | 0.111.0 | 18459 | 18348 | 0 | 117, 141 | 1, 1 | 11080 | 32859 | 0 | 160, 160 | 1.4, 1.4 | 11292 | 315 | 507 | 1726, 1754 | 0.5, 0.5 | 18012 | 925 | 510 | 1709, 1679 | 0.9, 0.9 | | 0.114.0 | 19610 | 19453 | 0 | 127, 125 | 1, 1 | 11256 | 33308 | 0 | 175, 248 | 1.4, 1.4 | 10608 | 321 | 511 | 1737, 1735 | 0.5, 0.5 | 18442 | 956 | 510 | 1798, 1737 | 0.9, 0.9 | | 0.115.0 | 18865 | 18718 | 0 | 191, 253 | 1, 1 | 11615 | 34386 | 0 | 275, 167 | 1.4, 1.5 | 11141 | 277 | 511 | 1747, 1731 | 0.5, 0.5 | 18258 | 880 | 510 | 1741, 1760 | 0.9, 0.9 | +| 0.116.0 | 19693 | 19540 | 0 | 165, 126 | 1.1, 1 | 11388 | 33717 | 0 | 196, 137 | 1.5, 1.4 | 11215 | 324 | 510 | 1658, 1738 | 0.5, 0.5 | 17974 | 886 | 509 | 1671, 1683 | 0.9, 0.9 | @@ -243,6 +244,7 @@ are printed out. | 0.110.0 | 4223 | 4222 | 0 | 130, 137 | 1.5, 1.5 | 3139 | 9417 | 1 | 197, 215 | 1.7, 1.7 | 830 | 640 | 287 | 841, 835 | 0.5, 0.5 | 2048 | 1907 | 510 | 1741, 1694 | 1.4, 1.4 | | 0.114.0 | 4384 | 4385 | 0 | 131, 141 | 1.5, 1.5 | 3209 | 9624 | 0 | 189, 198 | 1.7, 1.8 | 757 | 635 | 393 | 807, 824 | 0.5, 0.4 | 2512 | 1691 | 510 | 1788, 1789 | 1.6, 1.6 | | 0.115.0 | 4256 | 4255 | 0 | 144, 175 | 1.5, 1.5 | 3346 | 10040 | 0 | 244, 202 | 1.7, 1.8 | 726 | 627 | 361 | 821, 834 | 0.5, 0.5 | 2510 | 1926 | 505 | 1778, 1730 | 1.7, 1.6 | +| 0.116.0 | 4374 | 4374 | 0 | 100, 109 | 1.5, 1.5 | 3500 | 10500 | 0 | 171, 171 | 1.8, 2 | 710 | 641 | 383 | 857, 870 | 0.5, 0.5 | 3183 | 1780 | 509 | 1760, 1848 | 2, 2.1 | @@ -291,6 +293,7 @@ On average, memory usage for MetricPipeline instances is ~150MB for a single Pod | 0.110.0 | 20240 | 20238 | 0 | 733, 773 | 0.3, 0.3 | 20060 | 20059 | 0 | 764, 735 | 0.2, 0.3 | | 0.114.0 | 19904 | 19904 | 0 | 683, 707 | 0.2, 0.2 | 19942 | 19958 | 0 | 701, 743 | 0.2, 0.2 | | 0.115.0 | 20073 | 20073 | 0 | 697, 697 | 0.2, 0.2 | 19924 | 19954 | 0 | 700, 773 | 0.2, 0.3 | +| 0.116.0 | 20058 | 20057 | 0 | 690, 682 | 0.3, 0.3 | 19998 | 19999 | 0 | 713, 692 | 0.2, 0.3 | diff --git a/internal/images/images.go b/internal/images/images.go index 60cf4668a..21308360d 100644 --- a/internal/images/images.go +++ b/internal/images/images.go @@ -6,6 +6,6 @@ package images const ( DefaultFluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f" DefaultFluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2" - DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.115.0-main" + DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main" DefaultSelfMonitorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.0.1-857b814" ) diff --git a/internal/otelcollector/config/metric/gateway/config.go b/internal/otelcollector/config/metric/gateway/config.go index 40040b910..d6d25c56e 100644 --- a/internal/otelcollector/config/metric/gateway/config.go +++ b/internal/otelcollector/config/metric/gateway/config.go @@ -97,6 +97,7 @@ type Connectors map[string]any type RoutingConnector struct { DefaultPipelines []string `yaml:"default_pipelines"` ErrorMode string `yaml:"error_mode"` + MatchOnce bool `yaml:"match_once"` Table []RoutingConnectorTableEntry `yaml:"table"` } diff --git a/internal/otelcollector/config/metric/gateway/connectors.go b/internal/otelcollector/config/metric/gateway/connectors.go index d25c02361..87f94b41d 100644 --- a/internal/otelcollector/config/metric/gateway/connectors.go +++ b/internal/otelcollector/config/metric/gateway/connectors.go @@ -13,6 +13,7 @@ func makeRoutingConnectorConfig(pipelineName string) RoutingConnector { return RoutingConnector{ DefaultPipelines: []string{attributesEnrichmentPipelineID}, ErrorMode: "ignore", + MatchOnce: true, Table: []RoutingConnectorTableEntry{ { Statement: fmt.Sprintf("route() where attributes[\"%s\"] == \"true\"", metric.SkipEnrichmentAttribute), diff --git a/internal/otelcollector/config/metric/gateway/connectors_test.go b/internal/otelcollector/config/metric/gateway/connectors_test.go index 6b65e813b..d1e4c8d98 100644 --- a/internal/otelcollector/config/metric/gateway/connectors_test.go +++ b/internal/otelcollector/config/metric/gateway/connectors_test.go @@ -45,6 +45,7 @@ func TestConnectors(t *testing.T) { expectedRoutingConnector := RoutingConnector{ DefaultPipelines: []string{"metrics/test-attributes-enrichment"}, ErrorMode: "ignore", + MatchOnce: true, Table: []RoutingConnectorTableEntry{ { Statement: "route() where attributes[\"io.kyma-project.telemetry.skip_enrichment\"] == \"true\"", diff --git a/internal/otelcollector/config/metric/gateway/testdata/config.yaml b/internal/otelcollector/config/metric/gateway/testdata/config.yaml index 8deeab183..3033c643c 100644 --- a/internal/otelcollector/config/metric/gateway/testdata/config.yaml +++ b/internal/otelcollector/config/metric/gateway/testdata/config.yaml @@ -179,6 +179,7 @@ connectors: default_pipelines: - metrics/test-attributes-enrichment error_mode: ignore + match_once: true table: - statement: route() where attributes["io.kyma-project.telemetry.skip_enrichment"] == "true" pipelines: diff --git a/internal/otelcollector/config/metric/gateway/testdata/config_otlp_disabled.yaml b/internal/otelcollector/config/metric/gateway/testdata/config_otlp_disabled.yaml index afbbdcbdd..de3d7dce5 100644 --- a/internal/otelcollector/config/metric/gateway/testdata/config_otlp_disabled.yaml +++ b/internal/otelcollector/config/metric/gateway/testdata/config_otlp_disabled.yaml @@ -184,6 +184,7 @@ connectors: default_pipelines: - metrics/test-attributes-enrichment error_mode: ignore + match_once: true table: - statement: route() where attributes["io.kyma-project.telemetry.skip_enrichment"] == "true" pipelines: diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 2443b272f..d3724d4b4 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -3,7 +3,7 @@ protocode: - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main - europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f - europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2 -- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.115.0-main +- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main - europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.0.1-857b814 whitesource: language: golang-mod diff --git a/test/testkit/images.go b/test/testkit/images.go index cab5899c0..9b6f54a3b 100644 --- a/test/testkit/images.go +++ b/test/testkit/images.go @@ -4,5 +4,5 @@ package testkit const ( - DefaultTelemetryGenImage = "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.115.0" + DefaultTelemetryGenImage = "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.116.0" ) From a4bb3e94769ce9c72ce6084cc96f5879fc317ed2 Mon Sep 17 00:00:00 2001 From: Hisar Balik Date: Tue, 7 Jan 2025 16:38:51 +0100 Subject: [PATCH 3/3] bump images for release 1.31.0 --- .env | 4 ++-- config/manager/kustomization.yaml | 2 +- internal/images/images.go | 2 +- main.go | 2 +- sec-scanners-config.yaml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 43d922b1d..42b5b98e7 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ ### Default Environment Variables ## General ENV_K3S_K8S_VERSION=1.30.5 # refers to the version of kubernetes used in K3s -ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main # Image URL to use all building/pushing image targets +ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.31.0 # Image URL to use all building/pushing image targets ## Gardener ENV_GARDENER_K8S_VERSION=1.30 @@ -17,6 +17,6 @@ ENV_GORELEASER_VERSION=v1.23.0 ## Default Docker Images DEFAULT_FLUENTBIT_EXPORTER_IMAGE="europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f" DEFAULT_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2" -DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main" +DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-1.31.0" DEFAULT_SELFMONITOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.0.1-857b814" DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.116.0" \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a56c2e687..f57577767 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -8,4 +8,4 @@ kind: Kustomization images: - name: controller newName: europe-docker.pkg.dev/kyma-project/prod/telemetry-manager - newTag: main + newTag: 1.31.0 diff --git a/internal/images/images.go b/internal/images/images.go index 21308360d..25ceac2cd 100644 --- a/internal/images/images.go +++ b/internal/images/images.go @@ -6,6 +6,6 @@ package images const ( DefaultFluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f" DefaultFluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2" - DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main" + DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-1.31.0" DefaultSelfMonitorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.0.1-857b814" ) diff --git a/main.go b/main.go index bf9d69f8f..723a8cd2a 100644 --- a/main.go +++ b/main.go @@ -75,7 +75,7 @@ var ( setupLog = ctrl.Log.WithName("setup") telemetryNamespace string // TODO: replace with build version based on git revision - version = "main" + version = "1.31.0" // Operator flags certDir string diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index d3724d4b4..edea93199 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,9 +1,9 @@ module-name: telemetry protocode: -- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main +- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.31.0 - europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f - europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2 -- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main +- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-1.31.0 - europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.0.1-857b814 whitesource: language: golang-mod