Merge branch 'propagate' into every-day-i-propagate

include/grpc/grpc.h

@@ -358,8 +358,9 @@ typedef struct grpc_op {
 /** Propagate deadline */
 #define GRPC_PROPAGATE_DEADLINE ((gpr_uint32)1)
 /** Propagate census context */
-#define GRPC_PROPAGATE_STATS_CONTEXT ((gpr_uint32)2)
+#define GRPC_PROPAGATE_CENSUS_STATS_CONTEXT ((gpr_uint32)2)
-#define GRPC_PROPAGATE_TRACING_CONTEXT ((gpr_uint32)4)
+#define GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT ((gpr_uint32)4)
+/** Propagate cancellation */
 #define GRPC_PROPAGATE_CANCELLATION ((gpr_uint32)8)
 
 /* Default propagation mask: clients of the core API are encouraged to encode
@@ -367,10 +368,10 @@ typedef struct grpc_op {
    GRPC_PROPAGATE_DEFAULTS & ~GRPC_PROPAGATE_DEADLINE to disable deadline 
    propagation. Doing so gives flexibility in the future to define new 
    propagation types that are default inherited or not. */
-#define GRPC_PROPAGATE_DEFAULTS                     \
+#define GRPC_PROPAGATE_DEFAULTS                        \
-  ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE | \
+  ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE |    \
-                 GRPC_PROPAGATE_STATS_CONTEXT |     \
+                 GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
-                 GRPC_PROPAGATE_TRACING_CONTEXT)))
+                 GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT)))
 
 /** Initialize the grpc library.
 

src/core/surface/call.c

@@ -374,13 +374,15 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call,
     }
     /* for now GRPC_PROPAGATE_TRACING_CONTEXT *MUST* be passed with
      * GRPC_PROPAGATE_STATS_CONTEXT */
-    if (propagation_mask & GRPC_PROPAGATE_TRACING_CONTEXT) {
+    /* TODO(ctiller): This should change to use the appropriate census start_op
-      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_STATS_CONTEXT);
+     * call. */
+    if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) {
+      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT);
       grpc_call_context_set(call, GRPC_CONTEXT_TRACING,
                             parent_call->context[GRPC_CONTEXT_TRACING].value,
                             NULL);
     } else {
-      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_STATS_CONTEXT);
+      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT);
     }
     if (propagation_mask & GRPC_PROPAGATE_CANCELLATION) {
       call->cancellation_is_inherited = 1;