Skip to content

Commit 0ef7d11

Browse files
loosebazookaloosebazooka
committed
Change grpc_prometheus dependency source
Old source has been deprecated and we're expected to pull the dependency from go-grpc-middleware now Signed-off-by: Appu Goundan <[email protected]>
1 parent ecf697d commit 0ef7d11

File tree

4 files changed

+33
-27
lines changed

4 files changed

+33
-27
lines changed

‎cmd/app/grpc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
ctclient "github.com/google/certificate-transparency-go/client"
3434
grpcmw "github.com/grpc-ecosystem/go-grpc-middleware"
3535
grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
36+
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
3637
grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
37-
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
3838
"github.com/prometheus/client_golang/prometheus"
3939
"github.com/sigstore/fulcio/pkg/ca"
4040
"github.com/sigstore/fulcio/pkg/config"

‎cmd/app/serve.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import (
4242
"github.com/google/certificate-transparency-go/jsonclient"
4343
grpcmw "github.com/grpc-ecosystem/go-grpc-middleware"
4444
grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
45+
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
4546
grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
46-
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
4747
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
4848
"github.com/prometheus/client_golang/prometheus"
4949
"github.com/prometheus/client_golang/prometheus/promhttp"

‎go.mod‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ require (
1818
github.com/google/certificate-transparency-go v1.3.1
1919
github.com/google/go-cmp v0.7.0
2020
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
21-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99
22-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0
21+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
22+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
2323
github.com/hashicorp/golang-lru v1.0.2
2424
github.com/magiconair/properties v1.8.9
2525
github.com/prometheus/client_golang v1.20.5
@@ -43,21 +43,21 @@ require (
4343
go.step.sm/crypto v0.57.0
4444
go.uber.org/zap v1.27.0
4545
google.golang.org/api v0.218.0
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f
46+
google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489
4747
google.golang.org/grpc v1.70.0
4848
google.golang.org/protobuf v1.36.5
4949
gopkg.in/yaml.v3 v3.0.1
5050
sigs.k8s.io/release-utils v0.9.0
5151
)
5252

5353
require (
54-
cloud.google.com/go v0.116.0 // indirect
54+
cloud.google.com/go v0.118.0 // indirect
5555
cloud.google.com/go/auth v0.14.0 // indirect
5656
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
5757
cloud.google.com/go/compute/metadata v0.6.0 // indirect
58-
cloud.google.com/go/iam v1.2.2 // indirect
59-
cloud.google.com/go/kms v1.20.4 // indirect
60-
cloud.google.com/go/longrunning v0.6.2 // indirect
58+
cloud.google.com/go/iam v1.3.1 // indirect
59+
cloud.google.com/go/kms v1.20.5 // indirect
60+
cloud.google.com/go/longrunning v0.6.4 // indirect
6161
dario.cat/mergo v1.0.1 // indirect
6262
filippo.io/edwards25519 v1.1.0 // indirect
6363
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
@@ -102,6 +102,8 @@ require (
102102
github.com/google/uuid v1.6.0 // indirect
103103
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
104104
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
105+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
106+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect
105107
github.com/hashicorp/errwrap v1.1.0 // indirect
106108
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
107109
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -165,8 +167,8 @@ require (
165167
golang.org/x/term v0.29.0 // indirect
166168
golang.org/x/text v0.22.0 // indirect
167169
golang.org/x/time v0.9.0 // indirect
168-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
169-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
170+
google.golang.org/genproto v0.0.0-20250124145028-65684f501c47 // indirect
171+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
170172
gopkg.in/ini.v1 v1.67.0 // indirect
171173
k8s.io/klog/v2 v2.130.1 // indirect
172174
)

‎go.sum‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ chainguard.dev/go-grpc-kit v0.17.7/go.mod h1:JroMzTY9mdhKe/bvtyChgfECaNh80+bMZH3
33
chainguard.dev/sdk v0.1.29 h1:GNcCw5NoyvylhlUbVD8JMmrPaeYyrshaHHjEWnvcCGI=
44
chainguard.dev/sdk v0.1.29/go.mod h1:DqywTjZ5glB/gUCKkrecO0LywyfcAd5v7IPo2+d91qA=
55
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
6-
cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
7-
cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
6+
cloud.google.com/go v0.118.0 h1:tvZe1mgqRxpiVa3XlIGMiPcEUbP1gNXELgD4y/IXmeQ=
7+
cloud.google.com/go v0.118.0/go.mod h1:zIt2pkedt/mo+DQjcT4/L3NDxzHPR29j5HcclNH+9PM=
88
cloud.google.com/go/auth v0.14.0 h1:A5C4dKV/Spdvxcl0ggWwWEzzP7AZMJSEIgrkngwhGYM=
99
cloud.google.com/go/auth v0.14.0/go.mod h1:CYsoRL1PdiDuqeQpZE0bP2pnPrGqFcOkI0nldEQis+A=
1010
cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74z6cBk9Rw6M=
1111
cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc=
1212
cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
1313
cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
14-
cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA=
15-
cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY=
16-
cloud.google.com/go/kms v1.20.4 h1:CJ0hMpOg1ANN9tx/a/GPJ+Uxudy8k6f3fvGFuTHiE5A=
17-
cloud.google.com/go/kms v1.20.4/go.mod h1:gPLsp1r4FblUgBYPOcvI/bUPpdMg2Jm1ZVKU4tQUfcc=
18-
cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc=
19-
cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI=
14+
cloud.google.com/go/iam v1.3.1 h1:KFf8SaT71yYq+sQtRISn90Gyhyf4X8RGgeAVC8XGf3E=
15+
cloud.google.com/go/iam v1.3.1/go.mod h1:3wMtuyT4NcbnYNPLMBzYRFiEfjKfJlLVLrisE7bwm34=
16+
cloud.google.com/go/kms v1.20.5 h1:aQQ8esAIVZ1atdJRxihhdxGQ64/zEbJoJnCz/ydSmKg=
17+
cloud.google.com/go/kms v1.20.5/go.mod h1:C5A8M1sv2YWYy1AE6iSrnddSG9lRGdJq5XEdBy28Lmw=
18+
cloud.google.com/go/longrunning v0.6.4 h1:3tyw9rO3E2XVXzSApn1gyEEnH2K9SynNQjMlBi3uHLg=
19+
cloud.google.com/go/longrunning v0.6.4/go.mod h1:ttZpLCe6e7EXvn9OxpBRx7kZEB0efv8yBO6YnVMfhJs=
2020
cloud.google.com/go/security v1.18.3 h1:ya9gfY1ign6Yy25VMMMgZ9xy7D/TczDB0ElXcyWmEVE=
2121
cloud.google.com/go/security v1.18.3/go.mod h1:NmlSnEe7vzenMRoTLehUwa/ZTZHDQE59IPRevHcpCe4=
2222
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
@@ -173,10 +173,14 @@ github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrk
173173
github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
174174
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
175175
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
176+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA=
177+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU=
178+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=
179+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=
176180
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 h1:JYghRBlGCZyCF2wNUJ8W0cwaQdtpcssJ4CgC406g+WU=
177181
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc=
178-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 h1:VD1gqscl4nYs1YxVuSdemTrSgTKrwOWDK0FVFMqm+Cg=
179-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0/go.mod h1:4EgsQoS4TOhJizV+JTFg40qx1Ofh3XmXEQNBpgvNT40=
182+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA=
183+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=
180184
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
181185
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
182186
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -518,12 +522,12 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
518522
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
519523
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
520524
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
521-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk=
522-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc=
523-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA=
524-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o=
525-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
526-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
525+
google.golang.org/genproto v0.0.0-20250124145028-65684f501c47 h1:SI8Hf7K4+uVYchXqZiMfP44PZ83xomMWovbcFfm0P8Q=
526+
google.golang.org/genproto v0.0.0-20250124145028-65684f501c47/go.mod h1:qbZzneIOXSq+KFAFut9krLfRLZiFLzZL5u2t8SV83EE=
527+
google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 h1:fCuMM4fowGzigT89NCIsW57Pk9k2D12MMi2ODn+Nk+o=
528+
google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
529+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 h1:5bKytslY8ViY0Cj/ewmRtrWHW64bNF03cAatUUFCdFI=
530+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
527531
google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
528532
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
529533
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=

0 commit comments

Comments
 (0)