Skip to content

Commit 6ce1a83

Browse files
stefanprodanstefanprodan
authored
Merge pull request #1019 from fluxcd/update-otel
Update otel packages to v1.38.0
2 parents d2f54dd + 828f74f commit 6ce1a83

8 files changed

Lines changed: 145 additions & 135 deletions

File tree

‎auth/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ require (
2121
github.com/aws/aws-sdk-go-v2/service/eks v1.73.1
2222
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2
2323
github.com/coreos/go-oidc/v3 v3.15.0
24-
github.com/fluxcd/pkg/apis/meta v1.20.0
24+
github.com/fluxcd/pkg/apis/meta v1.21.0
2525
github.com/fluxcd/pkg/cache v0.11.0
2626
github.com/golang-jwt/jwt/v5 v5.3.0
2727
github.com/google/go-containerregistry v0.20.6
2828
github.com/onsi/gomega v1.38.2
29-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0
29+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
3030
golang.org/x/oauth2 v0.30.0
3131
google.golang.org/api v0.248.0
3232
k8s.io/api v0.34.0
@@ -52,7 +52,7 @@ require (
5252
github.com/beorn7/perks v1.0.1 // indirect
5353
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5454
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
55-
github.com/docker/cli v28.2.2+incompatible // indirect
55+
github.com/docker/cli v28.3.3+incompatible // indirect
5656
github.com/docker/docker-credential-helpers v0.9.3 // indirect
5757
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5858
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
@@ -91,9 +91,9 @@ require (
9191
github.com/spf13/pflag v1.0.7 // indirect
9292
github.com/x448/float16 v0.8.4 // indirect
9393
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
94-
go.opentelemetry.io/otel v1.36.0 // indirect
95-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
96-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
94+
go.opentelemetry.io/otel v1.38.0 // indirect
95+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
96+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
9797
go.yaml.in/yaml/v2 v2.4.2 // indirect
9898
go.yaml.in/yaml/v3 v3.0.4 // indirect
9999
golang.org/x/crypto v0.41.0 // indirect

‎auth/go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
6565
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6666
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
6767
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
68-
github.com/docker/cli v28.2.2+incompatible h1:qzx5BNUDFqlvyq4AHzdNB7gSyVTmU4cgsyN9SdInc1A=
69-
github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
68+
github.com/docker/cli v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
69+
github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
7070
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
7171
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
7272
github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
@@ -186,26 +186,26 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
186186
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
187187
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
188188
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
189-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
190-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
189+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
190+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
191191
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
192192
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
193193
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
194194
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
195195
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
196196
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
197-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
198-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
199-
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
200-
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
201-
go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
202-
go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
203-
go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
204-
go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
205-
go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
206-
go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
207-
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
208-
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
197+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
198+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
199+
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
200+
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
201+
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
202+
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
203+
go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
204+
go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
205+
go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
206+
go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
207+
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
208+
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
209209
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
210210
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
211211
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

‎chartutil/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace github.com/fluxcd/pkg/apis/meta => ../apis/meta
99
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20231025023718-d50d2fec9c98
1010

1111
require (
12-
github.com/fluxcd/pkg/apis/meta v1.20.0
12+
github.com/fluxcd/pkg/apis/meta v1.21.0
1313
github.com/go-logr/logr v1.4.3
1414
github.com/onsi/gomega v1.38.2
1515
github.com/opencontainers/go-digest v1.0.0

‎oci/go.mod‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
require (
2323
github.com/beorn7/perks v1.0.1 // indirect
2424
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
25-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
25+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
2626
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2727
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
2828
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -45,7 +45,8 @@ require (
4545
github.com/google/uuid v1.6.0 // indirect
4646
github.com/gorilla/handlers v1.5.2 // indirect
4747
github.com/gorilla/mux v1.8.1 // indirect
48-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
48+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
49+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
4950
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
5051
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
5152
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -60,46 +61,47 @@ require (
6061
github.com/prometheus/client_golang v1.23.0 // indirect
6162
github.com/prometheus/client_model v0.6.2 // indirect
6263
github.com/prometheus/common v0.65.0 // indirect
63-
github.com/prometheus/procfs v0.16.1 // indirect
64+
github.com/prometheus/otlptranslator v0.0.2 // indirect
65+
github.com/prometheus/procfs v0.17.0 // indirect
6466
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
6567
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
6668
github.com/redis/go-redis/v9 v9.7.3 // indirect
6769
github.com/spf13/cobra v1.9.1 // indirect
6870
github.com/spf13/pflag v1.0.6 // indirect
6971
github.com/vbatts/tar-split v0.12.1 // indirect
7072
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
71-
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
72-
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
73-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
74-
go.opentelemetry.io/otel v1.36.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
76-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
77-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
78-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
79-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
80-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
81-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
82-
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
83-
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
84-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
85-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
86-
go.opentelemetry.io/otel/log v0.8.0 // indirect
87-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
88-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
89-
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
90-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
91-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
92-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
73+
go.opentelemetry.io/contrib/bridges/prometheus v0.63.0 // indirect
74+
go.opentelemetry.io/contrib/exporters/autoexport v0.63.0 // indirect
75+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
76+
go.opentelemetry.io/otel v1.38.0 // indirect
77+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0 // indirect
81+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
82+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
83+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
84+
go.opentelemetry.io/otel/exporters/prometheus v0.60.0 // indirect
85+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
86+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect
87+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
88+
go.opentelemetry.io/otel/log v0.14.0 // indirect
89+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
90+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
91+
go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
92+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
93+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
94+
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
9395
go.yaml.in/yaml/v3 v3.0.4 // indirect
9496
golang.org/x/crypto v0.41.0 // indirect
9597
golang.org/x/net v0.43.0 // indirect
9698
golang.org/x/sync v0.16.0 // indirect
9799
golang.org/x/sys v0.35.0 // indirect
98100
golang.org/x/text v0.28.0 // indirect
99-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
101-
google.golang.org/grpc v1.68.1 // indirect
102-
google.golang.org/protobuf v1.36.7 // indirect
101+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
102+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
103+
google.golang.org/grpc v1.75.0 // indirect
104+
google.golang.org/protobuf v1.36.8 // indirect
103105
gopkg.in/warnings.v0 v0.1.2 // indirect
104106
gopkg.in/yaml.v2 v2.4.0 // indirect
105107
)

0 commit comments

Comments
 (0)