Update ServiceWorker event handled status histogram

content/browser/service_worker/service_worker_metrics.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_metrics.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
+#include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_client.h"
 
 namespace content {
 
 namespace {
 
 void RecordURLMetricOnUI(const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetContentClient()->browser()->RecordURLMetric(
       "ServiceWorker.ControlledPageUrl", url);
 }
 
+// Exclude NTP scope from UMA for now.
+// TOOD(kinuko): This should be temporary, revisit this once we have
+// better idea about what should be excluded in the UMA.
+// (UIThreadSearchTermsData::GoogleBaseURLValue() returns the google base
+// URL, but not available in content layer)
+bool IsGoogleLikeScope(const GURL& scope) {
+  const char google_like_scope_prefix[] = "https://www.google.";
+  return base::StartsWithASCII(scope.spec(), google_like_scope_prefix,
+                               false /* case sensitive */);

[falken, 2015/06/25 09:31:39]

StartsWithASCII with the bool param is now deprecated:
https://codereview.chromium.org/1182453004/

[kinuko, 2015/07/02 14:27:26]

Done.

+}
+
+enum EventHandledStatus {
+  EVENT_HANDLED,
+  EVENT_NOT_HANDLED,
+  EVENT_HANDLED_STATUS_MAX,

[falken, 2015/06/25 09:31:39]

nit: I slightly prefer NUM_TYPES over MAX. Some other enums use LAST, and then
pass "LAST + 1" to the histogram macro whereas we want to pass "MAX"
(CACHE_STORAGE_ERROR_LAST is an example). MAX and LAST seem easier to confuse
than NUM_TYPES.

[kinuko, 2015/07/02 14:27:26]

Done.

+};
+
+enum PerWorkerEventHandledStatus {
+  NO_EVENTS_HANDLED,
+  SOME_EVENTS_HANDLED,
+  ALL_EVENTS_HANDLED,
+  PER_WORKER_EVENT_HANDLED_STATUS_MAX,
+};
+
 }  // namespace
 
 void ServiceWorkerMetrics::CountInitDiskCacheResult(bool result) {
   UMA_HISTOGRAM_BOOLEAN("ServiceWorker.DiskCache.InitResult", result);
 }
 
 void ServiceWorkerMetrics::CountReadResponseResult(
     ServiceWorkerMetrics::ReadResponseResult result) {
   UMA_HISTOGRAM_ENUMERATION("ServiceWorker.DiskCache.ReadResponseResult",
                             result, NUM_READ_RESPONSE_RESULT_TYPES);
@@ skipping 72 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("ServiceWorker.ActivateEventStatus", status,
                             SERVICE_WORKER_ERROR_MAX_VALUE);
 }
 
 void ServiceWorkerMetrics::RecordInstallEventStatus(
     ServiceWorkerStatusCode status) {
   UMA_HISTOGRAM_ENUMERATION("ServiceWorker.InstallEventStatus", status,
                             SERVICE_WORKER_ERROR_MAX_VALUE);
 }
 
-void ServiceWorkerMetrics::RecordEventStatus(size_t fired_events,
-                                             size_t handled_events) {
-  if (!fired_events)
+void ServiceWorkerMetrics::RecordPerWorkerEventHandledStatus(
+    const GURL& scope,
+    EventType event,
+    size_t fired_events,
+    size_t handled_events) {
+  if (!fired_events || IsGoogleLikeScope(scope))
     return;
-  int unhandled_ratio = (fired_events - handled_events) * 100 / fired_events;
-  UMA_HISTOGRAM_PERCENTAGE("ServiceWorker.UnhandledEventRatio",
-                           unhandled_ratio);
+  PerWorkerEventHandledStatus status = SOME_EVENTS_HANDLED;
+  if (fired_events == handled_events)
+    status = ALL_EVENTS_HANDLED;
+  else if (handled_events == 0)
+    status = NO_EVENTS_HANDLED;
+  // For now Fetch is the only type that is recorded.
+  DCHECK_EQ(EVENT_TYPE_FETCH, event);
+  UMA_HISTOGRAM_ENUMERATION("ServiceWorker.EventHandledStatus.PerWorker.Fetch",
+                            status, PER_WORKER_EVENT_HANDLED_STATUS_MAX);
+}
+
+void ServiceWorkerMetrics::RecordEventHandledStatus(const GURL& scope,
+                                                    EventType event,
+                                                    bool handled) {
+  if (IsGoogleLikeScope(scope))
+    return;
+  EventHandledStatus handled_status =
+      handled ? EVENT_HANDLED : EVENT_NOT_HANDLED;
+  // For now Fetch is the only type that is recorded.
+  DCHECK_EQ(EVENT_TYPE_FETCH, event);
+  UMA_HISTOGRAM_ENUMERATION("ServiceWorker.EventHandledStatus.Fetch",
+                            handled_status, EVENT_HANDLED_STATUS_MAX);
 }
 
 void ServiceWorkerMetrics::RecordFetchEventStatus(
     bool is_main_resource,
     ServiceWorkerStatusCode status) {
   if (is_main_resource) {
     UMA_HISTOGRAM_ENUMERATION("ServiceWorker.FetchEvent.MainResource.Status",
                               status, SERVICE_WORKER_ERROR_MAX_VALUE);
   } else {
     UMA_HISTOGRAM_ENUMERATION("ServiceWorker.FetchEvent.Subresource.Status",
                               status, SERVICE_WORKER_ERROR_MAX_VALUE);
   }
 }
 
 void ServiceWorkerMetrics::RecordURLRequestJobResult(
     bool is_main_resource,
     URLRequestJobResult result) {
   if (is_main_resource) {
     UMA_HISTOGRAM_ENUMERATION("ServiceWorker.URLRequestJob.MainResource.Result",
                               result, NUM_REQUEST_JOB_RESULT_TYPES);
   } else {
     UMA_HISTOGRAM_ENUMERATION("ServiceWorker.URLRequestJob.Subresource.Result",
                               result, NUM_REQUEST_JOB_RESULT_TYPES);
   }
 }
 
 }  // namespace content