Skip to content
Snippets Groups Projects
Commit 459740a2 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge github.com:grpc/grpc into strong-includes

parents 03915e5d 041e39d7
No related branches found
No related tags found
No related merge requests found
...@@ -52,12 +52,12 @@ static bool is_census_enabled(const grpc_channel_args *a) { ...@@ -52,12 +52,12 @@ static bool is_census_enabled(const grpc_channel_args *a) {
} }
static bool maybe_add_census_filter(grpc_channel_stack_builder *builder, static bool maybe_add_census_filter(grpc_channel_stack_builder *builder,
void *arg_must_be_null) { void *arg) {
const grpc_channel_args *args = const grpc_channel_args *args =
grpc_channel_stack_builder_get_channel_arguments(builder); grpc_channel_stack_builder_get_channel_arguments(builder);
if (is_census_enabled(args)) { if (is_census_enabled(args)) {
return grpc_channel_stack_builder_prepend_filter( return grpc_channel_stack_builder_prepend_filter(
builder, &grpc_client_census_filter, NULL, NULL); builder, (const grpc_channel_filter *)arg, NULL, NULL);
} }
return true; return true;
} }
...@@ -72,9 +72,11 @@ void census_grpc_plugin_init(void) { ...@@ -72,9 +72,11 @@ void census_grpc_plugin_init(void) {
} }
} }
grpc_channel_init_register_stage(GRPC_CLIENT_CHANNEL, INT_MAX, grpc_channel_init_register_stage(GRPC_CLIENT_CHANNEL, INT_MAX,
maybe_add_census_filter, NULL); maybe_add_census_filter,
(void *)&grpc_client_census_filter);
grpc_channel_init_register_stage(GRPC_SERVER_CHANNEL, INT_MAX, grpc_channel_init_register_stage(GRPC_SERVER_CHANNEL, INT_MAX,
maybe_add_census_filter, NULL); maybe_add_census_filter,
(void *)&grpc_server_census_filter);
} }
void census_grpc_plugin_shutdown(void) { census_shutdown(); } void census_grpc_plugin_shutdown(void) { census_shutdown(); }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment