From cf39e94872a6c8118494072d4aad52618cf44395 Mon Sep 17 00:00:00 2001
From: Alistair Veitch <aveitch@google.com>
Date: Sun, 26 Jul 2015 17:28:26 -0700
Subject: [PATCH 1/2] Server side census context plumbing for c++

---
 include/grpc++/server_context.h  | 3 +++
 src/cpp/server/server_context.cc | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index 3bfa48fbb65..542985b2f08 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -46,6 +46,7 @@
 struct gpr_timespec;
 struct grpc_metadata;
 struct grpc_call;
+struct census_context;
 
 namespace grpc {
 
@@ -116,6 +117,8 @@ class ServerContext {
 
   std::shared_ptr<const AuthContext> auth_context() const;
 
+  const census_context* get_census_context() const;
+
  private:
   friend class ::grpc::testing::InteropContextInspector;
   friend class ::grpc::Server;
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index bf7a4ba5ec1..fe3d240c348 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -39,6 +39,7 @@
 #include <grpc++/impl/sync.h>
 #include <grpc++/time.h>
 
+#include "src/core/census/grpc_context.h"
 #include "src/core/channel/compress_filter.h"
 #include "src/cpp/common/create_auth_context.h"
 
@@ -179,4 +180,8 @@ std::shared_ptr<const AuthContext> ServerContext::auth_context() const {
   return auth_context_;
 }
 
+const census_context* ServerContext::get_census_context() const {
+  return grpc_census_call_get_context(call_);
+}
+
 }  // namespace grpc

From 100a6e1d82e8fa1dd8172fe4c6e59a489785325f Mon Sep 17 00:00:00 2001
From: Alistair Veitch <aveitch@google.com>
Date: Wed, 29 Jul 2015 15:25:28 -0700
Subject: [PATCH 2/2] add struct include/grpc++/server_context.h
 src/cpp/server/server_context.cc

---
 include/grpc++/server_context.h  | 2 +-
 src/cpp/server/server_context.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index 542985b2f08..5597798e3ea 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -117,7 +117,7 @@ class ServerContext {
 
   std::shared_ptr<const AuthContext> auth_context() const;
 
-  const census_context* get_census_context() const;
+  const struct census_context* census_context() const;
 
  private:
   friend class ::grpc::testing::InteropContextInspector;
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index fe3d240c348..f54ed8aa29d 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -180,7 +180,7 @@ std::shared_ptr<const AuthContext> ServerContext::auth_context() const {
   return auth_context_;
 }
 
-const census_context* ServerContext::get_census_context() const {
+const struct census_context* ServerContext::census_context() const {
   return grpc_census_call_get_context(call_);
 }