Remove tcp_tracer

yashykt · yashykt · commit 7e3746e713d5 · 2025-03-21T22:25:58.000Z
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -104,7 +104,6 @@
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
-#include "src/core/telemetry/tcp_tracer.h"
 #include "src/core/util/bitset.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/debug_location.h"
@@ -237,16 +236,6 @@ grpc_core::CallTracerAnnotationInterface* ParentCallTracerIfSampled(
   return parent_call_tracer;
 }
 
-std::shared_ptr<grpc_core::TcpTracerInterface> TcpTracerIfSampled(
-    grpc_chttp2_stream* s) {
-  auto* call_attempt_tracer =
-      s->arena->GetContext<grpc_core::CallTracerInterface>();
-  if (call_attempt_tracer == nullptr || !call_attempt_tracer->IsSampled()) {
-    return nullptr;
-  }
-  return call_attempt_tracer->StartNewTcpTrace();
-}
-
 grpc_core::WriteTimestampsCallback g_write_timestamps_callback = nullptr;
 grpc_core::CopyContextFn g_get_copied_context_fn = nullptr;
 }  // namespace
@@ -856,8 +845,7 @@ grpc_chttp2_stream::grpc_chttp2_stream(grpc_chttp2_transport* t,
       }()),
       arena(arena),
       flow_control(&t->flow_control),
-      call_tracer_wrapper(this),
-      tcp_tracer(TcpTracerIfSampled(this)) {
+      call_tracer_wrapper(this) {
   t->streams_allocated.fetch_add(1, std::memory_order_relaxed);
   if (server_data) {
     id = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(server_data));
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
@@ -73,7 +73,6 @@
 #include "src/core/lib/transport/transport.h"
 #include "src/core/lib/transport/transport_framing_endpoint_extension.h"
 #include "src/core/telemetry/call_tracer.h"
-#include "src/core/telemetry/tcp_tracer.h"
 #include "src/core/util/bitset.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/ref_counted.h"
@@ -677,9 +676,6 @@ struct grpc_chttp2_stream {
   // TODO(yashykt): Remove this once call_tracer_transport_fix is rolled out
   grpc_core::CallTracerAnnotationInterface* parent_call_tracer = nullptr;
 
-  /// Only set when enabled.
-  std::shared_ptr<grpc_core::TcpTracerInterface> tcp_tracer;
-
   // time this stream was created
   gpr_timespec creation_time = gpr_now(GPR_CLOCK_MONOTONIC);
 
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -699,10 +699,9 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write(
             grpc_core::GrpcHttp2GetCopyContextFn();
         if (copy_context_fn != nullptr &&
             grpc_core::GrpcHttp2GetWriteTimestampsCallback() != nullptr) {
-          t->context_list->emplace_back(copy_context_fn(s->arena),
-                                        outbuf_relative_start_pos,
-                                        num_stream_bytes, s->byte_counter,
-                                        s->write_counter - 1, s->tcp_tracer);
+          t->context_list->emplace_back(
+              copy_context_fn(s->arena), outbuf_relative_start_pos,
+              num_stream_bytes, s->byte_counter, s->write_counter - 1, nullptr);
         }
       }
       outbuf_relative_start_pos += num_stream_bytes;

Original file line number	Diff line number	Diff line change
`@@ -699,10 +699,9 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write(`
`699`	`699`	`grpc_core::GrpcHttp2GetCopyContextFn();`
`700`	`700`	`if (copy_context_fn != nullptr &&`
`701`	`701`	`grpc_core::GrpcHttp2GetWriteTimestampsCallback() != nullptr) {`
`702`		`- t->context_list->emplace_back(copy_context_fn(s->arena),`
`703`		`- outbuf_relative_start_pos,`
`704`		`- num_stream_bytes, s->byte_counter,`
`705`		`- s->write_counter - 1, s->tcp_tracer);`
	`702`	`+ t->context_list->emplace_back(`
	`703`	`+ copy_context_fn(s->arena), outbuf_relative_start_pos,`
	`704`	`+ num_stream_bytes, s->byte_counter, s->write_counter - 1, nullptr);`
`706`	`705`	`}`
`707`	`706`	`}`
`708`	`707`	`outbuf_relative_start_pos += num_stream_bytes;`