gcp/observability: Have o11y module point to grpc 1.54 and opencensus 1.0.0 (#6209)

zasweq · web-flow · commit b91b8842e943 · 2023-04-17T20:20:22.000-04:00
diff --git a/gcp/observability/go.mod b/gcp/observability/go.mod
@@ -10,8 +10,8 @@ require (
 	go.opencensus.io v0.24.0
 	golang.org/x/oauth2 v0.6.0
 	google.golang.org/api v0.110.0
-	google.golang.org/grpc v1.53.0
-	google.golang.org/grpc/stats/opencensus v0.0.0-20230330193705-4a12595692ae
+	google.golang.org/grpc v1.54.0
+	google.golang.org/grpc/stats/opencensus v1.0.0
 )
 
 require (
@@ -39,5 +39,3 @@ require (
 )
 
 replace google.golang.org/grpc => ../..
-
-replace google.golang.org/grpc/stats/opencensus => ../../stats/opencensus
diff --git a/gcp/observability/go.sum b/gcp/observability/go.sum
@@ -1305,6 +1305,8 @@ google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q
 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
+google.golang.org/grpc/stats/opencensus v1.0.0 h1:evSYcRZaSToQp+borzWE52+03joezZeXcKJvZDfkUJA=
+google.golang.org/grpc/stats/opencensus v1.0.0/go.mod h1:FhdkeYvN43wLYUnapVuRJJ9JXkNwe403iLUW2LKSnjs=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/interop/observability/go.mod b/interop/observability/go.mod
@@ -3,7 +3,7 @@ module google.golang.org/grpc/interop/observability
 go 1.17
 
 require (
-	google.golang.org/grpc v1.53.0
+	google.golang.org/grpc v1.54.0
 	google.golang.org/grpc/gcp/observability v0.0.0-20230214181353-f4feddb37523
 )
 
@@ -35,7 +35,7 @@ require (
 	google.golang.org/api v0.110.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
-	google.golang.org/grpc/stats/opencensus v0.0.0-20230330193705-4a12595692ae // indirect
+	google.golang.org/grpc/stats/opencensus v1.0.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 )
 

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ require (`
`10`	`10`	`go.opencensus.io v0.24.0`
`11`	`11`	`golang.org/x/oauth2 v0.6.0`
`12`	`12`	`google.golang.org/api v0.110.0`
`13`		`- google.golang.org/grpc v1.53.0`
`14`		`- google.golang.org/grpc/stats/opencensus v0.0.0-20230330193705-4a12595692ae`
	`13`	`+ google.golang.org/grpc v1.54.0`
	`14`	`+ google.golang.org/grpc/stats/opencensus v1.0.0`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`require (`
`@@ -39,5 +39,3 @@ require (`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`replace google.golang.org/grpc => ../..`
`42`		`-`
`43`		`-replace google.golang.org/grpc/stats/opencensus => ../../stats/opencensus`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module google.golang.org/grpc/interop/observability`
`3`	`3`	`go 1.17`
`4`	`4`
`5`	`5`	`require (`
`6`		`- google.golang.org/grpc v1.53.0`
	`6`	`+ google.golang.org/grpc v1.54.0`
`7`	`7`	`google.golang.org/grpc/gcp/observability v0.0.0-20230214181353-f4feddb37523`
`8`	`8`	`)`
`9`	`9`
`@@ -35,7 +35,7 @@ require (`
`35`	`35`	`google.golang.org/api v0.110.0 // indirect`
`36`	`36`	`google.golang.org/appengine v1.6.7 // indirect`
`37`	`37`	`google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect`
`38`		`- google.golang.org/grpc/stats/opencensus v0.0.0-20230330193705-4a12595692ae // indirect`
	`38`	`+ google.golang.org/grpc/stats/opencensus v1.0.0 // indirect`
`39`	`39`	`google.golang.org/protobuf v1.30.0 // indirect`
`40`	`40`	`)`
`41`	`41`