Build Census as a grpc plugin

narzolliam · Mar 29, 2016 · 8f8e9f9 · 8f8e9f9
1 parent 3113ef4
commit 8f8e9f9
Show file tree

Hide file tree

Showing 54 changed files with 440 additions and 483 deletions.
diff --git a/BUILD b/BUILD
@@ -157,6 +157,13 @@ cc_library(
 cc_library(
  name = "grpc",
  srcs = [
+ "src/core/ext/census/aggregation.h",
+ "src/core/ext/census/census_interface.h",
+ "src/core/ext/census/census_rpc_stats.h",
+ "src/core/ext/census/grpc_filter.h",
+ "src/core/ext/census/grpc_plugin.h",
+ "src/core/ext/census/mlog.h",
+ "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
@@ -180,11 +187,6 @@ cc_library(
  "src/core/ext/transport/chttp2/transport/stream_map.h",
  "src/core/ext/transport/chttp2/transport/timeout_encoding.h",
  "src/core/ext/transport/chttp2/transport/varint.h",
- "src/core/lib/census/aggregation.h",
- "src/core/lib/census/grpc_filter.h",
- "src/core/lib/census/grpc_plugin.h",
- "src/core/lib/census/mlog.h",
- "src/core/lib/census/rpc_metric_id.h",
  "src/core/lib/channel/channel_args.h",
  "src/core/lib/channel/channel_stack.h",
  "src/core/lib/channel/channel_stack_builder.h",
@@ -266,8 +268,6 @@ cc_library(
  "src/core/lib/security/secure_endpoint.h",
  "src/core/lib/security/security_connector.h",
  "src/core/lib/security/security_context.h",
- "src/core/lib/statistics/census_interface.h",
- "src/core/lib/statistics/census_rpc_stats.h",
  "src/core/lib/surface/api_trace.h",
  "src/core/lib/surface/call.h",
  "src/core/lib/surface/call_test_only.h",
@@ -296,6 +296,15 @@ cc_library(
  "third_party/nanopb/pb_common.h",
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
+ "src/core/ext/census/context.c",
+ "src/core/ext/census/grpc_context.c",
+ "src/core/ext/census/grpc_filter.c",
+ "src/core/ext/census/grpc_plugin.c",
+ "src/core/ext/census/initialize.c",
+ "src/core/ext/census/mlog.c",
+ "src/core/ext/census/operation.c",
+ "src/core/ext/census/placeholders.c",
+ "src/core/ext/census/tracing.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
@@ -325,15 +334,6 @@ cc_library(
  "src/core/ext/transport/chttp2/transport/timeout_encoding.c",
  "src/core/ext/transport/chttp2/transport/varint.c",
  "src/core/ext/transport/chttp2/transport/writing.c",
- "src/core/lib/census/context.c",
- "src/core/lib/census/grpc_context.c",
- "src/core/lib/census/grpc_filter.c",
- "src/core/lib/census/grpc_plugin.c",
- "src/core/lib/census/initialize.c",
- "src/core/lib/census/mlog.c",
- "src/core/lib/census/operation.c",
- "src/core/lib/census/placeholders.c",
- "src/core/lib/census/tracing.c",
  "src/core/lib/channel/channel_args.c",
  "src/core/lib/channel/channel_stack.c",
  "src/core/lib/channel/channel_stack_builder.c",
@@ -531,6 +531,13 @@ cc_library(
 cc_library(
  name = "grpc_unsecure",
  srcs = [
+ "src/core/ext/census/aggregation.h",
+ "src/core/ext/census/census_interface.h",
+ "src/core/ext/census/census_rpc_stats.h",
+ "src/core/ext/census/grpc_filter.h",
+ "src/core/ext/census/grpc_plugin.h",
+ "src/core/ext/census/mlog.h",
+ "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
@@ -554,11 +561,6 @@ cc_library(
  "src/core/ext/transport/chttp2/transport/stream_map.h",
  "src/core/ext/transport/chttp2/transport/timeout_encoding.h",
  "src/core/ext/transport/chttp2/transport/varint.h",
- "src/core/lib/census/aggregation.h",
- "src/core/lib/census/grpc_filter.h",
- "src/core/lib/census/grpc_plugin.h",
- "src/core/lib/census/mlog.h",
- "src/core/lib/census/rpc_metric_id.h",
  "src/core/lib/channel/channel_args.h",
  "src/core/lib/channel/channel_stack.h",
  "src/core/lib/channel/channel_stack_builder.h",
@@ -631,8 +633,6 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/statistics/census_interface.h",
- "src/core/lib/statistics/census_rpc_stats.h",
  "src/core/lib/surface/api_trace.h",
  "src/core/lib/surface/call.h",
  "src/core/lib/surface/call_test_only.h",
@@ -656,6 +656,15 @@ cc_library(
  "third_party/nanopb/pb_common.h",
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
+ "src/core/ext/census/context.c",
+ "src/core/ext/census/grpc_context.c",
+ "src/core/ext/census/grpc_filter.c",
+ "src/core/ext/census/grpc_plugin.c",
+ "src/core/ext/census/initialize.c",
+ "src/core/ext/census/mlog.c",
+ "src/core/ext/census/operation.c",
+ "src/core/ext/census/placeholders.c",
+ "src/core/ext/census/tracing.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
@@ -683,15 +692,6 @@ cc_library(
  "src/core/ext/transport/chttp2/transport/timeout_encoding.c",
  "src/core/ext/transport/chttp2/transport/varint.c",
  "src/core/ext/transport/chttp2/transport/writing.c",
- "src/core/lib/census/context.c",
- "src/core/lib/census/grpc_context.c",
- "src/core/lib/census/grpc_filter.c",
- "src/core/lib/census/grpc_plugin.c",
- "src/core/lib/census/initialize.c",
- "src/core/lib/census/mlog.c",
- "src/core/lib/census/operation.c",
- "src/core/lib/census/placeholders.c",
- "src/core/lib/census/tracing.c",
  "src/core/lib/channel/channel_args.c",
  "src/core/lib/channel/channel_stack.c",
  "src/core/lib/channel/channel_stack_builder.c",
@@ -1358,6 +1358,15 @@ objc_library(
 objc_library(
  name = "grpc_objc",
  srcs = [
+ "src/core/ext/census/context.c",
+ "src/core/ext/census/grpc_context.c",
+ "src/core/ext/census/grpc_filter.c",
+ "src/core/ext/census/grpc_plugin.c",
+ "src/core/ext/census/initialize.c",
+ "src/core/ext/census/mlog.c",
+ "src/core/ext/census/operation.c",
+ "src/core/ext/census/placeholders.c",
+ "src/core/ext/census/tracing.c",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
@@ -1387,15 +1396,6 @@ objc_library(
  "src/core/ext/transport/chttp2/transport/timeout_encoding.c",
  "src/core/ext/transport/chttp2/transport/varint.c",
  "src/core/ext/transport/chttp2/transport/writing.c",
- "src/core/lib/census/context.c",
- "src/core/lib/census/grpc_context.c",
- "src/core/lib/census/grpc_filter.c",
- "src/core/lib/census/grpc_plugin.c",
- "src/core/lib/census/initialize.c",
- "src/core/lib/census/mlog.c",
- "src/core/lib/census/operation.c",
- "src/core/lib/census/placeholders.c",
- "src/core/lib/census/tracing.c",
  "src/core/lib/channel/channel_args.c",
  "src/core/lib/channel/channel_stack.c",
  "src/core/lib/channel/channel_stack_builder.c",
@@ -1538,6 +1538,13 @@ objc_library(
  "include/grpc/impl/codegen/propagation_bits.h",
  "include/grpc/impl/codegen/status.h",
  "include/grpc/status.h",
+ "src/core/ext/census/aggregation.h",
+ "src/core/ext/census/census_interface.h",
+ "src/core/ext/census/census_rpc_stats.h",
+ "src/core/ext/census/grpc_filter.h",
+ "src/core/ext/census/grpc_plugin.h",
+ "src/core/ext/census/mlog.h",
+ "src/core/ext/census/rpc_metric_id.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
@@ -1561,11 +1568,6 @@ objc_library(
  "src/core/ext/transport/chttp2/transport/stream_map.h",
  "src/core/ext/transport/chttp2/transport/timeout_encoding.h",
  "src/core/ext/transport/chttp2/transport/varint.h",
- "src/core/lib/census/aggregation.h",
- "src/core/lib/census/grpc_filter.h",
- "src/core/lib/census/grpc_plugin.h",
- "src/core/lib/census/mlog.h",
- "src/core/lib/census/rpc_metric_id.h",
  "src/core/lib/channel/channel_args.h",
  "src/core/lib/channel/channel_stack.h",
  "src/core/lib/channel/channel_stack_builder.h",
@@ -1647,8 +1649,6 @@ objc_library(
  "src/core/lib/security/secure_endpoint.h",
  "src/core/lib/security/security_connector.h",
  "src/core/lib/security/security_context.h",
- "src/core/lib/statistics/census_interface.h",
- "src/core/lib/statistics/census_rpc_stats.h",
  "src/core/lib/surface/api_trace.h",
  "src/core/lib/surface/call.h",
  "src/core/lib/surface/call_test_only.h",

diff --git a/Makefile b/Makefile
@@ -2420,6 +2420,15 @@ endif
 
 
 LIBGRPC_SRC = \
+ src/core/ext/census/context.c \
+ src/core/ext/census/grpc_context.c \
+ src/core/ext/census/grpc_filter.c \
+ src/core/ext/census/grpc_plugin.c \
+ src/core/ext/census/initialize.c \
+ src/core/ext/census/mlog.c \
+ src/core/ext/census/operation.c \
+ src/core/ext/census/placeholders.c \
+ src/core/ext/census/tracing.c \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \
  src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
@@ -2449,15 +2458,6 @@ LIBGRPC_SRC = \
  src/core/ext/transport/chttp2/transport/timeout_encoding.c \
  src/core/ext/transport/chttp2/transport/varint.c \
  src/core/ext/transport/chttp2/transport/writing.c \
- src/core/lib/census/context.c \
- src/core/lib/census/grpc_context.c \
- src/core/lib/census/grpc_filter.c \
- src/core/lib/census/grpc_plugin.c \
- src/core/lib/census/initialize.c \
- src/core/lib/census/mlog.c \
- src/core/lib/census/operation.c \
- src/core/lib/census/placeholders.c \
- src/core/lib/census/tracing.c \
  src/core/lib/channel/channel_args.c \
  src/core/lib/channel/channel_stack.c \
  src/core/lib/channel/channel_stack_builder.c \
@@ -2782,6 +2782,15 @@ endif
 
 
 LIBGRPC_UNSECURE_SRC = \
+ src/core/ext/census/context.c \
+ src/core/ext/census/grpc_context.c \
+ src/core/ext/census/grpc_filter.c \
+ src/core/ext/census/grpc_plugin.c \
+ src/core/ext/census/initialize.c \
+ src/core/ext/census/mlog.c \
+ src/core/ext/census/operation.c \
+ src/core/ext/census/placeholders.c \
+ src/core/ext/census/tracing.c \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \
  src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
@@ -2809,15 +2818,6 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/ext/transport/chttp2/transport/timeout_encoding.c \
  src/core/ext/transport/chttp2/transport/varint.c \
  src/core/ext/transport/chttp2/transport/writing.c \
- src/core/lib/census/context.c \
- src/core/lib/census/grpc_context.c \
- src/core/lib/census/grpc_filter.c \
- src/core/lib/census/grpc_plugin.c \
- src/core/lib/census/initialize.c \
- src/core/lib/census/mlog.c \
- src/core/lib/census/operation.c \
- src/core/lib/census/placeholders.c \
- src/core/lib/census/tracing.c \
  src/core/lib/channel/channel_args.c \
  src/core/lib/channel/channel_stack.c \
  src/core/lib/channel/channel_stack_builder.c \

diff --git a/binding.gyp b/binding.gyp
@@ -558,6 +558,15 @@
  'gpr',
  ],
  'sources': [
+ 'src/core/ext/census/context.c',
+ 'src/core/ext/census/grpc_context.c',
+ 'src/core/ext/census/grpc_filter.c',
+ 'src/core/ext/census/grpc_plugin.c',
+ 'src/core/ext/census/initialize.c',
+ 'src/core/ext/census/mlog.c',
+ 'src/core/ext/census/operation.c',
+ 'src/core/ext/census/placeholders.c',
+ 'src/core/ext/census/tracing.c',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
  'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/ext/lb_policy/pick_first/pick_first.c',
@@ -587,15 +596,6 @@
  'src/core/ext/transport/chttp2/transport/timeout_encoding.c',
  'src/core/ext/transport/chttp2/transport/varint.c',
  'src/core/ext/transport/chttp2/transport/writing.c',
- 'src/core/lib/census/context.c',
- 'src/core/lib/census/grpc_context.c',
- 'src/core/lib/census/grpc_filter.c',
- 'src/core/lib/census/grpc_plugin.c',
- 'src/core/lib/census/initialize.c',
- 'src/core/lib/census/mlog.c',
- 'src/core/lib/census/operation.c',
- 'src/core/lib/census/placeholders.c',
- 'src/core/lib/census/tracing.c',
  'src/core/lib/channel/channel_args.c',
  'src/core/lib/channel/channel_stack.c',
  'src/core/lib/channel/channel_stack_builder.c',

diff --git a/build.yaml b/build.yaml
@@ -13,16 +13,24 @@ filegroups:
  public_headers:
  - include/grpc/census.h
  headers:
- - src/core/lib/census/aggregation.h
- - src/core/lib/census/mlog.h
- - src/core/lib/census/rpc_metric_id.h
- src:
- - src/core/lib/census/context.c
- - src/core/lib/census/initialize.c
- - src/core/lib/census/mlog.c
- - src/core/lib/census/operation.c
- - src/core/lib/census/placeholders.c
- - src/core/lib/census/tracing.c
+ - src/core/ext/census/aggregation.h
+ - src/core/ext/census/census_interface.h
+ - src/core/ext/census/census_rpc_stats.h
+ - src/core/ext/census/grpc_filter.h
+ - src/core/ext/census/grpc_plugin.h
+ - src/core/ext/census/mlog.h
+ - src/core/ext/census/rpc_metric_id.h
+ src:
+ - src/core/ext/census/context.c
+ - src/core/ext/census/grpc_context.c
+ - src/core/ext/census/grpc_filter.c
+ - src/core/ext/census/grpc_plugin.c
+ - src/core/ext/census/initialize.c
+ - src/core/ext/census/mlog.c
+ - src/core/ext/census/operation.c
+ - src/core/ext/census/placeholders.c
+ - src/core/ext/census/tracing.c
+ plugin: census_grpc_plugin
 - name: gpr
  public_headers:
  - include/grpc/support/alloc.h
@@ -248,8 +256,6 @@ filegroups:
  - include/grpc/status.h
  headers:
  - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
- - src/core/lib/census/grpc_filter.h
- - src/core/lib/census/grpc_plugin.h
  - src/core/lib/channel/channel_args.h
  - src/core/lib/channel/channel_stack.h
  - src/core/lib/channel/channel_stack_builder.h
@@ -322,8 +328,6 @@ filegroups:
  - src/core/lib/json/json_common.h
  - src/core/lib/json/json_reader.h
  - src/core/lib/json/json_writer.h
- - src/core/lib/statistics/census_interface.h
- - src/core/lib/statistics/census_rpc_stats.h
  - src/core/lib/surface/api_trace.h
  - src/core/lib/surface/call.h
  - src/core/lib/surface/call_test_only.h
@@ -345,9 +349,6 @@ filegroups:
  - src/core/lib/transport/transport_impl.h
  src:
  - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
- - src/core/lib/census/grpc_context.c
- - src/core/lib/census/grpc_filter.c
- - src/core/lib/census/grpc_plugin.c
  - src/core/lib/channel/channel_args.c
  - src/core/lib/channel/channel_stack.c
  - src/core/lib/channel/channel_stack_builder.c