Update ServiceWorker event handled status histogram

content/browser/service_worker/service_worker_version.cc

 // Copyright 2013 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_version.h"
 
+#include <map>
+#include <string>
+
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
@@ skipping 371 matching lines @@
   stashed_port_manager->AddPort(service_worker.get(), message_port_id, name);
 }
 
 }  // namespace
 
 const int ServiceWorkerVersion::kStartWorkerTimeoutMinutes = 5;
 const int ServiceWorkerVersion::kRequestTimeoutMinutes = 5;
 
 class ServiceWorkerVersion::Metrics {
  public:
+  using EventType = ServiceWorkerMetrics::EventType;
   explicit Metrics(ServiceWorkerVersion* owner) : owner_(owner) {}
   ~Metrics() {
-    ServiceWorkerMetrics::RecordEventStatus(fired_events_, handled_events_);
+    for (const auto& ev : event_stats_) {
+      ServiceWorkerMetrics::RecordEventHandledRatio(owner_->scope(), ev.first,
+                                                    ev.second.handled_events,
+                                                    ev.second.fired_events);
+    }
   }
 
-  void RecordEventStatus(bool handled) {
-    ++fired_events_;
+  void RecordEventHandledStatus(EventType event, bool handled) {
+    event_stats_[event].fired_events++;
     if (handled)
-      ++handled_events_;
+      event_stats_[event].handled_events++;
   }
 
   void NotifyStopping() {
     stop_status_ = ServiceWorkerMetrics::STOP_STATUS_STOPPING;
   }
 
   void NotifyStopped() {
     switch (stop_status_) {
       case ServiceWorkerMetrics::STOP_STATUS_STOPPED:
       case ServiceWorkerMetrics::STOP_STATUS_STALLED_THEN_STOPPED:
@@ skipping 14 matching lines @@
 
   void NotifyStalledInStopping() {
     if (stop_status_ != ServiceWorkerMetrics::STOP_STATUS_STOPPING)
       return;
     stop_status_ = ServiceWorkerMetrics::STOP_STATUS_STALLED;
     if (IsInstalled(owner_->status()))
       ServiceWorkerMetrics::RecordStopWorkerStatus(stop_status_);
   }
 
  private:
+  struct EventStat {
+    size_t fired_events = 0;
+    size_t handled_events = 0;
+  };
+
   ServiceWorkerVersion* owner_;
-  size_t fired_events_ = 0;
-  size_t handled_events_ = 0;
+  std::map<EventType, EventStat> event_stats_;
   ServiceWorkerMetrics::StopWorkerStatus stop_status_ =
       ServiceWorkerMetrics::STOP_STATUS_STOPPING;
 
   DISALLOW_COPY_AND_ASSIGN(Metrics);
 };
 
 // A controller for periodically sending a ping to the worker to see
 // if the worker is not stalling.
 class ServiceWorkerVersion::PingController {
  public:
@@ skipping 55 matching lines @@
     const GURL& script_url,
     int64 version_id,
     base::WeakPtr<ServiceWorkerContextCore> context)
     : version_id_(version_id),
       registration_id_(registration->id()),
       script_url_(script_url),
       scope_(registration->pattern()),
       context_(context),
       script_cache_map_(this, context),
       ping_controller_(new PingController(this)),
-      metrics_(new Metrics(this)),
       weak_factory_(this) {
   DCHECK(context_);
   DCHECK(registration);
   context_->AddLiveVersion(this);
   embedded_worker_ = context_->embedded_worker_registry()->CreateWorker();
   embedded_worker_->AddListener(this);
 }
 
 ServiceWorkerVersion::~ServiceWorkerVersion() {
   // The user may have closed the tab waiting for SW to start up.
@@ skipping 814 matching lines @@
                "ServiceWorkerVersion::OnFetchEventFinished",
                "Request id", request_id);
   FetchCallback* callback = fetch_callbacks_.Lookup(request_id);
   if (!callback) {
     NOTREACHED() << "Got unexpected message: " << request_id;
     return;
   }
 
   // TODO(kinuko): Record other event statuses too.
   const bool handled = (result == SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE);
-  metrics_->RecordEventStatus(handled);
+  metrics_->RecordEventHandledStatus(ServiceWorkerMetrics::EVENT_TYPE_FETCH,
+                                     handled);
 
   scoped_refptr<ServiceWorkerVersion> protect(this);
   callback->Run(SERVICE_WORKER_OK, result, response);
   RemoveCallbackAndStopIfRedundant(&fetch_callbacks_, request_id);
 }
 
 void ServiceWorkerVersion::OnSyncEventFinished(
     int request_id,
     blink::WebServiceWorkerEventResult result) {
   TRACE_EVENT1("ServiceWorker",
@@ skipping 387 matching lines @@
       }
       // Keep the live registration while starting the worker.
       start_callbacks_.push_back(
           base::Bind(&RunStartWorkerCallback, callback, protect));
       StartWorkerInternal(pause_after_download);
       return;
   }
 }
 
 void ServiceWorkerVersion::StartWorkerInternal(bool pause_after_download) {
+  if (!metrics_)
+    metrics_.reset(new Metrics(this));
   if (!timeout_timer_.IsRunning())
     StartTimeoutTimer();
   if (running_status() == STOPPED) {
     embedded_worker_->Start(
         version_id_, scope_, script_url_, pause_after_download,
         base::Bind(&ServiceWorkerVersion::OnStartSentAndScriptEvaluated,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
@@ skipping 352 matching lines @@
     return;
   context_->UpdateServiceWorker(registration.get(),
                                 false /* force_bypass_cache */);
 }
 
 void ServiceWorkerVersion::OnStoppedInternal(
     EmbeddedWorkerInstance::Status old_status) {
   DCHECK_EQ(STOPPED, running_status());
   scoped_refptr<ServiceWorkerVersion> protect(this);
 
+  DCHECK(metrics_);
+  metrics_.reset();
+
   bool should_restart = !is_redundant() && !start_callbacks_.empty() &&
                         (old_status != EmbeddedWorkerInstance::STARTING);
 
   ClearTick(&stop_time_);
   StopTimeoutTimer();
 
   if (ping_controller_->IsTimedOut())
     should_restart = false;
 
   // Fire all stop callbacks.
@@ skipping 26 matching lines @@
 
   streaming_url_request_jobs_.clear();
 
   FOR_EACH_OBSERVER(Listener, listeners_, OnRunningStateChanged(this));
 
   if (should_restart)
     StartWorkerInternal(false /* pause_after_download */);
 }
 
 }  // namespace content