s/inherit/propagate/g

10 years ago · e1b0e6ee12
parent 99e61645ce
commit e1b0e6ee12
41 changed files with 62 additions and 62 deletions
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@ -349,14 +349,14 @@ typedef struct grpc_op {
  } data;
 } grpc_op;

-#define GRPC_INHERIT_DEADLINE 1
-#define GRPC_INHERIT_CENSUS_CONTEXT 2
+#define GRPC_PROPAGATE_DEADLINE 1
+#define GRPC_PROPAGATE_CENSUS_CONTEXT 2
 /* TODO(ctiller):
-#define GRPC_INHERIT_CANCELLATION   4
+#define GRPC_PROPAGATE_CANCELLATION   4
 */

-#define GRPC_INHERIT_DEFAULTS \
-  (GRPC_INHERIT_DEADLINE | GRPC_INHERIT_CENSUS_CONTEXT)
+#define GRPC_PROPAGATE_DEFAULTS \
+  (GRPC_PROPAGATE_DEADLINE | GRPC_PROPAGATE_CENSUS_CONTEXT)

 /** Initialize the grpc library.

@ -437,7 +437,7 @@ void grpc_channel_watch_connectivity_state(
    live through the invocation of this function. */
 grpc_call *grpc_channel_create_call(grpc_channel *channel,
                                    grpc_call *parent_call,
-                                    gpr_uint32 inheritance_mask,
+                                    gpr_uint32 propagation_mask,
                                    grpc_completion_queue *completion_queue,
                                    const char *method, const char *host,
                                    gpr_timespec deadline);
