Remove obsolete WebCore.WebSocket.MessageSize* histograms

Bug: 1109855,1037381
Change-Id: Ief5b3631c257aef10650d16968d4d9050ec82ec6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2397457Reviewed-by: Adam Rice <ricea@chromium.org>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Commit-Queue: Jesse Doherty <jwd@chromium.org>
Auto-Submit: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805761}

third_party/blink/renderer/modules/websockets/dom_websocket.cc

@@ -73,9 +73,6 @@
 #include "third_party/blink/renderer/platform/wtf/text/string_utf8_adaptor.h"
 #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h"
 
-static const size_t kMaxByteSizeForHistogram = 100 * 1000 * 1000;
-static const int32_t kBucketCountForMessageSizeHistogram = 50;
-
 namespace blink {
 
 DOMWebSocket::EventQueue::EventQueue(EventTarget* target)
@@ -357,8 +354,6 @@ void DOMWebSocket::send(DOMArrayBuffer* binary_data,
     return;
   }
   RecordSendTypeHistogram(WebSocketSendType::kArrayBuffer);
-  RecordSendMessageSizeHistogram(WebSocketSendType::kArrayBuffer,
-                                 binary_data->ByteLengthAsSizeT());
   DCHECK(channel_);
   buffered_amount_ += binary_data->ByteLengthAsSizeT();
   channel_->Send(*binary_data, 0, binary_data->ByteLengthAsSizeT(),
@@ -380,8 +375,6 @@ void DOMWebSocket::send(NotShared<DOMArrayBufferView> array_buffer_view,
     return;
   }
   RecordSendTypeHistogram(WebSocketSendType::kArrayBufferView);
-  RecordSendMessageSizeHistogram(WebSocketSendType::kArrayBufferView,
-                                 array_buffer_view.View()->byteLengthAsSizeT());
   DCHECK(channel_);
   buffered_amount_ += array_buffer_view.View()->byteLengthAsSizeT();
   channel_->Send(*array_buffer_view.View()->buffer(),
@@ -404,9 +397,6 @@ void DOMWebSocket::send(Blob* binary_data, ExceptionState& exception_state) {
   }
   uint64_t size = binary_data->size();
   RecordSendTypeHistogram(WebSocketSendType::kBlob);
-  RecordSendMessageSizeHistogram(
-      WebSocketSendType::kBlob,
-      clampTo<size_t>(size, 0, kMaxByteSizeForHistogram));
   buffered_amount_ += size;
   DCHECK(channel_);
 
@@ -569,15 +559,12 @@ void DOMWebSocket::DidReceiveBinaryMessage(
       }
       auto* blob = MakeGarbageCollected<Blob>(
           BlobDataHandle::Create(std::move(blob_data), size));
-      RecordReceiveMessageSizeHistogram(WebSocketReceiveType::kBlob, size);
       event_queue_->Dispatch(MessageEvent::Create(blob, origin_string_));
       break;
     }
 
     case kBinaryTypeArrayBuffer:
       DOMArrayBuffer* array_buffer = DOMArrayBuffer::Create(data);
-      RecordReceiveMessageSizeHistogram(WebSocketReceiveType::kArrayBuffer,
-                                        size);
       event_queue_->Dispatch(
           MessageEvent::Create(array_buffer, origin_string_));
       break;
@@ -633,60 +620,6 @@ void DOMWebSocket::RecordSendTypeHistogram(WebSocketSendType type) {
   base::UmaHistogramEnumeration("WebCore.WebSocket.SendType", type);
 }
 
-void DOMWebSocket::RecordSendMessageSizeHistogram(WebSocketSendType type,
-                                                  size_t size) {
-  // Truncate |size| to avoid overflowing int32_t.
-  int32_t size_to_count = clampTo<int32_t>(size, 0, kMaxByteSizeForHistogram);
-  switch (type) {
-    case WebSocketSendType::kArrayBuffer:
-      base::UmaHistogramCustomCounts(
-          "WebCore.WebSocket.MessageSize.Send.ArrayBuffer", size_to_count, 1,
-          kMaxByteSizeForHistogram, kBucketCountForMessageSizeHistogram);
-      return;
-
-    case WebSocketSendType::kArrayBufferView:
-      base::UmaHistogramCustomCounts(
-          "WebCore.WebSocket.MessageSize.Send.ArrayBufferView", size_to_count,
-          1, kMaxByteSizeForHistogram, kBucketCountForMessageSizeHistogram);
-      return;
-
-    case WebSocketSendType::kBlob:
-      base::UmaHistogramCustomCounts("WebCore.WebSocket.MessageSize.Send.Blob",
-                                     size_to_count, 1, kMaxByteSizeForHistogram,
-                                     kBucketCountForMessageSizeHistogram);
-      return;
-
-    case WebSocketSendType::kString:
-      NOTREACHED();
-      return;
-  }
-  NOTREACHED();
-}
-
-void DOMWebSocket::RecordReceiveMessageSizeHistogram(WebSocketReceiveType type,
-                                                     size_t size) {
-  // Truncate |size| to avoid overflowing int32_t.
-  int32_t size_to_count = clampTo<int32_t>(size, 0, kMaxByteSizeForHistogram);
-  switch (type) {
-    case WebSocketReceiveType::kArrayBuffer:
-      base::UmaHistogramCustomCounts(
-          "WebCore.WebSocket.MessageSize.Receive.ArrayBuffer", size_to_count, 1,
-          kMaxByteSizeForHistogram, kBucketCountForMessageSizeHistogram);
-      return;
-
-    case WebSocketReceiveType::kBlob:
-      base::UmaHistogramCustomCounts(
-          "WebCore.WebSocket.MessageSize.Receive.Blob", size_to_count, 1,
-          kMaxByteSizeForHistogram, kBucketCountForMessageSizeHistogram);
-      return;
-
-    case WebSocketReceiveType::kString:
-      NOTREACHED();
-      return;
-  }
-  NOTREACHED();
-}
-
 void DOMWebSocket::Trace(Visitor* visitor) const {
   visitor->Trace(channel_);
   visitor->Trace(event_queue_);

third_party/blink/renderer/modules/websockets/dom_websocket.h

@@ -202,13 +202,6 @@ class MODULES_EXPORT DOMWebSocket
     kMaxValue = kBlob,
   };
 
-  enum class WebSocketReceiveType {
-    kString,
-    kArrayBuffer,
-    kBlob,
-    kMaxValue = kBlob,
-  };
-
   enum BinaryType { kBinaryTypeBlob, kBinaryTypeArrayBuffer };
 
   // This function is virtual for unittests.
@@ -244,8 +237,6 @@ class MODULES_EXPORT DOMWebSocket
 
   void ReleaseChannel();
   void RecordSendTypeHistogram(WebSocketSendType);
-  void RecordSendMessageSizeHistogram(WebSocketSendType, size_t);
-  void RecordReceiveMessageSizeHistogram(WebSocketReceiveType, size_t);
 
   Member<WebSocketChannel> channel_;
 

tools/metrics/histograms/histograms.xml

@@ -194382,6 +194382,9 @@ regressions. -->
 
 <histogram name="WebCore.WebSocket.MessageSize.Receive" units="bytes"
     expires_after="2020-09-06">
+  <obsolete>
+    Removed as of 2020-09
+  </obsolete>
   <owner>yhirano@chromium.org</owner>
   <owner>ricea@chromium.org</owner>
   <summary>
@@ -194392,6 +194395,9 @@ regressions. -->
 
 <histogram name="WebCore.WebSocket.MessageSize.Send" units="bytes"
     expires_after="2021-02-28">
+  <obsolete>
+    Removed as of 2020-09
+  </obsolete>
   <owner>yhirano@chromium.org</owner>
   <owner>ricea@chromium.org</owner>
   <summary>
@@ -219965,12 +219971,18 @@ regressions. -->
 </histogram_suffixes>
 
 <histogram_suffixes name="WebSocketMessageSizeReceive" separator=".">
+  <obsolete>
+    Removed as of 2020-09
+  </obsolete>
   <suffix name="ArrayBuffer" label=""/>
   <suffix name="Blob" label=""/>
   <affected-histogram name="WebCore.WebSocket.MessageSize.Receive"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="WebSocketMessageSizeSend" separator=".">
+  <obsolete>
+    Removed as of 2020-09
+  </obsolete>
   <suffix name="ArrayBuffer" label=""/>
   <suffix name="ArrayBufferView" label=""/>
   <suffix name="Blob" label=""/>