Merge pull request #23569 from sammyKhan/master

Return blank span if no call is active.
pull/23886/head
donnadionne 5 years ago committed by GitHub
commit 6b80f4d7f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/cpp/ext/filters/census/grpc_plugin.cc
  2. 2
      src/cpp/server/server_context.cc

@ -57,6 +57,8 @@ void RegisterOpenCensusPlugin() {
::opencensus::trace::Span GetSpanFromServerContext(
grpc::ServerContext* context) {
if (context == nullptr) return opencensus::trace::Span::BlankSpan();
return reinterpret_cast<const grpc::CensusContext*>(context->census_context())
->Span();
}

@ -367,7 +367,7 @@ std::string ServerContextBase::peer() const {
}
const struct census_context* ServerContextBase::census_context() const {
return grpc_census_call_get_context(call_);
return call_ == nullptr ? nullptr : grpc_census_call_get_context(call_);
}
void ServerContextBase::SetLoadReportingCosts(

Loading…
Cancel
Save