Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: net/http/http_network_transaction.cc

Issue 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/transport_security_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 5f7fcab47884fc1878f0249367fb28de1fc22582..d29342e6bc889479affa1f63730a553ba1da35fd 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -64,9 +64,6 @@
#include "url/gurl.h"
#include "url/url_canon.h"
-using base::Time;
-using base::TimeDelta;
-
namespace net {
namespace {
@@ -133,7 +130,6 @@ HttpNetworkTransaction::HttpNetworkTransaction(RequestPriority priority,
request_(NULL),
priority_(priority),
headers_valid_(false),
- logged_response_time_(false),
fallback_error_code_(ERR_SSL_INAPPROPRIATE_FALLBACK),
request_headers_(),
read_buf_len_(0),
@@ -184,7 +180,6 @@ int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
net_log_ = net_log;
request_ = request_info;
- start_time_ = base::Time::Now();
if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) {
server_ssl_config_.rev_checking_enabled = false;
@@ -986,12 +981,6 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
return OK;
}
- // After we call RestartWithAuth a new response_time will be recorded, and
- // we need to be cautious about incorrectly logging the duration across the
- // authentication activity.
- if (result == OK)
- LogTransactionConnectedMetrics();
-
// ERR_CONNECTION_CLOSED is treated differently at this point; if partial
// response headers were received, we do the best we can to make sense of it
// and send it back up the stack.
@@ -1116,7 +1105,6 @@ int HttpNetworkTransaction::DoReadBodyComplete(int result) {
// Clean up connection if we are done.
if (done) {
- LogTransactionMetrics();
stream_->Close(!keep_alive);
// Note: we don't reset the stream here. We've closed it, but we still
// need it around so that callers can call methods such as
@@ -1168,72 +1156,6 @@ int HttpNetworkTransaction::DoDrainBodyForAuthRestartComplete(int result) {
return OK;
}
-void HttpNetworkTransaction::LogTransactionConnectedMetrics() {
- if (logged_response_time_)
- return;
-
- logged_response_time_ = true;
-
- base::TimeDelta total_duration = response_.response_time - start_time_;
-
- UMA_HISTOGRAM_CUSTOM_TIMES(
- "Net.Transaction_Connected",
- total_duration,
- base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
- 100);
-
- bool reused_socket = stream_->IsConnectionReused();
- if (!reused_socket) {
- UMA_HISTOGRAM_CUSTOM_TIMES(
- "Net.Transaction_Connected_New_b",
- total_duration,
- base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
- 100);
- }
-
- // Currently, non-HIGHEST priority requests are frame or sub-frame resource
- // types. This will change when we also prioritize certain subresources like
- // css, js, etc.
- if (priority_ != HIGHEST) {
- UMA_HISTOGRAM_CUSTOM_TIMES(
- "Net.Priority_High_Latency_b",
- total_duration,
- base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
- 100);
- } else {
- UMA_HISTOGRAM_CUSTOM_TIMES(
- "Net.Priority_Low_Latency_b",
- total_duration,
- base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
- 100);
- }
-}
-
-void HttpNetworkTransaction::LogTransactionMetrics() const {
- base::TimeDelta duration = base::Time::Now() -
- response_.request_time;
- if (60 < duration.InMinutes())
- return;
-
- base::TimeDelta total_duration = base::Time::Now() - start_time_;
-
- UMA_HISTOGRAM_CUSTOM_TIMES("Net.Transaction_Latency_b", duration,
- base::TimeDelta::FromMilliseconds(1),
- base::TimeDelta::FromMinutes(10),
- 100);
- UMA_HISTOGRAM_CUSTOM_TIMES("Net.Transaction_Latency_Total",
- total_duration,
- base::TimeDelta::FromMilliseconds(1),
- base::TimeDelta::FromMinutes(10), 100);
-
- if (!stream_->IsConnectionReused()) {
- UMA_HISTOGRAM_CUSTOM_TIMES(
- "Net.Transaction_Latency_Total_New_Connection",
- total_duration, base::TimeDelta::FromMilliseconds(1),
- base::TimeDelta::FromMinutes(10), 100);
- }
-}
-
int HttpNetworkTransaction::HandleCertificateRequest(int error) {
// There are two paths through which the server can request a certificate
// from us. The first is during the initial handshake, the second is
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/transport_security_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698