@ -448,7 +448,7 @@ void *grpc_channel_register_call(grpc_channel *channel, const char *method,

 /** Create a call given a handle returned from grpc_channel_register_call */
 grpc_call *grpc_channel_create_registered_call(
-    grpc_channel *channel, grpc_call *parent_call, gpr_uint32 inheritance_mask,
+    grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask,
    grpc_completion_queue *completion_queue, void *registered_call_handle,
    gpr_timespec deadline);

--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@ -292,7 +292,7 @@ static void lock(grpc_call *call);
 static void unlock(grpc_call *call);

 grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call,
-                            gpr_uint32 inheritance_mask,
+                            gpr_uint32 propagation_mask,
                            grpc_completion_queue *cq,
                            const void *server_transport_data,
                            grpc_mdelem **add_initial_metadata,
@ -319,13 +319,13 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call,
    GPR_ASSERT(call->is_client);
    GPR_ASSERT(!parent_call->is_client);

-    if (inheritance_mask & GRPC_INHERIT_DEADLINE) {
+    if (propagation_mask & GRPC_PROPAGATE_DEADLINE) {
      send_deadline = gpr_time_min(
          gpr_convert_clock_type(send_deadline,
                                 parent_call->send_deadline.clock_type),
          parent_call->send_deadline);
    }
-    if (inheritance_mask & GRPC_INHERIT_CENSUS_CONTEXT) {
+    if (propagation_mask & GRPC_PROPAGATE_CENSUS_CONTEXT) {
      grpc_call_context_set(call, GRPC_CONTEXT_TRACING,
                            parent_call->context[GRPC_CONTEXT_TRACING].value,
                            NULL);
--- a/src/core/surface/call.h
+++ b/src/core/surface/call.h
@ -86,7 +86,7 @@ typedef void (*grpc_ioreq_completion_func)(grpc_call *call, int success,
                                           void *user_data);

 grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call,
-                            gpr_uint32 inheritance_mask,
+                            gpr_uint32 propagation_mask,
                            grpc_completion_queue *cq,
                            const void *server_transport_data,
                            grpc_mdelem **add_initial_metadata,
--- a/src/core/surface/channel.c
+++ b/src/core/surface/channel.c
@ -146,7 +146,7 @@ char *grpc_channel_get_target(grpc_channel *channel) {
 }

 static grpc_call *grpc_channel_create_call_internal(
-    grpc_channel *channel, grpc_call *parent_call, gpr_uint32 inheritance_mask,
+    grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask,
    grpc_completion_queue *cq, grpc_mdelem *path_mdelem,
    grpc_mdelem *authority_mdelem, gpr_timespec deadline) {
  grpc_mdelem *send_metadata[2];
@ -156,19 +156,19 @@ static grpc_call *grpc_channel_create_call_internal(
  send_metadata[0] = path_mdelem;
  send_metadata[1] = authority_mdelem;

-  return grpc_call_create(channel, parent_call, inheritance_mask, cq, NULL,
+  return grpc_call_create(channel, parent_call, propagation_mask, cq, NULL,
                          send_metadata, GPR_ARRAY_SIZE(send_metadata),
                          deadline);
 }

 grpc_call *grpc_channel_create_call(grpc_channel *channel,
                                    grpc_call *parent_call,
-                                    gpr_uint32 inheritance_mask,
+                                    gpr_uint32 propagation_mask,
                                    grpc_completion_queue *cq,
                                    const char *method, const char *host,
                                    gpr_timespec deadline) {
  return grpc_channel_create_call_internal(
-      channel, parent_call, inheritance_mask, cq,
+      channel, parent_call, propagation_mask, cq,
      grpc_mdelem_from_metadata_strings(
          channel->metadata_context, GRPC_MDSTR_REF(channel->path_string),
          grpc_mdstr_from_string(channel->metadata_context, method, 0)),
@ -195,12 +195,12 @@ void *grpc_channel_register_call(grpc_channel *channel, const char *method,
 }

 grpc_call *grpc_channel_create_registered_call(
-    grpc_channel *channel, grpc_call *parent_call, gpr_uint32 inheritance_mask,
+    grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask,
    grpc_completion_queue *completion_queue, void *registered_call_handle,
    gpr_timespec deadline) {
  registered_call *rc = registered_call_handle;
  return grpc_channel_create_call_internal(
-      channel, parent_call, inheritance_mask, completion_queue,
+      channel, parent_call, propagation_mask, completion_queue,
      GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), deadline);
 }

--- a/src/csharp/ext/grpc_csharp_ext.c
+++ b/src/csharp/ext/grpc_csharp_ext.c
@ -379,7 +379,7 @@ GPR_EXPORT grpc_call *GPR_CALLTYPE
 grpcsharp_channel_create_call(grpc_channel *channel, grpc_completion_queue *cq,
                              const char *method, const char *host,
                              gpr_timespec deadline) {
-  return grpc_channel_create_call(channel, NULL, GRPC_INHERIT_DEFAULTS, cq,
+  return grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
                                  method, host, deadline);
 }

--- a/src/php/ext/grpc/call.c
+++ b/src/php/ext/grpc/call.c
@ -240,7 +240,7 @@ PHP_METHOD(Call, __construct) {
      (wrapped_grpc_timeval *)zend_object_store_get_object(
          deadline_obj TSRMLS_CC);
  call->wrapped = grpc_channel_create_call(
-      channel->wrapped, NULL, GRPC_INHERIT_DEFAULTS, completion_queue, method,
+      channel->wrapped, NULL, GRPC_PROPAGATE_DEFAULTS, completion_queue, method,
      channel->target, deadline->wrapped);
 }

--- a/src/python/grpcio/grpc/_adapter/_c/types/channel.c
+++ b/src/python/grpcio/grpc/_adapter/_c/types/channel.c
@ -128,7 +128,7 @@ Call *pygrpc_Channel_create_call(
  }
  call = pygrpc_Call_new_empty(cq);
  call->c_call = grpc_channel_create_call(
-      self->c_chan, NULL, GRPC_INHERIT_DEFAULTS, cq->c_cq, method, host,
+      self->c_chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq->c_cq, method, host,
      pygrpc_cast_double_to_gpr_timespec(deadline));
  return call;
 }
--- a/src/ruby/ext/grpc/rb_channel.c
+++ b/src/ruby/ext/grpc/rb_channel.c
@ -212,7 +212,7 @@ static VALUE grpc_rb_channel_create_call(VALUE self, VALUE cqueue, VALUE method,
    return Qnil;
  }

-  call = grpc_channel_create_call(ch, NULL, GRPC_INHERIT_DEFAULTS, cq,
+  call = grpc_channel_create_call(ch, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
                                  method_chars, host_chars,
                                  grpc_rb_time_timeval(deadline,
                                                       /* absolute time */ 0));
--- a/test/core/end2end/dualstack_socket_test.c
+++ b/test/core/end2end/dualstack_socket_test.c
@ -131,8 +131,8 @@ void test_connect(const char *server_host, const char *client_host, int port,
  }

  /* Send a trivial request. */
-  c = grpc_channel_create_call(client, NULL, GRPC_INHERIT_DEFAULTS, cq, "/foo",
-                               "foo.test.google.fr", deadline);
+  c = grpc_channel_create_call(client, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
+                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

  op = ops;
--- a/test/core/end2end/no_server_test.c
+++ b/test/core/end2end/no_server_test.c
@ -62,8 +62,8 @@ int main(int argc, char **argv) {

  /* create a call, channel to a non existant server */
  chan = grpc_insecure_channel_create("nonexistant:54321", NULL);
-  call = grpc_channel_create_call(chan, NULL, GRPC_INHERIT_DEFAULTS, cq, "/Foo",
-                                  "nonexistant", deadline);
+  call = grpc_channel_create_call(chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
+                                  "/Foo", "nonexistant", deadline);

  op = ops;
  op->op = GRPC_OP_SEND_INITIAL_METADATA;
--- a/test/core/end2end/tests/bad_hostname.c
+++ b/test/core/end2end/tests/bad_hostname.c
@ -113,7 +113,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) {
  char *details = NULL;
  size_t details_capacity = 0;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "slartibartfast.local", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/cancel_after_accept.c
+++ b/test/core/end2end/tests/cancel_after_accept.c
@ -126,7 +126,7 @@ static void test_cancel_after_accept(grpc_end2end_test_config config,
      grpc_raw_byte_buffer_create(&response_payload_slice, 1);
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
+++ b/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
@ -126,7 +126,7 @@ static void test_cancel_after_accept_and_writes_closed(
      grpc_raw_byte_buffer_create(&response_payload_slice, 1);
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/cancel_after_invoke.c
+++ b/test/core/end2end/tests/cancel_after_invoke.c
@ -121,7 +121,7 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config,
  grpc_byte_buffer *request_payload =
      grpc_raw_byte_buffer_create(&request_payload_slice, 1);

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/cancel_before_invoke.c
+++ b/test/core/end2end/tests/cancel_before_invoke.c
@ -119,7 +119,7 @@ static void test_cancel_before_invoke(grpc_end2end_test_config config,
  grpc_byte_buffer *request_payload =
      grpc_raw_byte_buffer_create(&request_payload_slice, 1);

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/cancel_in_a_vacuum.c
+++ b/test/core/end2end/tests/cancel_in_a_vacuum.c
@ -107,7 +107,7 @@ static void test_cancel_in_a_vacuum(grpc_end2end_test_config config,
  gpr_timespec deadline = five_seconds_time();
  cq_verifier *v_client = cq_verifier_create(f.cq);

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/census_simple_request.c
+++ b/test/core/end2end/tests/census_simple_request.c
@ -111,7 +111,7 @@ static void test_body(grpc_end2end_test_fixture f) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/disappearing_server.c
+++ b/test/core/end2end/tests/disappearing_server.c
@ -97,7 +97,7 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f,
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f->client, NULL, GRPC_INHERIT_DEFAULTS, f->cq,
+  c = grpc_channel_create_call(f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
+++ b/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
@ -105,7 +105,7 @@ static void test_early_server_shutdown_finishes_inflight_calls(
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/empty_batch.c
+++ b/test/core/end2end/tests/empty_batch.c
@ -105,7 +105,7 @@ static void empty_batch_body(grpc_end2end_test_fixture f) {
  cq_verifier *cqv = cq_verifier_create(f.cq);
  grpc_op *op = NULL;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/graceful_server_shutdown.c
+++ b/test/core/end2end/tests/graceful_server_shutdown.c
@ -112,7 +112,7 @@ static void test_early_server_shutdown_finishes_inflight_calls(
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/invoke_large_request.c
+++ b/test/core/end2end/tests/invoke_large_request.c
@ -128,7 +128,7 @@ static void test_invoke_large_request(grpc_end2end_test_config config) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/max_concurrent_streams.c
+++ b/test/core/end2end/tests/max_concurrent_streams.c
@ -113,7 +113,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

@ -244,10 +244,10 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) {
  /* start two requests - ensuring that the second is not accepted until
     the first completes */
  deadline = n_seconds_time(1000);
-  c1 = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c1 = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                                "/alpha", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c1);
-  c2 = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c2 = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                                "/beta", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c2);

--- a/test/core/end2end/tests/max_message_length.c
+++ b/test/core/end2end/tests/max_message_length.c
@ -128,7 +128,7 @@ static void test_max_message_length(grpc_end2end_test_config config) {
  f = begin_test(config, "test_max_message_length", NULL, &server_args);
  cqv = cq_verifier_create(f.cq);

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234",
                               gpr_inf_future(GPR_CLOCK_REALTIME));
  GPR_ASSERT(c);
--- a/test/core/end2end/tests/ping_pong_streaming.c
+++ b/test/core/end2end/tests/ping_pong_streaming.c
@ -124,7 +124,7 @@ static void test_pingpong_streaming(grpc_end2end_test_config config,
  gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world");
  gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you");

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/registered_call.c
+++ b/test/core/end2end/tests/registered_call.c
@ -115,8 +115,8 @@ static void simple_request_body(grpc_end2end_test_fixture f, void *rc) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_registered_call(f.client, NULL, GRPC_INHERIT_DEFAULTS,
-                                          f.cq, rc, deadline);
+  c = grpc_channel_create_registered_call(
+      f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, rc, deadline);
  GPR_ASSERT(c);

  grpc_metadata_array_init(&initial_metadata_recv);
--- a/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
@ -143,7 +143,7 @@ static void test_request_response_with_metadata_and_payload(
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_response_with_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_metadata_and_payload.c
@ -129,7 +129,7 @@ static void test_request_response_with_metadata_and_payload(
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_response_with_payload.c
+++ b/test/core/end2end/tests/request_response_with_payload.c
@ -121,7 +121,7 @@ static void request_response_with_payload(grpc_end2end_test_fixture f) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_response_with_payload_and_call_creds.c
+++ b/test/core/end2end/tests/request_response_with_payload_and_call_creds.c
@ -130,7 +130,7 @@ static void test_call_creds_failure(grpc_end2end_test_config config) {
  grpc_end2end_test_fixture f =
      begin_test(config, "test_call_creds_failure", NULL, NULL);
  gpr_timespec deadline = five_seconds_time();
-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

@ -175,7 +175,7 @@ static void request_response_with_payload_and_call_creds(
  grpc_credentials *creds = NULL;
  grpc_auth_context *s_auth_context = NULL;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);
  creds = grpc_iam_credentials_create(iam_token, iam_selector);
--- a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
@ -131,7 +131,7 @@ static void test_request_response_with_metadata_and_payload(
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_with_compressed_payload.c
+++ b/test/core/end2end/tests/request_with_compressed_payload.c
@ -141,7 +141,7 @@ static void request_with_payload_template(
  f = begin_test(config, test_name, client_args, server_args);
  cqv = cq_verifier_create(f.cq);

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_with_flags.c
+++ b/test/core/end2end/tests/request_with_flags.c
@ -121,7 +121,7 @@ static void test_invoke_request_with_flags(
  size_t details_capacity = 0;
  grpc_call_error expectation;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_with_large_metadata.c
+++ b/test/core/end2end/tests/request_with_large_metadata.c
@ -122,7 +122,7 @@ static void test_request_with_large_metadata(grpc_end2end_test_config config) {
  int was_cancelled = 2;
  const int large_size = 64 * 1024;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/request_with_payload.c
+++ b/test/core/end2end/tests/request_with_payload.c
@ -120,7 +120,7 @@ static void test_invoke_request_with_payload(grpc_end2end_test_config config) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/server_finishes_request.c
+++ b/test/core/end2end/tests/server_finishes_request.c
@ -115,7 +115,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/simple_delayed_request.c
+++ b/test/core/end2end/tests/simple_delayed_request.c
@ -107,7 +107,7 @@ static void simple_delayed_request_body(grpc_end2end_test_config config,

  config.init_client(f, client_args);

-  c = grpc_channel_create_call(f->client, NULL, GRPC_INHERIT_DEFAULTS, f->cq,
+  c = grpc_channel_create_call(f->client, NULL, GRPC_PROPAGATE_DEFAULTS, f->cq,
                               "/foo", "foo.test.google.fr", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/simple_request.c
+++ b/test/core/end2end/tests/simple_request.c
@ -116,7 +116,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) {
  int was_cancelled = 2;
  char *peer;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

--- a/test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c
+++ b/test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c
@ -115,7 +115,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) {
  size_t details_capacity = 0;
  int was_cancelled = 2;

-  c = grpc_channel_create_call(f.client, NULL, GRPC_INHERIT_DEFAULTS, f.cq,
+  c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
                               "/foo", "foo.test.google.fr:1234", deadline);
  GPR_ASSERT(c);

--- a/test/core/fling/client.c
+++ b/test/core/fling/client.c
@ -89,7 +89,7 @@ static void init_ping_pong_request(void) {
 }

 static void step_ping_pong_request(void) {
-  call = grpc_channel_create_call(channel, NULL, GRPC_INHERIT_DEFAULTS, cq,
+  call = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
                                  "/Reflector/reflectUnary", "localhost",
                                  gpr_inf_future(GPR_CLOCK_REALTIME));
  GPR_ASSERT(GRPC_CALL_OK ==
@ -101,7 +101,7 @@ static void step_ping_pong_request(void) {
 }

 static void init_ping_pong_stream(void) {
-  call = grpc_channel_create_call(channel, NULL, GRPC_INHERIT_DEFAULTS, cq,
+  call = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
                                  "/Reflector/reflectStream", "localhost",
                                  gpr_inf_future(GPR_CLOCK_REALTIME));
  stream_init_op.op = GRPC_OP_SEND_INITIAL_METADATA;
--- a/test/core/surface/lame_client_test.c
+++ b/test/core/surface/lame_client_test.c
@ -60,8 +60,8 @@ int main(int argc, char **argv) {
  chan = grpc_lame_client_channel_create("lampoon:national");
  GPR_ASSERT(chan);
  cq = grpc_completion_queue_create();
-  call = grpc_channel_create_call(chan, NULL, GRPC_INHERIT_DEFAULTS, cq, "/Foo",
-                                  "anywhere",
+  call = grpc_channel_create_call(chan, NULL, GRPC_PROPAGATE_DEFAULTS, cq,
+                                  "/Foo", "anywhere",
                                  GRPC_TIMEOUT_SECONDS_TO_DEADLINE(100));
  GPR_ASSERT(call);
  cqv = cq_verifier_create(cq);