From d8f80bb0a326eca1c59051a422433b4f3ae5d85c Mon Sep 17 00:00:00 2001
From: Zach Reyes <39203661+zasweq@users.noreply.github.com>
Date: Thu, 2 Mar 2023 17:13:50 -0500
Subject: [PATCH] stats/opencensus: Added client api latency and upgrade go.mod
 (#6042)

---
 gcp/observability/go.mod                | 2 +-
 gcp/observability/go.sum                | 4 ++--
 gcp/observability/observability_test.go | 3 +++
 gcp/observability/opencensus.go         | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gcp/observability/go.mod b/gcp/observability/go.mod
index a52a353ec..e730895d3 100644
--- a/gcp/observability/go.mod
+++ b/gcp/observability/go.mod
@@ -11,7 +11,7 @@ require (
 	golang.org/x/oauth2 v0.4.0
 	google.golang.org/api v0.103.0
 	google.golang.org/grpc v1.52.0
-	google.golang.org/grpc/stats/opencensus v0.0.0-20230214213552-081499f2e8a4
+	google.golang.org/grpc/stats/opencensus v0.0.0-20230221205128-8702a2ebf4b0
 )
 
 require (
diff --git a/gcp/observability/go.sum b/gcp/observability/go.sum
index ea8a84e21..109fef979 100644
--- a/gcp/observability/go.sum
+++ b/gcp/observability/go.sum
@@ -1056,8 +1056,8 @@ google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614G
 google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w=
 google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/grpc/stats/opencensus v0.0.0-20230214213552-081499f2e8a4 h1:JfKOhIhejpMhny1RYnvFO5QxXdVOEFSE12OSTgQvFus=
-google.golang.org/grpc/stats/opencensus v0.0.0-20230214213552-081499f2e8a4/go.mod h1:l7+BYcyrDJFQo8nh4v8h5TJ6VfQ9QGBfFqVO7xoqQzI=
+google.golang.org/grpc/stats/opencensus v0.0.0-20230221205128-8702a2ebf4b0 h1:v7h+HONu0plE0b3y9fBiOWlsqTdQQ5A9l9Ag2LXbEoE=
+google.golang.org/grpc/stats/opencensus v0.0.0-20230221205128-8702a2ebf4b0/go.mod h1:l7+BYcyrDJFQo8nh4v8h5TJ6VfQ9QGBfFqVO7xoqQzI=
 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/gcp/observability/observability_test.go b/gcp/observability/observability_test.go
index 07e78be56..87e9668ee 100644
--- a/gcp/observability/observability_test.go
+++ b/gcp/observability/observability_test.go
@@ -375,6 +375,9 @@ func (s) TestOpenCensusIntegration(t *testing.T) {
 	for ctx.Err() == nil {
 		errs = nil
 		fe.mu.RLock()
+		if value := fe.SeenViews["grpc.io/client/api_latency"]; value != TypeOpenCensusViewDistribution {
+			errs = append(errs, fmt.Errorf("unexpected type for grpc.io/client/api_latency: %s != %s", value, TypeOpenCensusViewDistribution))
+		}
 		if value := fe.SeenViews["grpc.io/client/started_rpcs"]; value != TypeOpenCensusViewCount {
 			errs = append(errs, fmt.Errorf("unexpected type for grpc.io/client/started_rpcs: %s != %s", value, TypeOpenCensusViewCount))
 		}
diff --git a/gcp/observability/opencensus.go b/gcp/observability/opencensus.go
index d80d2d9aa..386b5ec55 100644
--- a/gcp/observability/opencensus.go
+++ b/gcp/observability/opencensus.go
@@ -106,7 +106,7 @@ func startOpenCensus(config *config) error {
 	}
 
 	if config.CloudMonitoring != nil {
-		if err := view.Register(opencensus.ClientStartedRPCsView, opencensus.ClientCompletedRPCsView, opencensus.ClientRoundtripLatencyView); err != nil {
+		if err := view.Register(opencensus.ClientAPILatencyView, opencensus.ClientStartedRPCsView, opencensus.ClientCompletedRPCsView, opencensus.ClientRoundtripLatencyView); err != nil {
 			return fmt.Errorf("failed to register default client views: %v", err)
 		}
 		if err := view.Register(opencensus.ServerStartedRPCsView, opencensus.ServerCompletedRPCsView, opencensus.ServerLatencyView); err != nil {