From 6fbff9c6a9a348063685d00db04785a9b1cd5adb Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 27 Sep 2022 21:53:35 -0700
Subject: [PATCH] Revert "GcpObservability: Change default views provided
 (#31144)" (#31149)

This reverts commit dedcc7dbf695b0c5f964949a24e28aa77288c3c5.
---
 src/cpp/ext/gcp/BUILD            |  1 -
 src/cpp/ext/gcp/observability.cc | 14 +-------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/cpp/ext/gcp/BUILD b/src/cpp/ext/gcp/BUILD
index d05a9a32574..ab54e0a7ac0 100644
--- a/src/cpp/ext/gcp/BUILD
+++ b/src/cpp/ext/gcp/BUILD
@@ -41,7 +41,6 @@ grpc_cc_library(
         "absl/status",
         "absl/status:statusor",
         "absl/types:optional",
-        "opencensus-stats",
         "opencensus-trace",
         "opencensus-trace-stackdriver_exporter",
         "opencensus-stats-stackdriver_exporter",
diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc
index c71a5d9570c..9cb1e46388d 100644
--- a/src/cpp/ext/gcp/observability.cc
+++ b/src/cpp/ext/gcp/observability.cc
@@ -27,14 +27,12 @@
 #include "absl/types/optional.h"
 #include "opencensus/exporters/stats/stackdriver/stackdriver_exporter.h"
 #include "opencensus/exporters/trace/stackdriver/stackdriver_exporter.h"
-#include "opencensus/stats/stats.h"
 #include "opencensus/trace/sampler.h"
 #include "opencensus/trace/trace_config.h"
 
 #include <grpcpp/opencensus.h>
 #include <grpcpp/support/config.h>
 
-#include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/gcp/observability_config.h"
 
 namespace grpc {
@@ -48,16 +46,6 @@ constexpr uint32_t kMaxAttributes = 128;
 constexpr uint32_t kMaxAnnotations = 128;
 constexpr uint32_t kMaxMessageEvents = 128;
 constexpr uint32_t kMaxLinks = 128;
-
-void RegisterOpenCensusViewsForGcpObservability() {
-  // Register client default views for GCP observability
-  ClientStartedRpcsCumulative().RegisterForExport();
-  ClientCompletedRpcsCumulative().RegisterForExport();
-  // Register server default views for GCP observability
-  ServerStartedRpcsCumulative().RegisterForExport();
-  ServerCompletedRpcsCumulative().RegisterForExport();
-}
-
 }  // namespace
 
 absl::Status GcpObservabilityInit() {
@@ -66,7 +54,7 @@ absl::Status GcpObservabilityInit() {
     return config.status();
   }
   grpc::RegisterOpenCensusPlugin();
-  RegisterOpenCensusViewsForGcpObservability();
+  grpc::RegisterOpenCensusViewsForExport();
   if (config->cloud_trace.has_value()) {
     opencensus::trace::TraceConfig::SetCurrentTraceParams(
         {kMaxAttributes, kMaxAnnotations, kMaxMessageEvents, kMaxLinks,