Bug 1520260 - Collect *_KBREAD_PER_CONN on release as well. r=valentin
authorDragana Damjanovic <dd.mozilla@gmail.com>
Wed, 16 Jan 2019 09:21:53 +0000
changeset 514136 317bb711eb47b5108a8d779505757e860f33c3cf
parent 514135 5a384547b8b35e566a1afa2398067c82244091ba
child 514137 2677d2e45ead735f352edc4ef3d46c4ce9d2e9ce
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin
bugs1520260
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1520260 - Collect *_KBREAD_PER_CONN on release as well. r=valentin 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
@@ -1560,21 +1560,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,
@@ -2497,22 +2500,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",
@@ -734,17 +733,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",
@@ -996,17 +994,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",