|  | @@ -336,13 +336,12 @@ static const cq_vtable g_cq_vtable[] = {
 | 
	
		
			
				|  |  |  grpc_core::TraceFlag grpc_cq_pluck_trace(true, "queue_pluck");
 | 
	
		
			
				|  |  |  grpc_core::TraceFlag grpc_cq_event_timeout_trace(true, "queue_timeout");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -#define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event)    \
 | 
	
		
			
				|  |  | -  if (grpc_api_trace.enabled() &&                 \
 | 
	
		
			
				|  |  | -      (grpc_cq_pluck_trace.enabled() ||           \
 | 
	
		
			
				|  |  | -       (event)->type != GRPC_QUEUE_TIMEOUT)) {          \
 | 
	
		
			
				|  |  | -    char* _ev = grpc_event_string(event);               \
 | 
	
		
			
				|  |  | -    gpr_log(GPR_INFO, "RETURN_EVENT[%p]: %s", cq, _ev); \
 | 
	
		
			
				|  |  | -    gpr_free(_ev);                                      \
 | 
	
		
			
				|  |  | +#define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event)                       \
 | 
	
		
			
				|  |  | +  if (grpc_api_trace.enabled() && (grpc_cq_pluck_trace.enabled() ||        \
 | 
	
		
			
				|  |  | +                                   (event)->type != GRPC_QUEUE_TIMEOUT)) { \
 | 
	
		
			
				|  |  | +    char* _ev = grpc_event_string(event);                                  \
 | 
	
		
			
				|  |  | +    gpr_log(GPR_INFO, "RETURN_EVENT[%p]: %s", cq, _ev);                    \
 | 
	
		
			
				|  |  | +    gpr_free(_ev);                                                         \
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void on_pollset_shutdown_done(grpc_exec_ctx* exec_ctx, void* cq,
 | 
	
	
		
			
				|  | @@ -648,15 +647,13 @@ static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx,
 | 
	
		
			
				|  |  |    GPR_TIMER_BEGIN("cq_end_op_for_next", 0);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    if (grpc_api_trace.enabled() ||
 | 
	
		
			
				|  |  | -      (grpc_trace_operation_failures.enabled() &&
 | 
	
		
			
				|  |  | -       error != GRPC_ERROR_NONE)) {
 | 
	
		
			
				|  |  | +      (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE)) {
 | 
	
		
			
				|  |  |      const char* errmsg = grpc_error_string(error);
 | 
	
		
			
				|  |  |      GRPC_API_TRACE(
 | 
	
		
			
				|  |  |          "cq_end_op_for_next(exec_ctx=%p, cq=%p, tag=%p, error=%s, "
 | 
	
		
			
				|  |  |          "done=%p, done_arg=%p, storage=%p)",
 | 
	
		
			
				|  |  |          7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage));
 | 
	
		
			
				|  |  | -    if (grpc_trace_operation_failures.enabled() &&
 | 
	
		
			
				|  |  | -        error != GRPC_ERROR_NONE) {
 | 
	
		
			
				|  |  | +    if (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE) {
 | 
	
		
			
				|  |  |        gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    }
 | 
	
	
		
			
				|  | @@ -737,15 +734,13 @@ static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx,
 | 
	
		
			
				|  |  |    GPR_TIMER_BEGIN("cq_end_op_for_pluck", 0);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    if (grpc_api_trace.enabled() ||
 | 
	
		
			
				|  |  | -      (grpc_trace_operation_failures.enabled() &&
 | 
	
		
			
				|  |  | -       error != GRPC_ERROR_NONE)) {
 | 
	
		
			
				|  |  | +      (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE)) {
 | 
	
		
			
				|  |  |      const char* errmsg = grpc_error_string(error);
 | 
	
		
			
				|  |  |      GRPC_API_TRACE(
 | 
	
		
			
				|  |  |          "cq_end_op_for_pluck(exec_ctx=%p, cq=%p, tag=%p, error=%s, "
 | 
	
		
			
				|  |  |          "done=%p, done_arg=%p, storage=%p)",
 | 
	
		
			
				|  |  |          7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage));
 | 
	
		
			
				|  |  | -    if (grpc_trace_operation_failures.enabled() &&
 | 
	
		
			
				|  |  | -        error != GRPC_ERROR_NONE) {
 | 
	
		
			
				|  |  | +    if (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE) {
 | 
	
		
			
				|  |  |        gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    }
 |