Skip to content

Commit 46516fd

Browse files
authored
Merge pull request #1880 from fluxcd/update-otel
Update otel packages to v1.38.0
2 parents 04ab27b + 85ac374 commit 46516fd

File tree

2 files changed

+106
-96
lines changed

2 files changed

+106
-96
lines changed

go.mod

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ require (
102102
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
103103
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
104104
github.com/BurntSushi/toml v1.5.0 // indirect
105-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
105+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
106106
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
107107
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
108108
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -152,7 +152,7 @@ require (
152152
github.com/buildkite/interpolate v0.1.5 // indirect
153153
github.com/buildkite/roko v1.3.1 // indirect
154154
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
155-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
155+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
156156
github.com/cespare/xxhash/v2 v2.3.0 // indirect
157157
github.com/chai2010/gettext-go v1.0.2 // indirect
158158
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
@@ -202,7 +202,7 @@ require (
202202
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
203203
github.com/go-ini/ini v1.67.0 // indirect
204204
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
205-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
205+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
206206
github.com/go-ldap/ldap/v3 v3.4.10 // indirect
207207
github.com/go-logr/stdr v1.2.2 // indirect
208208
github.com/go-logr/zapr v1.3.0 // indirect
@@ -241,8 +241,9 @@ require (
241241
github.com/gorilla/mux v1.8.1 // indirect
242242
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
243243
github.com/gosuri/uitable v0.0.4 // indirect
244+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
244245
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
245-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
246+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
246247
github.com/hashicorp/errwrap v1.1.0 // indirect
247248
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
248249
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -309,6 +310,7 @@ require (
309310
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
310311
github.com/prometheus/client_model v0.6.2 // indirect
311312
github.com/prometheus/common v0.65.0 // indirect
313+
github.com/prometheus/otlptranslator v0.0.2 // indirect
312314
github.com/prometheus/procfs v0.17.0 // indirect
313315
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
314316
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
@@ -360,30 +362,30 @@ require (
360362
gitlab.com/gitlab-org/api/client-go v0.130.1 // indirect
361363
go.mongodb.org/mongo-driver v1.14.0 // indirect
362364
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
363-
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
364-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
365-
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
366-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
367-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
368-
go.opentelemetry.io/otel v1.37.0 // indirect
369-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
370-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
371-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
372-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
373-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
374-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
375-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
376-
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
377-
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
378-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect
379-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
380-
go.opentelemetry.io/otel/log v0.8.0 // indirect
381-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
382-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
383-
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
384-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
385-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
386-
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
365+
go.opentelemetry.io/contrib/bridges/prometheus v0.63.0 // indirect
366+
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
367+
go.opentelemetry.io/contrib/exporters/autoexport v0.63.0 // indirect
368+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
369+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
370+
go.opentelemetry.io/otel v1.38.0 // indirect
371+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect
372+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect
373+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
374+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0 // indirect
375+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
376+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
377+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
378+
go.opentelemetry.io/otel/exporters/prometheus v0.60.0 // indirect
379+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
380+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect
381+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
382+
go.opentelemetry.io/otel/log v0.14.0 // indirect
383+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
384+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
385+
go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
386+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
387+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
388+
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
387389
go.uber.org/multierr v1.11.0 // indirect
388390
go.uber.org/zap v1.27.0 // indirect
389391
go.yaml.in/yaml/v2 v2.4.2 // indirect
@@ -398,10 +400,10 @@ require (
398400
golang.org/x/tools v0.36.0 // indirect
399401
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
400402
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
401-
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
402-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
403-
google.golang.org/grpc v1.74.2 // indirect
404-
google.golang.org/protobuf v1.36.7 // indirect
403+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
404+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
405+
google.golang.org/grpc v1.75.0 // indirect
406+
google.golang.org/protobuf v1.36.8 // indirect
405407
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
406408
gopkg.in/inf.v0 v0.9.1 // indirect
407409
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)