Bug 1520260 - Collect *_KBREAD_PER_CONN on release as well. r=valentin, a=RyanVM
authorDragana Damjanovic <dd.mozilla@gmail.com>
Wed, 16 Jan 2019 09:21:53 +0000
changeset 506763 e71504cbe594bbda84395ce67c323adc0b855b23
parent 506762 01bd5daff7e0667df22541e13dc1c8b125124d66
child 506764 5e7a2d9c3127712f4d5191d9c800a94d123f2fab
push id10535
push userryanvm@gmail.com
push dateThu, 17 Jan 2019 17:33:03 +0000
treeherdermozilla-beta@e71504cbe594 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin, RyanVM
bugs1520260
milestone65.0
Bug 1520260 - Collect *_KBREAD_PER_CONN on release as well. r=valentin, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D16616
netwerk/protocol/http/nsHttpConnection.cpp
toolkit/components/telemetry/Histograms.json
toolkit/components/telemetry/histogram-whitelists.json
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -144,18 +144,18 @@ nsHttpConnection::~nsHttpConnection() {
                             mHttp1xTransactionCount);
     }
   }
 
   if (mTotalBytesRead) {
     uint32_t totalKBRead = static_cast<uint32_t>(mTotalBytesRead >> 10);
     LOG(("nsHttpConnection %p read %dkb on connection spdy=%d\n", this,
          totalKBRead, mEverUsedSpdy));
-    Telemetry::Accumulate(mEverUsedSpdy ? Telemetry::SPDY_KBREAD_PER_CONN
-                                        : Telemetry::HTTP_KBREAD_PER_CONN,
+    Telemetry::Accumulate(mEverUsedSpdy ? Telemetry::SPDY_KBREAD_PER_CONN2
+                                        : Telemetry::HTTP_KBREAD_PER_CONN2,
                           totalKBRead);
   }
   if (mForceSendTimer) {
     mForceSendTimer->Cancel();
     mForceSendTimer = nullptr;
   }
 
   if ((mFastOpenStatus != TFO_FAILED) && (mFastOpenStatus != TFO_HTTP) &&
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -1516,21 +1516,24 @@
   "HTTP_REQUEST_PER_CONN": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50,
     "description": "HTTP: requests per connection"
   },
-  "HTTP_KBREAD_PER_CONN": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
+  "HTTP_KBREAD_PER_CONN2": {
+    "record_in_processes": ["main", "content"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
+    "bug_numbers": [1520260],
+    "kind": "exponential",
+    "high": 100000,
     "n_buckets": 50,
     "description": "HTTP: KB read per connection"
   },
   "HTTP_PAGE_DNS_ISSUE_TIME": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 30000,
@@ -2461,22 +2464,24 @@
   },
   "SPDY_NPN_JOIN": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["necko@mozilla.com"],
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "SPDY: Coalesce Succeeded"
   },
-  "SPDY_KBREAD_PER_CONN": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["necko@mozilla.com"],
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 3000,
+  "SPDY_KBREAD_PER_CONN2": {
+    "record_in_processes": ["main", "content"],
+    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "bug_numbers": [1520260],
+    "kind": "exponential",
+    "high": 100000,
     "n_buckets": 50,
     "description": "SPDY: KB read per connection"
   },
   "SPDY_SETTINGS_MAX_STREAMS": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["necko@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -193,17 +193,16 @@
     "HTTPCONNMGR_UNUSED_SPECULATIVE_CONN",
     "HTTPCONNMGR_USED_SPECULATIVE_CONN",
     "HTTP_CACHE_DISPOSITION_2_V2",
     "HTTP_CACHE_ENTRY_ALIVE_TIME",
     "HTTP_CACHE_ENTRY_RELOAD_TIME",
     "HTTP_CACHE_ENTRY_REUSE_COUNT",
     "HTTP_CONNECTION_ENTRY_CACHE_HIT_1",
     "HTTP_DISK_CACHE_OVERHEAD",
-    "HTTP_KBREAD_PER_CONN",
     "HTTP_OFFLINE_CACHE_DOCUMENT_LOAD",
     "HTTP_PAGE_CACHE_READ_TIME_V2",
     "HTTP_PAGE_COMPLETE_LOAD_CACHED_V2",
     "HTTP_PAGE_COMPLETE_LOAD_NET_V2",
     "HTTP_PAGE_COMPLETE_LOAD_V2",
     "HTTP_PAGE_DNS_ISSUE_TIME",
     "HTTP_PAGE_FIRST_SENT_TO_LAST_RECEIVED",
     "HTTP_PAGE_OPEN_TO_FIRST_FROM_CACHE_V2",
@@ -736,17 +735,16 @@
     "HTTPCONNMGR_USED_SPECULATIVE_CONN",
     "HTTP_CACHE_DISPOSITION_2_V2",
     "HTTP_CACHE_ENTRY_ALIVE_TIME",
     "HTTP_CACHE_ENTRY_RELOAD_TIME",
     "HTTP_CACHE_ENTRY_REUSE_COUNT",
     "HTTP_CONNECTION_ENTRY_CACHE_HIT_1",
     "HTTP_CONTENT_ENCODING",
     "HTTP_DISK_CACHE_OVERHEAD",
-    "HTTP_KBREAD_PER_CONN",
     "HTTP_OFFLINE_CACHE_DOCUMENT_LOAD",
     "HTTP_PAGE_CACHE_READ_TIME_V2",
     "HTTP_PAGE_COMPLETE_LOAD_CACHED_V2",
     "HTTP_PAGE_COMPLETE_LOAD_NET_V2",
     "HTTP_PAGE_COMPLETE_LOAD_V2",
     "HTTP_PAGE_DNS_ISSUE_TIME",
     "HTTP_PAGE_DNS_LOOKUP_TIME",
     "HTTP_PAGE_FIRST_SENT_TO_LAST_RECEIVED",
@@ -1000,17 +998,16 @@
     "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
     "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
     "SLOW_ADDON_WARNING_RESPONSE_TIME",
     "SLOW_ADDON_WARNING_STATES",
     "SLOW_SCRIPT_NOTICE_COUNT",
     "SPDY_CHUNK_RECVD",
     "SPDY_GOAWAY_LOCAL",
     "SPDY_GOAWAY_PEER",
-    "SPDY_KBREAD_PER_CONN",
     "SPDY_NPN_CONNECT",
     "SPDY_NPN_JOIN",
     "SPDY_PARALLEL_STREAMS",
     "SPDY_REQUEST_PER_CONN",
     "SPDY_SERVER_INITIATED_STREAMS",
     "SPDY_SETTINGS_IW",
     "SPDY_SETTINGS_MAX_STREAMS",
     "SPDY_SYN_RATIO",