summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 22:15:17 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 22:15:17 +0000
commitd78cf436e287e2362e6949da21d7f25284b27b41 (patch)
tree9095a73f9bf3388629b5186fc05f91664044a175
parenteaeafc635953e5a48d15862c451de93ea21048f3 (diff)
downloadchromium_src-d78cf436e287e2362e6949da21d7f25284b27b41.zip
chromium_src-d78cf436e287e2362e6949da21d7f25284b27b41.tar.gz
chromium_src-d78cf436e287e2362e6949da21d7f25284b27b41.tar.bz2
Merge 259310 "Add histogram Net.QuicSession.SecureResourceSecure..."
> Add histogram Net.QuicSession.SecureResourceSecureSession > to track request for secure resources over insecure connections. > > R=jar@chromium.org > > Review URL: https://codereview.chromium.org/211123003 TBR=rch@chromium.org Review URL: https://codereview.chromium.org/215643002 git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@260012 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/quic/quic_http_stream.cc7
-rw-r--r--tools/metrics/histograms/histograms.xml8
2 files changed, 13 insertions, 2 deletions
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index 8b70d0b..f7cd5de 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -5,6 +5,7 @@
#include "net/quic/quic_http_stream.h"
#include "base/callback_helpers.h"
+#include "base/metrics/histogram.h"
#include "base/strings/stringprintf.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -61,9 +62,11 @@ int QuicHttpStream::InitializeStream(const HttpRequestInfo* request_info,
if (request_info->url.SchemeIsSecure()) {
SSLInfo ssl_info;
- if (!session_->GetSSLInfo(&ssl_info) || !ssl_info.cert) {
+ bool secure_session = session_->GetSSLInfo(&ssl_info) && ssl_info.cert;
+ UMA_HISTOGRAM_BOOLEAN("Net.QuicSession.SecureResourceSecureSession",
+ secure_session);
+ if (!secure_session)
return ERR_REQUEST_FOR_SECURE_RESOURCE_OVER_INSECURE_QUIC;
- }
}
stream_net_log_ = stream_net_log;
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 4dc9394..0b31f2c 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -9890,6 +9890,14 @@ other types of suffix sets.
</summary>
</histogram>
+<histogram name="Net.QuicSession.SecureResourceSecureSession">
+ <owner>rch@chromium.org.</owner>
+ <summary>
+ The number of request for secure resources over QUIC sessions. True if the
+ session is secure, false if it is not.
+ </summary>
+</histogram>
+
<histogram name="Net.QuicSession.TruncatedAcksReceived">
<summary>The number of truncated ACK frames received.</summary>
</histogram>