Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make opencensus Stackdriver exporter respects initial_metadata option #11831

Merged
merged 8 commits into from
Jul 17, 2020
Merged

Make opencensus Stackdriver exporter respects initial_metadata option #11831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1a42e58
add initial metadata interceptor into google gRPC channel creation
bianpengyuan Jun 30, 2020
a8e6f31
tidy
bianpengyuan Jul 1, 2020
3ecfc93
use prepare_client_context
bianpengyuan Jul 12, 2020
a901b50
improve coverage
bianpengyuan Jul 12, 2020
4740bb2
nit
bianpengyuan Jul 13, 2020
abb1557
add todo
bianpengyuan Jul 16, 2020
a15839c
Merge remote-tracking branch 'upstream-envoy/master' into oc-grpc
bianpengyuan Jul 16, 2020
61d1e68
lower coverage limit for opencensus tracer
bianpengyuan Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,10 @@ DEPENDENCY_REPOSITORIES = dict(
use_category = ["other"],
),
io_opencensus_cpp = dict(
sha256 = "193ffb4e13bd7886757fd22b61b7f7a400634412ad8e7e1071e73f57bedd7fc6",
strip_prefix = "opencensus-cpp-04ed0211931f12b03c1a76b3907248ca4db7bc90",
# 2020-03-24
urls = ["https://github.com/census-instrumentation/opencensus-cpp/archive/04ed0211931f12b03c1a76b3907248ca4db7bc90.tar.gz"],
sha256 = "12ff300fa804f97bd07e2ff071d969e09d5f3d7bbffeac438c725fa52a51a212",
strip_prefix = "opencensus-cpp-7877337633466358ed680f9b26967da5b310d7aa",
# 2020-06-01
urls = ["https://github.com/census-instrumentation/opencensus-cpp/archive/7877337633466358ed680f9b26967da5b310d7aa.tar.gz"],
use_category = ["observability"],
cpe = "N/A",
),
Expand Down
10 changes: 10 additions & 0 deletions source/extensions/tracers/opencensus/opencensus_tracer_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,17 @@ Driver::Driver(const envoy::config::trace::v3::OpenCensusConfig& oc_config,
stackdriver_service.mutable_google_grpc()->set_target_uri(GoogleStackdriverTraceAddress);
}
auto channel = Envoy::Grpc::GoogleGrpcUtils::createChannel(stackdriver_service, api);
// TODO(bianpengyuan): add tests for trace_service_stub and initial_metadata options with mock
// stubs.
opts.trace_service_stub = ::google::devtools::cloudtrace::v2::TraceService::NewStub(channel);
const auto& initial_metadata = stackdriver_service.initial_metadata();
if (!initial_metadata.empty()) {
opts.prepare_client_context = [initial_metadata](grpc::ClientContext* ctx) {
for (const auto& metadata : initial_metadata) {
ctx->AddMetadata(metadata.key(), metadata.value());
}
};
}
#else
throw EnvoyException("Opencensus tracer: cannot handle stackdriver google grpc service, "
"google grpc is not built in.");
Expand Down
3 changes: 3 additions & 0 deletions test/extensions/tracers/opencensus/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ TEST(OpenCensusTracerConfigTest, OpenCensusHttpTracerStackdriverGrpc) {
google_grpc:
target_uri: 127.0.0.1:55678
stat_prefix: test
initial_metadata:
- key: foo
value: bar
bianpengyuan marked this conversation as resolved.
Show resolved Hide resolved
)EOF";

envoy::config::trace::v3::Tracing configuration;
Expand Down
4 changes: 2 additions & 2 deletions test/per_file_coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ declare -a KNOWN_LOW_COVERAGE=(
"source/extensions/retry/host:85.7"
"source/extensions/retry/host/omit_canary_hosts:92.9"
"source/extensions/stat_sinks/statsd:85.2"
"source/extensions/tracers:96.5"
"source/extensions/tracers/opencensus:92.4"
"source/extensions/tracers:96.3"
"source/extensions/tracers/opencensus:91.2"
"source/extensions/tracers/xray:95.3"
"source/extensions/transport_sockets:94.9"
"source/extensions/transport_sockets/tap:95.6"
Expand Down