diff options
author | 2016-01-28 11:38:21 -0800 | |
---|---|---|
committer | 2016-01-28 11:38:21 -0800 | |
commit | 8c50db09b9fc937a16ace5b0783980b4a8ffc0ec (patch) | |
tree | 8fddf70188f7617afa2c54c5d187f8f56aa22ff5 /src/core/channel | |
parent | fdb603f5985b3ae604e1799b5bdbf52cda6bfd0a (diff) | |
parent | ddd91dbb42f6f52655738c6520548d04ea5f8468 (diff) |
Merge github.com:grpc/grpc into sceq
Diffstat (limited to 'src/core/channel')
-rw-r--r-- | src/core/channel/channel_args.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/channel/channel_args.c b/src/core/channel/channel_args.c index 63e440f97b..055b020652 100644 --- a/src/core/channel/channel_args.c +++ b/src/core/channel/channel_args.c @@ -35,6 +35,7 @@ #include "src/core/channel/channel_args.h" #include "src/core/support/string.h" +#include <grpc/census.h> #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> #include <grpc/support/useful.h> @@ -168,10 +169,10 @@ int grpc_channel_args_is_census_enabled(const grpc_channel_args *a) { if (a == NULL) return 0; for (i = 0; i < a->num_args; i++) { if (0 == strcmp(a->args[i].key, GRPC_ARG_ENABLE_CENSUS)) { - return a->args[i].value.integer != 0; + return a->args[i].value.integer != 0 && census_enabled(); } } - return 0; + return census_enabled(); } grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( |