[experiments] Stabilize http2_stats_fix (#36351)

Closes #36351 COPYBARA_INTEGRATE_REVIEW=#36351 from yashykt:RemoveHttp2StatsFix 768a7a4 PiperOrigin-RevId: 624332015
grpc · Apr 13, 2024 · 84ee28e · 84ee28e
1 parent 3fe06af
commit 84ee28e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 44 deletions.
diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -1471,11 +1471,9 @@ static void perform_stream_op_locked(void* stream_op,
       frame_hdr[3] = static_cast<uint8_t>(len >> 8);
       frame_hdr[4] = static_cast<uint8_t>(len);
 
-      if (grpc_core::IsHttp2StatsFixEnabled()) {
-        s->stats.outgoing.framing_bytes += GRPC_HEADER_SIZE_IN_BYTES;
-        s->stats.outgoing.data_bytes +=
-            op_payload->send_message.send_message->Length();
-      }
+      s->stats.outgoing.framing_bytes += GRPC_HEADER_SIZE_IN_BYTES;
+      s->stats.outgoing.data_bytes +=
+          op_payload->send_message.send_message->Length();
       s->next_message_end_offset =
           s->flow_controlled_bytes_written +
           static_cast<int64_t>(s->flow_controlled_buffer.length) +

diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc
@@ -78,9 +78,6 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf,
   grpc_slice_buffer_move_first_no_ref(inbuf, write_bytes, outbuf);
 
   stats->framing_bytes += header_size;
-  if (!grpc_core::IsHttp2StatsFixEnabled()) {
-    stats->data_bytes += write_bytes;
-  }
 }
 
 grpc_core::Poll<grpc_error_handle> grpc_deframe_unprocessed_incoming_frames(

diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
@@ -98,12 +98,6 @@
   expiry: 2024/08/01
   owner: alishananda@google.com
   test_tags: [resource_quota_test]
-- name: http2_stats_fix
-  description:
-    Fix on HTTP2 outgoing data stats reporting
-  expiry: 2024/03/31
-  owner: yashkt@google.com
-  test_tags: []
 - name: keepalive_fix
   description:
     Allows overriding keepalive_permit_without_calls.

diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc
@@ -193,9 +193,6 @@ class NewFakeStatsPlugin : public FakeStatsPlugin {
 
 // This test verifies the HTTP2 stats on a stream
 CORE_END2END_TEST(Http2FullstackSingleHopTest, StreamStats) {
-  if (!IsHttp2StatsFixEnabled()) {
-    GTEST_SKIP() << "Test needs http2_stats_fix experiment to be enabled";
-  }
   g_mu = new Mutex();
   g_client_call_ended_notify = new Notification();
   g_server_call_ended_notify = new Notification();