Skip to content

build(deps): Upgrade otelcollector to v0.135.0 #1303

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

Merged
merged 14 commits into from
Sep 29, 2025
Merged

build(deps): Upgrade otelcollector to v0.135.0 #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e5c1184
Upgrade otelcollector to v0.135.0
github-actions[bot] Sep 17, 2025
7e98794
Update .trivyignore with new CVEs from version v0.135.0
github-actions[bot] Sep 17, 2025
2443512
add secret informer changes
rashmichandrashekar Sep 24, 2025
355e8b7
adding back newline
rashmichandrashekar Sep 24, 2025
371b945
Merge remote-tracking branch 'origin/main' into bot/otelcollector-upg…
gracewehner Sep 24, 2025
e331638
config ui in replicaset fixes
gracewehner Sep 24, 2025
ad33e56
get new build
gracewehner Sep 25, 2025
d88947a
fix configoptional type
gracewehner Sep 25, 2025
990b1d6
add all files
gracewehner Sep 25, 2025
fcbb4f0
nil check
gracewehner Sep 25, 2025
8dae685
Merge remote-tracking branch 'origin/main' into bot/otelcollector-upg…
gracewehner Sep 26, 2025
dd2b26c
fix and merge from main for tests to pass
gracewehner Sep 26, 2025
c228a4e
fix test that was backwards
gracewehner Sep 26, 2025
d75a9f5
trigger build
rashmichandrashekar Sep 29, 2025
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
5 changes: 3 additions & 2 deletions .pipelines/azure-pipeline-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ variables:
IS_OTEL_UPGRADE_BRANCH: $[startsWith(variables['Build.SourceBranchName'], 'otelcollector-upgrade-')]
BUILD_WINDOWS: true
Codeql.Enabled: true
GOLANG_VERSION: '1.24.6'
GOLANG_VERSION: '1.24.7'
FLUENTBIT_GOLANG_VERSION: '1.24.6'
TESTKUBE_GOLANG_VERSION: '1.23.10'
FLUENT_BIT_VERSION: '3.2.2'
Expand Down Expand Up @@ -2387,6 +2387,7 @@ extends:
HELM_FULL_IMAGE_NAME: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.HELM_FULL_IMAGE_NAME'] ]
IMAGE_TAG_TARGET_ALLOCATOR: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.TARGET_ALLOCATOR_IMAGE_TAG'] ]
IMAGE_TAG_CONFIG_READER: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.LINUX_CONFIG_READER_IMAGE_TAG'] ]
RETINA_VERSION: $[ stageDependencies.Build.DevClusterHelmChartFiles.outputs['setup.RETINA_VERSION'] ]
skipComponentGovernanceDetection: true
templateContext:
type: releaseJob
Expand Down Expand Up @@ -2800,7 +2801,7 @@ extends:
condition: eq(variables.IS_OTEL_UPGRADE_BRANCH, true)
variables:
skipComponentGovernanceDetection: true
TESTKUBE_RESULTS_UPGRADE: $[ dependencies.Testkube_OTel_Upgrade.outputs['testkube_results.TESTKUBE_RESULTS_UPGRADE'] ]
TESTKUBE_RESULTS_UPGRADE: $[ dependencies.Testkube_OTel_Upgrade.outputs['Testkube_OTel_Upgrade.testkube_results.TESTKUBE_RESULTS_UPGRADE'] ]
templateContext:
type: releaseJob
isProduction: false
Expand Down
6 changes: 1 addition & 5 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file contains CVEs to be ignored by Trivy
# Auto-generated on Tue Sep 2 17:37:24 UTC 2025
# Auto-generated on Wed Sep 17 07:12:56 UTC 2025

# CRITICAL

Expand All @@ -14,10 +14,6 @@ CVE-2025-4802
CVE-2023-4527 #
CVE-2023-4806 #
CVE-2024-33600 #
# otelcollector
CVE-2025-54388 # github.com/docker/docker
# promconfigvalidator
CVE-2025-54388 # github.com/docker/docker

# LOW
# kube-state-metrics
Expand Down
2 changes: 1 addition & 1 deletion OPENTELEMETRY_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.132.0
v0.135.0
2 changes: 1 addition & 1 deletion TARGETALLOCATOR_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.132.0
v0.135.0
1 change: 0 additions & 1 deletion otelcollector/opentelemetry-collector-builder/collector-config-default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ processors:
receivers:
prometheus:
api_server:
enabled: true
server_config:
endpoint: "localhost:9092"
config:
Expand Down
1 change: 0 additions & 1 deletion otelcollector/opentelemetry-collector-builder/collector-config-replicaset.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ processors:
receivers:
prometheus:
api_server:
enabled: true
server_config:
endpoint: "localhost:9092"
target_allocator:
Expand Down
1 change: 0 additions & 1 deletion otelcollector/opentelemetry-collector-builder/collector-config-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ processors:
receivers:
prometheus:
api_server:
enabled: true
server_config:
endpoint: "localhost:9092"
config:
Expand Down
193 changes: 98 additions & 95 deletions otelcollector/opentelemetry-collector-builder/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

420 changes: 214 additions & 206 deletions otelcollector/opentelemetry-collector-builder/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion otelcollector/opentelemetry-collector-builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func main() {
info := component.BuildInfo{
Command: "custom-collector-distro",
Description: "Custom OpenTelemetry Collector distribution",
Version: "0.132.0",
Version: "0.135.0",
}

set := otelcol.CollectorSettings{
Expand Down
49 changes: 25 additions & 24 deletions otelcollector/otel-allocator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ require (
github.com/prometheus-operator/prometheus-operator v0.81.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.81.0
github.com/prometheus-operator/prometheus-operator/pkg/client v0.81.0
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_golang v1.23.0
github.com/prometheus/common v0.65.0
github.com/prometheus/prometheus v0.301.0
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.11.0
go.opentelemetry.io/otel v1.37.0
go.opentelemetry.io/otel/exporters/prometheus v0.59.1
go.opentelemetry.io/otel/metric v1.37.0
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.37.0
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/exporters/prometheus v0.60.0
go.opentelemetry.io/otel/metric v1.38.0
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.38.0
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -55,7 +55,7 @@ require (
require (
cloud.google.com/go/auth v0.13.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/compute/metadata v0.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
Expand All @@ -73,7 +73,7 @@ require (
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/digitalocean/godo v1.132.0 // indirect
Expand Down Expand Up @@ -183,26 +183,26 @@ require (
go.mongodb.org/mongo-driver v1.17.2 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.uber.org/atomic v1.11.0
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
golang.org/x/mod v0.25.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/mod v0.26.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.33.0 // indirect
golang.org/x/tools v0.35.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/api v0.213.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/grpc v1.73.0 // indirect
google.golang.org/protobuf v1.36.7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
google.golang.org/grpc v1.75.0 // indirect
google.golang.org/protobuf v1.36.8 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand All @@ -222,8 +222,9 @@ require (
github.com/google/btree v1.1.3 // indirect
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
github.com/onsi/gomega v1.37.0 // indirect
github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect
github.com/prometheus/otlptranslator v0.0.2 // indirect
github.com/prometheus/sigv4 v0.1.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
)
Loading
Loading