|  | @@ -57,10 +57,8 @@ static void validate_children(grpc_channel_tracer* tracer,
 | 
	
		
			
				|  |  |    gpr_free(json_str);
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -static intptr_t uuid = 0;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  static void test_basic_channel_tracing(size_t max_nodes) {
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(max_nodes, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(max_nodes);
 | 
	
		
			
				|  |  |    grpc_core::ExecCtx exec_ctx;
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
	
		
			
				|  | @@ -94,11 +92,11 @@ static void test_basic_channel_sizing() {
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void test_complex_channel_tracing(size_t max_nodes) {
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(max_nodes, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(max_nodes);
 | 
	
		
			
				|  |  |    grpc_core::ExecCtx exec_ctx;
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* sc1 = GRPC_CHANNEL_TRACER_CREATE(max_nodes, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* sc1 = GRPC_CHANNEL_TRACER_CREATE(max_nodes);
 | 
	
		
			
				|  |  |    grpc_channel_tracer_add_trace(
 | 
	
		
			
				|  |  |        tracer, grpc_slice_from_static_string("subchannel one created"),
 | 
	
		
			
				|  |  |        GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc1);
 | 
	
	
		
			
				|  | @@ -114,7 +112,7 @@ static void test_complex_channel_tracing(size_t max_nodes) {
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    validate_tracer(tracer, 5, max_nodes);
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* sc2 = GRPC_CHANNEL_TRACER_CREATE(max_nodes, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* sc2 = GRPC_CHANNEL_TRACER_CREATE(max_nodes);
 | 
	
		
			
				|  |  |    grpc_channel_tracer_add_trace(
 | 
	
		
			
				|  |  |        tracer, grpc_slice_from_static_string("subchannel two created"),
 | 
	
		
			
				|  |  |        GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc2);
 | 
	
	
		
			
				|  | @@ -143,11 +141,11 @@ static void test_complex_channel_sizing() {
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void test_delete_parent_first() {
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(3, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(3);
 | 
	
		
			
				|  |  |    grpc_core::ExecCtx exec_ctx;
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* sc1 = GRPC_CHANNEL_TRACER_CREATE(3, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* sc1 = GRPC_CHANNEL_TRACER_CREATE(3);
 | 
	
		
			
				|  |  |    grpc_channel_tracer_add_trace(
 | 
	
		
			
				|  |  |        tracer, grpc_slice_from_static_string("subchannel one created"),
 | 
	
		
			
				|  |  |        GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc1);
 | 
	
	
		
			
				|  | @@ -157,18 +155,18 @@ static void test_delete_parent_first() {
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void test_nesting() {
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(10, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* tracer = GRPC_CHANNEL_TRACER_CREATE(10);
 | 
	
		
			
				|  |  |    grpc_core::ExecCtx exec_ctx;
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* sc1 = GRPC_CHANNEL_TRACER_CREATE(5, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* sc1 = GRPC_CHANNEL_TRACER_CREATE(5);
 | 
	
		
			
				|  |  |    grpc_channel_tracer_add_trace(
 | 
	
		
			
				|  |  |        tracer, grpc_slice_from_static_string("subchannel one created"),
 | 
	
		
			
				|  |  |        GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc1);
 | 
	
		
			
				|  |  |    // channel has only one subchannel right here.
 | 
	
		
			
				|  |  |    validate_children(tracer, 1);
 | 
	
		
			
				|  |  |    add_simple_trace(sc1);
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* conn1 = GRPC_CHANNEL_TRACER_CREATE(5, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* conn1 = GRPC_CHANNEL_TRACER_CREATE(5);
 | 
	
		
			
				|  |  |    // nesting one level deeper.
 | 
	
		
			
				|  |  |    grpc_channel_tracer_add_trace(
 | 
	
		
			
				|  |  |        sc1, grpc_slice_from_static_string("connection one created"),
 | 
	
	
		
			
				|  | @@ -177,7 +175,7 @@ static void test_nesting() {
 | 
	
		
			
				|  |  |    add_simple_trace(conn1);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  |    add_simple_trace(tracer);
 | 
	
		
			
				|  |  | -  grpc_channel_tracer* sc2 = GRPC_CHANNEL_TRACER_CREATE(5, uuid++);
 | 
	
		
			
				|  |  | +  grpc_channel_tracer* sc2 = GRPC_CHANNEL_TRACER_CREATE(5);
 | 
	
		
			
				|  |  |    grpc_channel_tracer_add_trace(
 | 
	
		
			
				|  |  |        tracer, grpc_slice_from_static_string("subchannel two created"),
 | 
	
		
			
				|  |  |        GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc2);
 |