Skip to content

Commit 1d65cbb

Browse files
authored
fix: spanner metrics regression (#2329)
1 parent c3b1bdc commit 1d65cbb

File tree

8 files changed

+105
-52
lines changed

8 files changed

+105
-52
lines changed

docs/spicedb.md

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
golang.org/x/text v0.33.0 // indirect
7979
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
8080
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
81-
google.golang.org/protobuf v1.36.10 // indirect
81+
google.golang.org/protobuf v1.36.11 // indirect
8282
gopkg.in/yaml.v3 v3.0.1 // indirect
8383
sigs.k8s.io/controller-runtime v0.22.4 // indirect
8484
)

e2e/go.sum

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,12 @@ github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UH
250250
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
251251
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
252252
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
253-
github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
254-
github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
255-
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
256-
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
253+
github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
254+
github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
255+
github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
256+
github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
257+
github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
258+
github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
257259
github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0=
258260
github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI=
259261
github.com/puzpuzpuz/xsync/v4 v4.2.0 h1:dlxm77dZj2c3rxq0/XNvvUKISAmovoXF4a4qM6Wvkr0=
@@ -309,6 +311,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG
309311
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
310312
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
311313
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
314+
go.opentelemetry.io/otel/exporters/prometheus v0.62.0 h1:krvC4JMfIOVdEuNPTtQ0ZjCiXrybhv+uOHMfHRmnvVo=
315+
go.opentelemetry.io/otel/exporters/prometheus v0.62.0/go.mod h1:fgOE6FM/swEnsVQCqCnbOfRV4tOnWPg7bVeo4izBuhQ=
312316
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
313317
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
314318
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
@@ -356,8 +360,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
356360
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
357361
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
358362
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
359-
golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
360-
golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
363+
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
364+
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
361365
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
362366
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
363367
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -421,8 +425,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
421425
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
422426
google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
423427
google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
424-
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
425-
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
428+
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
429+
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
426430
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
427431
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
428432
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ require (
8686
github.com/planetscale/vtprotobuf v0.6.1-0.20240917153116-6f2963f01587
8787
github.com/prometheus/client_golang v1.23.2
8888
github.com/prometheus/client_model v0.6.2
89-
github.com/prometheus/common v0.67.4
89+
github.com/prometheus/common v0.67.5
9090
github.com/puzpuzpuz/xsync/v4 v4.2.0
9191
github.com/rs/cors v1.11.1
9292
github.com/rs/xid v1.6.0
@@ -106,7 +106,9 @@ require (
106106
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
107107
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
108108
go.opentelemetry.io/otel v1.40.0
109+
go.opentelemetry.io/otel/exporters/prometheus v0.62.0
109110
go.opentelemetry.io/otel/sdk v1.40.0
111+
go.opentelemetry.io/otel/sdk/metric v1.40.0
110112
go.opentelemetry.io/otel/trace v1.40.0
111113
go.uber.org/atomic v1.11.0
112114
go.uber.org/goleak v1.3.0
@@ -119,7 +121,7 @@ require (
119121
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8
120122
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846
121123
google.golang.org/grpc v1.77.0
122-
google.golang.org/protobuf v1.36.10
124+
google.golang.org/protobuf v1.36.11
123125
gopkg.in/yaml.v2 v2.4.0
124126
gopkg.in/yaml.v3 v3.0.1
125127
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
@@ -364,7 +366,8 @@ require (
364366
github.com/pkg/errors v0.9.1 // indirect
365367
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
366368
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
367-
github.com/prometheus/procfs v0.16.1 // indirect
369+
github.com/prometheus/otlptranslator v1.0.0 // indirect
370+
github.com/prometheus/procfs v0.19.2 // indirect
368371
github.com/prometheus/statsd_exporter v0.22.7 // indirect
369372
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
370373
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
@@ -433,7 +436,6 @@ require (
433436
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
434437
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
435438
go.opentelemetry.io/otel/metric v1.40.0 // indirect
436-
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
437439
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
438440
go.uber.org/automaxprocs v1.6.0 // indirect
439441
go.uber.org/multierr v1.11.0 // indirect
@@ -443,7 +445,7 @@ require (
443445
golang.org/x/crypto v0.46.0 // indirect
444446
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
445447
golang.org/x/net v0.48.0 // indirect
446-
golang.org/x/oauth2 v0.33.0 // indirect
448+
golang.org/x/oauth2 v0.34.0 // indirect
447449
golang.org/x/sys v0.40.0 // indirect
448450
golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc // indirect
449451
golang.org/x/term v0.38.0 // indirect

0 commit comments

Comments
 (0)