Add more UMAs for Instance ID

google_apis/gcm/engine/registration_request.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 "google_apis/gcm/engine/registration_request.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 47 matching lines @@
 // last request.
 bool ShouldRetryWithStatus(RegistrationRequest::Status status) {
   return status == RegistrationRequest::UNKNOWN_ERROR ||
          status == RegistrationRequest::AUTHENTICATION_FAILED ||
          status == RegistrationRequest::DEVICE_REGISTRATION_ERROR ||
          status == RegistrationRequest::HTTP_NOT_OK ||
          status == RegistrationRequest::URL_FETCHING_FAILED ||
          status == RegistrationRequest::RESPONSE_PARSING_FAILED;
 }
 
-void RecordRegistrationStatusToUMA(RegistrationRequest::Status status) {
-  UMA_HISTOGRAM_ENUMERATION("GCM.RegistrationRequestStatus", status,
-                            RegistrationRequest::STATUS_COUNT);
-}
-
 }  // namespace
 
 RegistrationRequest::RequestInfo::RequestInfo(
     uint64 android_id,
     uint64 security_token,
     const std::string& app_id)
     : android_id(android_id),
       security_token(security_token),
       app_id(app_id) {
   DCHECK(android_id != 0UL);
@@ skipping 138 matching lines @@
                 << source->GetResponseCode();
     return HTTP_NOT_OK;
   }
 
   return UNKNOWN_ERROR;
 }
 
 void RegistrationRequest::OnURLFetchComplete(const net::URLFetcher* source) {
   std::string token;
   Status status = ParseResponse(source, &token);
-  RecordRegistrationStatusToUMA(status);
   recorder_->RecordRegistrationResponse(
       request_info_.app_id,
       source_to_record_,
       status);
 
+  DCHECK(custom_request_handler_.get());
+  custom_request_handler_->ReportUMAs(
+      status,
+      backoff_entry_.failure_count(),
+      base::TimeTicks::Now() - request_start_time_);
+
   if (ShouldRetryWithStatus(status)) {
     if (retries_left_ > 0) {
       recorder_->RecordRegistrationRetryRequested(
           request_info_.app_id,
           source_to_record_,
           retries_left_);
       RetryWithBackoff(true);
       return;
     }
 
     status = REACHED_MAX_RETRIES;
     recorder_->RecordRegistrationResponse(
         request_info_.app_id,
         source_to_record_,
         status);
-    RecordRegistrationStatusToUMA(status);
+
+    // Only REACHED_MAX_RETRIES is reported because the function will skip
+    // reporting count and time when status is not SUCCESS.
+    DCHECK(custom_request_handler_.get());
+    custom_request_handler_->ReportUMAs(status, 0, base::TimeDelta());
   }
 
-  if (status == SUCCESS) {
-    UMA_HISTOGRAM_COUNTS("GCM.RegistrationRetryCount",
-                         backoff_entry_.failure_count());
-    UMA_HISTOGRAM_TIMES("GCM.RegistrationCompleteTime",
-                        base::TimeTicks::Now() - request_start_time_);
-  }
   callback_.Run(status, token);
 }
 
 }  // namespace gcm