Disambiguate Census and OpenCensus (#32103)

src/cpp/ext/filters/census/channel_filter.cc

@@ -27,8 +27,8 @@
 namespace grpc {
 namespace internal {
 
-grpc_error_handle CensusChannelData::Init(grpc_channel_element* /*elem*/,
-                                          grpc_channel_element_args* /*args*/) {
+grpc_error_handle OpenCensusChannelData::Init(
+    grpc_channel_element* /*elem*/, grpc_channel_element_args* /*args*/) {
   OpenCensusExporterRegistry::Get().RunRegistryPostInit();
   return absl::OkStatus();
 }

src/cpp/ext/filters/census/channel_filter.h

@@ -29,7 +29,7 @@
 namespace grpc {
 namespace internal {
 
-class CensusChannelData : public ChannelData {
+class OpenCensusChannelData : public ChannelData {
  public:
   grpc_error_handle Init(grpc_channel_element* elem,
                          grpc_channel_element_args* args) override;

src/cpp/ext/filters/census/client_filter.cc

@@ -67,10 +67,10 @@ constexpr uint32_t
     OpenCensusCallTracer::OpenCensusCallAttemptTracer::kMaxTagsLen;
 
 //
-// CensusClientChannelData
+// OpenCensusClientChannelData
 //
 
-grpc_error_handle CensusClientChannelData::Init(
+grpc_error_handle OpenCensusClientChannelData::Init(
     grpc_channel_element* /*elem*/, grpc_channel_element_args* args) {
   OpenCensusExporterRegistry::Get().RunRegistryPostInit();
   tracing_enabled_ = grpc_core::ChannelArgs::FromC(args->channel_args)
@@ -80,13 +80,13 @@ grpc_error_handle CensusClientChannelData::Init(
 }
 
 //
-// CensusClientChannelData::CensusClientCallData
+// OpenCensusClientChannelData::OpenCensusClientCallData
 //
 
-grpc_error_handle CensusClientChannelData::CensusClientCallData::Init(
+grpc_error_handle OpenCensusClientChannelData::OpenCensusClientCallData::Init(
     grpc_call_element* elem, const grpc_call_element_args* args) {
   tracer_ = args->arena->New<OpenCensusCallTracer>(
-      args, (static_cast<CensusClientChannelData*>(elem->channel_data))
+      args, (static_cast<OpenCensusClientChannelData*>(elem->channel_data))
                 ->tracing_enabled_);
   GPR_DEBUG_ASSERT(args->context[GRPC_CONTEXT_CALL_TRACER].value == nullptr);
   args->context[GRPC_CONTEXT_CALL_TRACER].value = tracer_;
@@ -96,15 +96,16 @@ grpc_error_handle CensusClientChannelData::CensusClientCallData::Init(
   return absl::OkStatus();
 }
 
-void CensusClientChannelData::CensusClientCallData::StartTransportStreamOpBatch(
-    grpc_call_element* elem, TransportStreamOpBatch* op) {
+void OpenCensusClientChannelData::OpenCensusClientCallData::
+    StartTransportStreamOpBatch(grpc_call_element* elem,
+                                TransportStreamOpBatch* op) {
   // Note that we are generating the overall call context here instead of in
   // the constructor of `OpenCensusCallTracer` due to the semantics of
   // `grpc_census_call_set_context` which allows the application to set the
   // census context for a call anytime before the first call to
   // `grpc_call_start_batch`.
   if (op->op()->send_initial_metadata && OpenCensusTracingEnabled() &&
-      (static_cast<CensusClientChannelData*>(elem->channel_data))
+      (static_cast<OpenCensusClientChannelData*>(elem->channel_data))
           ->tracing_enabled_) {
     tracer_->GenerateContext();
   }

src/cpp/ext/filters/census/client_filter.h

@@ -30,13 +30,13 @@
 namespace grpc {
 namespace internal {
 
-class CensusClientChannelData : public ChannelData {
+class OpenCensusClientChannelData : public ChannelData {
  public:
   // A CallData class will be created for every grpc call within a channel. It
   // is used to store data and methods specific to that call.
-  // CensusClientCallData is thread-compatible, however typically only 1 thread
-  // should be interacting with a call at a time.
-  class CensusClientCallData : public CallData {
+  // OpenCensusClientCallData is thread-compatible, however typically only 1
+  // thread should be interacting with a call at a time.
+  class OpenCensusClientCallData : public CallData {
    public:
     grpc_error_handle Init(grpc_call_element* /* elem */,
                            const grpc_call_element_args* args) override;

src/cpp/ext/filters/census/grpc_plugin.cc

@@ -43,12 +43,12 @@ namespace grpc {
 
 void RegisterOpenCensusPlugin() {
   RegisterChannelFilter<
-      internal::CensusClientChannelData,
-      internal::CensusClientChannelData::CensusClientCallData>(
+      internal::OpenCensusClientChannelData,
+      internal::OpenCensusClientChannelData::OpenCensusClientCallData>(
       "opencensus_client", GRPC_CLIENT_CHANNEL, INT_MAX /* priority */,
       nullptr /* condition function */);
-  RegisterChannelFilter<internal::CensusChannelData,
-                        internal::CensusServerCallData>(
+  RegisterChannelFilter<internal::OpenCensusChannelData,
+                        internal::OpenCensusServerCallData>(
       "opencensus_server", GRPC_SERVER_CHANNEL, INT_MAX /* priority */,
       nullptr /* condition function */);
 

src/cpp/ext/filters/census/server_filter.cc

@@ -46,7 +46,7 @@
 namespace grpc {
 namespace internal {
 
-constexpr uint32_t CensusServerCallData::kMaxServerStatsLen;
+constexpr uint32_t OpenCensusServerCallData::kMaxServerStatsLen;
 
 namespace {
 
@@ -79,13 +79,13 @@ void FilterInitialMetadata(grpc_metadata_batch* b,
 
 }  // namespace
 
-void CensusServerCallData::OnDoneRecvMessageCb(void* user_data,
-                                               grpc_error_handle error) {
+void OpenCensusServerCallData::OnDoneRecvMessageCb(void* user_data,
+                                                   grpc_error_handle error) {
   grpc_call_element* elem = reinterpret_cast<grpc_call_element*>(user_data);
-  CensusServerCallData* calld =
-      reinterpret_cast<CensusServerCallData*>(elem->call_data);
-  CensusChannelData* channeld =
-      reinterpret_cast<CensusChannelData*>(elem->channel_data);
+  OpenCensusServerCallData* calld =
+      reinterpret_cast<OpenCensusServerCallData*>(elem->call_data);
+  OpenCensusChannelData* channeld =
+      reinterpret_cast<OpenCensusChannelData*>(elem->channel_data);
   GPR_ASSERT(calld != nullptr);
   GPR_ASSERT(channeld != nullptr);
   // Stream messages are no longer valid after receiving trailing metadata.
@@ -96,11 +96,11 @@ void CensusServerCallData::OnDoneRecvMessageCb(void* user_data,
                           error);
 }
 
-void CensusServerCallData::OnDoneRecvInitialMetadataCb(
+void OpenCensusServerCallData::OnDoneRecvInitialMetadataCb(
     void* user_data, grpc_error_handle error) {
   grpc_call_element* elem = reinterpret_cast<grpc_call_element*>(user_data);
-  CensusServerCallData* calld =
-      reinterpret_cast<CensusServerCallData*>(elem->call_data);
+  OpenCensusServerCallData* calld =
+      reinterpret_cast<OpenCensusServerCallData*>(elem->call_data);
   GPR_ASSERT(calld != nullptr);
   if (error.ok()) {
     grpc_metadata_batch* initial_metadata = calld->recv_initial_metadata_;
@@ -125,7 +125,7 @@ void CensusServerCallData::OnDoneRecvInitialMetadataCb(
                           calld->initial_on_done_recv_initial_metadata_, error);
 }
 
-void CensusServerCallData::StartTransportStreamOpBatch(
+void OpenCensusServerCallData::StartTransportStreamOpBatch(
     grpc_call_element* elem, TransportStreamOpBatch* op) {
   if (op->recv_initial_metadata() != nullptr) {
     // substitute our callback for the op callback
@@ -158,7 +158,7 @@ void CensusServerCallData::StartTransportStreamOpBatch(
   grpc_call_next_op(elem, op->op());
 }
 
-grpc_error_handle CensusServerCallData::Init(
+grpc_error_handle OpenCensusServerCallData::Init(
     grpc_call_element* elem, const grpc_call_element_args* args) {
   start_time_ = absl::Now();
   gc_ =
@@ -172,9 +172,9 @@ grpc_error_handle CensusServerCallData::Init(
   return absl::OkStatus();
 }
 
-void CensusServerCallData::Destroy(grpc_call_element* /*elem*/,
-                                   const grpc_call_final_info* final_info,
-                                   grpc_closure* /*then_call_closure*/) {
+void OpenCensusServerCallData::Destroy(grpc_call_element* /*elem*/,
+                                       const grpc_call_final_info* final_info,
+                                       grpc_closure* /*then_call_closure*/) {
   grpc_auth_context_release(auth_context_);
   if (OpenCensusStatsEnabled()) {
     const uint64_t request_size = GetOutgoingDataSize(final_info);

src/cpp/ext/filters/census/server_filter.h

@@ -47,15 +47,15 @@ namespace grpc {
 namespace internal {
 
 // A CallData class will be created for every grpc call within a channel. It is
-// used to store data and methods specific to that call. CensusServerCallData is
-// thread-compatible, however typically only 1 thread should be interacting with
-// a call at a time.
-class CensusServerCallData : public CallData {
+// used to store data and methods specific to that call.
+// OpenCensusServerCallData is thread-compatible, however typically only 1
+// thread should be interacting with a call at a time.
+class OpenCensusServerCallData : public CallData {
  public:
   // Maximum size of server stats that are sent on the wire.
   static constexpr uint32_t kMaxServerStatsLen = 16;
 
-  CensusServerCallData()
+  OpenCensusServerCallData()
       : gc_(nullptr),
         auth_context_(nullptr),
         recv_initial_metadata_(nullptr),