Skip to content

Commit 6b7342d

Browse files
authored
Update prometheus dependency and function signature (#3978)
* Update prometheus dependency and function signature * Update vendor * Update serverless vendor * Downgrade protobuf patch release for round-trip gogocodec issue * Hold back protobuf * Skip failing test * Replace test equality
1 parent 193c1cd commit 6b7342d

File tree

741 files changed

+84704
-29717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

741 files changed

+84704
-29717
lines changed

cmd/tempo-serverless/cloud-run/go.mod

+40-37
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@ require (
88
)
99

1010
require (
11-
cloud.google.com/go v0.112.1 // indirect
12-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
13-
cloud.google.com/go/iam v1.1.6 // indirect
14-
cloud.google.com/go/storage v1.38.0 // indirect
15-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
16-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
17-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
11+
cloud.google.com/go v0.115.0 // indirect
12+
cloud.google.com/go/auth v0.7.3 // indirect
13+
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
14+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
15+
cloud.google.com/go/iam v1.1.12 // indirect
16+
cloud.google.com/go/storage v1.41.0 // indirect
17+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
18+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
19+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
1820
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 // indirect
1921
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
20-
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
22+
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
2123
github.com/andybalholm/brotli v1.0.6 // indirect
2224
github.com/apache/thrift v0.20.0 // indirect
23-
github.com/aws/aws-sdk-go v1.53.11 // indirect
25+
github.com/aws/aws-sdk-go v1.55.5 // indirect
2426
github.com/beorn7/perks v1.0.1 // indirect
2527
github.com/cespare/xxhash v1.1.0 // indirect
2628
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -33,7 +35,7 @@ require (
3335
github.com/fsnotify/fsnotify v1.7.0 // indirect
3436
github.com/go-kit/log v0.2.1 // indirect
3537
github.com/go-logfmt/logfmt v0.6.0 // indirect
36-
github.com/go-logr/logr v1.4.1 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
3739
github.com/go-logr/stdr v1.2.2 // indirect
3840
github.com/go-redis/redis/v8 v8.11.5 // indirect
3941
github.com/goccy/go-json v0.10.2 // indirect
@@ -43,31 +45,32 @@ require (
4345
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4446
github.com/golang/protobuf v1.5.4 // indirect
4547
github.com/golang/snappy v0.0.4 // indirect
46-
github.com/google/s2a-go v0.1.7 // indirect
48+
github.com/google/s2a-go v0.1.8 // indirect
4749
github.com/google/uuid v1.6.0 // indirect
4850
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
49-
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
51+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
5052
github.com/gorilla/mux v1.8.1 // indirect
5153
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 // indirect
5254
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 // indirect
5355
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
54-
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db // indirect
56+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5557
github.com/hashicorp/hcl v1.0.0 // indirect
5658
github.com/jaegertracing/jaeger v1.57.0 // indirect
5759
github.com/jmespath/go-jmespath v0.4.0 // indirect
5860
github.com/jpillora/backoff v1.0.0 // indirect
5961
github.com/json-iterator/go v1.1.12 // indirect
60-
github.com/klauspost/compress v1.17.8 // indirect
62+
github.com/klauspost/compress v1.17.9 // indirect
6163
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
6264
github.com/kylelemons/godebug v1.1.0 // indirect
6365
github.com/magiconair/properties v1.8.7 // indirect
6466
github.com/mattn/go-runewidth v0.0.15 // indirect
65-
github.com/miekg/dns v1.1.56 // indirect
67+
github.com/miekg/dns v1.1.61 // indirect
6668
github.com/minio/md5-simd v1.1.2 // indirect
6769
github.com/minio/minio-go/v7 v7.0.70 // indirect
6870
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
6971
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7072
github.com/modern-go/reflect2 v1.0.2 // indirect
73+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7174
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
7275
github.com/olekukonko/tablewriter v0.0.5 // indirect
7376
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.102.0 // indirect
@@ -83,10 +86,10 @@ require (
8386
github.com/pkg/errors v0.9.1 // indirect
8487
github.com/prometheus/client_golang v1.19.1 // indirect
8588
github.com/prometheus/client_model v0.6.1 // indirect
86-
github.com/prometheus/common v0.53.0 // indirect
87-
github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
88-
github.com/prometheus/procfs v0.15.0 // indirect
89-
github.com/prometheus/prometheus v0.48.1 // indirect
89+
github.com/prometheus/common v0.55.0 // indirect
90+
github.com/prometheus/exporter-toolkit v0.11.0 // indirect
91+
github.com/prometheus/procfs v0.15.1 // indirect
92+
github.com/prometheus/prometheus v0.54.0 // indirect
9093
github.com/rivo/uniseg v0.4.4 // indirect
9194
github.com/rs/xid v1.5.0 // indirect
9295
github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -107,32 +110,32 @@ require (
107110
github.com/willf/bitset v1.1.11 // indirect
108111
github.com/willf/bloom v2.0.3+incompatible // indirect
109112
go.opencensus.io v0.24.0 // indirect
110-
go.opentelemetry.io/collector/pdata v1.9.0 // indirect
111-
go.opentelemetry.io/collector/semconv v0.102.1 // indirect
113+
go.opentelemetry.io/collector/pdata v1.12.0 // indirect
114+
go.opentelemetry.io/collector/semconv v0.105.0 // indirect
112115
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
113-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
114-
go.opentelemetry.io/otel v1.27.0 // indirect
115-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
116-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
117+
go.opentelemetry.io/otel v1.28.0 // indirect
118+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
119+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
117120
go.uber.org/atomic v1.11.0 // indirect
118121
go.uber.org/multierr v1.11.0 // indirect
119122
go.uber.org/zap v1.27.0 // indirect
120-
golang.org/x/crypto v0.24.0 // indirect
123+
golang.org/x/crypto v0.25.0 // indirect
121124
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
122-
golang.org/x/mod v0.17.0 // indirect
123-
golang.org/x/net v0.26.0 // indirect
124-
golang.org/x/oauth2 v0.20.0 // indirect
125+
golang.org/x/mod v0.19.0 // indirect
126+
golang.org/x/net v0.27.0 // indirect
127+
golang.org/x/oauth2 v0.21.0 // indirect
125128
golang.org/x/sync v0.7.0 // indirect
126-
golang.org/x/sys v0.21.0 // indirect
129+
golang.org/x/sys v0.22.0 // indirect
127130
golang.org/x/text v0.16.0 // indirect
128131
golang.org/x/time v0.5.0 // indirect
129-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
130-
google.golang.org/api v0.169.0 // indirect
131-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
132-
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
133-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
134-
google.golang.org/grpc v1.64.0 // indirect
135-
google.golang.org/protobuf v1.34.1 // indirect
132+
golang.org/x/tools v0.23.0 // indirect
133+
google.golang.org/api v0.190.0 // indirect
134+
google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
135+
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
137+
google.golang.org/grpc v1.65.0 // indirect
138+
google.golang.org/protobuf v1.34.2 // indirect
136139
gopkg.in/ini.v1 v1.67.0 // indirect
137140
gopkg.in/yaml.v2 v2.4.0 // indirect
138141
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)