diff options
| author |  yang-g <yangg@google.com> | 2015-07-07 23:33:40 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-07 23:33:40 -0700 |
| commit | ab575d46f73f4e11a243fb6b5dfa0ef748447727 (patch) | |
| tree | 822514f345fa29bdbe7d26965871e7c62578cc12 /src/cpp/client | |
| parent | 6406f1826739048ceac9e43afe0761ebf8b12ed7 (diff) | |
| parent | 3b685b744818ec73580aff961f85c22b11e61ab0 (diff) | |
merge head and resolve conflict
Diffstat (limited to 'src/cpp/client')
| -rw-r--r-- | src/cpp/client/channel.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 72593f877e..5bc6f6fd91 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -39,6 +39,7 @@ #include <grpc/support/log.h> #include <grpc/support/slice.h> +#include "src/core/census/grpc_context.h" #include "src/core/profiling/timers.h" #include <grpc++/channel_arguments.h> #include <grpc++/client_context.h> @@ -68,6 +69,7 @@ Call Channel::CreateCall(const RpcMethod& method, ClientContext* context, ? target_.c_str() : context->authority().c_str(), context->raw_deadline()); + grpc_census_call_set_context(c_call, context->get_census_context()); GRPC_TIMER_MARK(GRPC_PTAG_CPP_CALL_CREATED, c_call); context->set_call(c_call, shared_from_this()); return Call(c_call, this, cq); |