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

Side by Side Diff: extensions/browser/api/web_request/web_request_api.cc

Issue 2708923005: Extensions: Add metrics for Web Request API actions. (Closed)
Patch Set: Correct comment. Created 3 years, 10 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/web_request/web_request_api.h" 5 #include "extensions/browser/api/web_request/web_request_api.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 namespace helpers = extension_web_request_api_helpers; 80 namespace helpers = extension_web_request_api_helpers;
81 namespace keys = extension_web_request_api_constants; 81 namespace keys = extension_web_request_api_constants;
82 82
83 namespace extensions { 83 namespace extensions {
84 84
85 namespace declarative_keys = declarative_webrequest_constants; 85 namespace declarative_keys = declarative_webrequest_constants;
86 namespace web_request = api::web_request; 86 namespace web_request = api::web_request;
87 87
88 namespace { 88 namespace {
89 89
90 // Describes the action taken by the Web Request API for a given stage of a web
91 // request.
92 // These values are written to logs. New enum values can be added, but existing
93 // enum values must never be renumbered or deleted and reused.
94 enum RequestAction {
95 CANCEL = 0,
96 REDIRECT = 1,
97 MODIFY_REQUEST_HEADERS = 2,
98 MODIFY_RESPONSE_HEADERS = 3,
99 SET_AUTH_CREDENTIALS = 4,
100 MAX
101 };
102
90 const char kWebRequestEventPrefix[] = "webRequest."; 103 const char kWebRequestEventPrefix[] = "webRequest.";
104 const char kWebRequestActionUMA[] = "Extensions.WebRequestAction";
91 105
92 // List of all the webRequest events. 106 // List of all the webRequest events.
93 const char* const kWebRequestEvents[] = { 107 const char* const kWebRequestEvents[] = {
94 keys::kOnBeforeRedirectEvent, 108 keys::kOnBeforeRedirectEvent,
95 web_request::OnBeforeRequest::kEventName, 109 web_request::OnBeforeRequest::kEventName,
96 keys::kOnBeforeSendHeadersEvent, 110 keys::kOnBeforeSendHeadersEvent,
97 keys::kOnCompletedEvent, 111 keys::kOnCompletedEvent,
98 web_request::OnErrorOccurred::kEventName, 112 web_request::OnErrorOccurred::kEventName,
99 keys::kOnSendHeadersEvent, 113 keys::kOnSendHeadersEvent,
100 keys::kOnAuthRequiredEvent, 114 keys::kOnAuthRequiredEvent,
(...skipping 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 blocked_request.net_log); 1823 blocked_request.net_log);
1810 1824
1811 WarningSet warnings; 1825 WarningSet warnings;
1812 if (blocked_request.event == kOnBeforeRequest) { 1826 if (blocked_request.event == kOnBeforeRequest) {
1813 CHECK(!blocked_request.callback.is_null()); 1827 CHECK(!blocked_request.callback.is_null());
1814 helpers::MergeOnBeforeRequestResponses( 1828 helpers::MergeOnBeforeRequestResponses(
1815 blocked_request.request->url(), blocked_request.response_deltas, 1829 blocked_request.request->url(), blocked_request.response_deltas,
1816 blocked_request.new_url, &warnings, blocked_request.net_log); 1830 blocked_request.new_url, &warnings, blocked_request.net_log);
1817 } else if (blocked_request.event == kOnBeforeSendHeaders) { 1831 } else if (blocked_request.event == kOnBeforeSendHeaders) {
1818 CHECK(!blocked_request.callback.is_null()); 1832 CHECK(!blocked_request.callback.is_null());
1833 bool request_headers_modified = false;
1819 helpers::MergeOnBeforeSendHeadersResponses( 1834 helpers::MergeOnBeforeSendHeadersResponses(
1820 blocked_request.response_deltas, 1835 blocked_request.response_deltas, blocked_request.request_headers,
1821 blocked_request.request_headers, 1836 &warnings, blocked_request.net_log, &request_headers_modified);
1822 &warnings, 1837 if (request_headers_modified)
Devlin 2017/02/24 21:43:43 nit: { } around multi-line if statement bodies.
karandeepb 2017/02/25 03:55:19 Done.
1823 blocked_request.net_log); 1838 UMA_HISTOGRAM_ENUMERATION(kWebRequestActionUMA,
1839 RequestAction::MODIFY_REQUEST_HEADERS,
1840 RequestAction::MAX);
1824 } else if (blocked_request.event == kOnHeadersReceived) { 1841 } else if (blocked_request.event == kOnHeadersReceived) {
1825 CHECK(!blocked_request.callback.is_null()); 1842 CHECK(!blocked_request.callback.is_null());
1843 bool response_headers_modified = false;
1826 helpers::MergeOnHeadersReceivedResponses( 1844 helpers::MergeOnHeadersReceivedResponses(
1827 blocked_request.request->url(), blocked_request.response_deltas, 1845 blocked_request.request->url(), blocked_request.response_deltas,
1828 blocked_request.original_response_headers.get(), 1846 blocked_request.original_response_headers.get(),
1829 blocked_request.override_response_headers, blocked_request.new_url, 1847 blocked_request.override_response_headers, blocked_request.new_url,
1830 &warnings, blocked_request.net_log); 1848 &warnings, blocked_request.net_log, &response_headers_modified);
1849 if (response_headers_modified)
1850 UMA_HISTOGRAM_ENUMERATION(kWebRequestActionUMA,
1851 RequestAction::MODIFY_RESPONSE_HEADERS,
1852 RequestAction::MAX);
1831 } else if (blocked_request.event == kOnAuthRequired) { 1853 } else if (blocked_request.event == kOnAuthRequired) {
1832 CHECK(blocked_request.callback.is_null()); 1854 CHECK(blocked_request.callback.is_null());
1833 CHECK(!blocked_request.auth_callback.is_null()); 1855 CHECK(!blocked_request.auth_callback.is_null());
1834 credentials_set = helpers::MergeOnAuthRequiredResponses( 1856 credentials_set = helpers::MergeOnAuthRequiredResponses(
1835 blocked_request.response_deltas, 1857 blocked_request.response_deltas,
1836 blocked_request.auth_credentials, 1858 blocked_request.auth_credentials,
1837 &warnings, 1859 &warnings,
1838 blocked_request.net_log); 1860 blocked_request.net_log);
1839 } else { 1861 } else {
1840 NOTREACHED(); 1862 NOTREACHED();
1841 } 1863 }
1842 1864
1843 SendMessages(browser_context, blocked_request, navigation_ui_data); 1865 SendMessages(browser_context, blocked_request, navigation_ui_data);
1844 1866
1845 if (!warnings.empty()) { 1867 if (!warnings.empty()) {
1846 BrowserThread::PostTask( 1868 BrowserThread::PostTask(
1847 BrowserThread::UI, 1869 BrowserThread::UI,
1848 FROM_HERE, 1870 FROM_HERE,
1849 base::Bind(&WarningService::NotifyWarningsOnUI, 1871 base::Bind(&WarningService::NotifyWarningsOnUI,
1850 browser_context, warnings)); 1872 browser_context, warnings));
1851 } 1873 }
1852 1874
1853 if (canceled) { 1875 if (canceled) {
1854 request_time_tracker_->SetRequestCanceled(request_id); 1876 request_time_tracker_->SetRequestCanceled(request_id);
1855 } else if (blocked_request.new_url && 1877 UMA_HISTOGRAM_ENUMERATION(kWebRequestActionUMA, RequestAction::CANCEL,
1856 !blocked_request.new_url->is_empty()) { 1878 RequestAction::MAX);
1879 } else if (blocked_request.new_url && !blocked_request.new_url->is_empty()) {
1857 request_time_tracker_->SetRequestRedirected(request_id); 1880 request_time_tracker_->SetRequestRedirected(request_id);
1881 UMA_HISTOGRAM_ENUMERATION(kWebRequestActionUMA, RequestAction::REDIRECT,
1882 RequestAction::MAX);
1883 } else if (credentials_set) {
1884 UMA_HISTOGRAM_ENUMERATION(kWebRequestActionUMA,
1885 RequestAction::SET_AUTH_CREDENTIALS,
1886 RequestAction::MAX);
1858 } 1887 }
1859 1888
1860 // This triggers onErrorOccurred if canceled is true. 1889 // This triggers onErrorOccurred if canceled is true.
1861 int rv = canceled ? net::ERR_BLOCKED_BY_CLIENT : net::OK; 1890 int rv = canceled ? net::ERR_BLOCKED_BY_CLIENT : net::OK;
1862 1891
1863 if (!blocked_request.callback.is_null()) { 1892 if (!blocked_request.callback.is_null()) {
1864 net::CompletionCallback callback = blocked_request.callback; 1893 net::CompletionCallback callback = blocked_request.callback;
1865 // Ensure that request is removed before callback because the callback 1894 // Ensure that request is removed before callback because the callback
1866 // might trigger the next event. 1895 // might trigger the next event.
1867 blocked_requests_.erase(request_id); 1896 blocked_requests_.erase(request_id);
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
2390 // Since EventListeners are segmented by browser_context, check that 2419 // Since EventListeners are segmented by browser_context, check that
2391 // last, as it is exceedingly unlikely to be different. 2420 // last, as it is exceedingly unlikely to be different.
2392 return extension_id == that.extension_id && 2421 return extension_id == that.extension_id &&
2393 sub_event_name == that.sub_event_name && 2422 sub_event_name == that.sub_event_name &&
2394 web_view_instance_id == that.web_view_instance_id && 2423 web_view_instance_id == that.web_view_instance_id &&
2395 embedder_process_id == that.embedder_process_id && 2424 embedder_process_id == that.embedder_process_id &&
2396 browser_context == that.browser_context; 2425 browser_context == that.browser_context;
2397 } 2426 }
2398 2427
2399 } // namespace extensions 2428 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698