diff options
| author |  yang-g <yangg@google.com> | 2015-07-30 11:35:18 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-30 11:35:18 -0700 |
| commit | dcf6c90b33e306705f43eb13a773e451b12aa260 (patch) | |
| tree | 77c9342d9abb19f5e4891b6a3fc308348a767cd4 /src/cpp | |
| parent | d7ead699f8503dbb2ec8ba470bb6c47cee2ddbee (diff) | |
| parent | 2a21434cc5c50baec31e94e8fc613cfad331c690 (diff) | |
merge with head
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/create_channel.cc | 4 | ||||
| -rw-r--r-- | src/cpp/server/server_context.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc index 62f179d361..dbe2694a78 100644 --- a/src/cpp/client/create_channel.cc +++ b/src/cpp/client/create_channel.cc @@ -51,7 +51,7 @@ std::shared_ptr<ChannelInterface> CreateChannel( cp_args.SetString(GRPC_ARG_PRIMARY_USER_AGENT_STRING, user_agent_prefix.str()); return creds ? creds->CreateChannel(target, cp_args) - : std::shared_ptr<ChannelInterface>( - new Channel(target, grpc_lame_client_channel_create(NULL))); + : std::shared_ptr<ChannelInterface>(new Channel( + target, grpc_lame_client_channel_create(NULL))); } } // namespace grpc diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 16a09a12a1..3e674e2f32 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -40,6 +40,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" @@ -190,4 +191,8 @@ grpc::string ServerContext::peer() const { return peer; } +const struct census_context* ServerContext::census_context() const { + return grpc_census_call_get_context(call_); +} + } // namespace grpc |