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

feat: Bump OTel image version to 0.116.0 #1701

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: Bump OTel image version to 0.116.0 #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47fc75d
bump OTel image version to 0.116.0
hisarbalik Dec 19, 2024
09dda59
Merge branch 'main' into bump-otel-image-version-0.116.0
hisarbalik Dec 19, 2024
3f5f4c3
set the deprecated match_once attribute of routingconnector to true
hisarbalik Dec 19, 2024
7311220
Merge branch 'bump-otel-image-version-0.116.0' of github.com:hisarbal…
hisarbalik Dec 19, 2024
85e5f74
add benchmark test results for OTel version 0.116.0
hisarbalik Dec 19, 2024
4877098
Merge branch 'main' into bump-otel-image-version-0.116.0
hisarbalik Dec 23, 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
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.116.0"
3 changes: 3 additions & 0 deletions docs/contributor/benchmarks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

</div>

Expand Down Expand Up @@ -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 |

</div>

Expand Down Expand Up @@ -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 |

</div>

Expand Down
2 changes: 1 addition & 1 deletion internal/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
1 change: 1 addition & 0 deletions internal/otelcollector/config/metric/gateway/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
1 change: 1 addition & 0 deletions internal/otelcollector/config/metric/gateway/connectors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions internal/otelcollector/config/metric/gateway/connectors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\"",
Expand Down
1 change: 1 addition & 0 deletions internal/otelcollector/config/metric/gateway/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions internal/otelcollector/config/metric/gateway/testdata/config_otlp_disabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sec-scanners-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/testkit/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Loading