Add more UMAs for Instance ID

google_apis/gcm/engine/gcm_store_impl.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/gcm_store_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/tracked_objects.h"
 #include "google_apis/gcm/base/encryptor.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "third_party/leveldatabase/env_chromium.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
@@ skipping 299 matching lines @@
   LoadStatus load_status = OpenStoreAndLoadData(result.get());
   UMA_HISTOGRAM_ENUMERATION("GCM.LoadStatus", load_status, LOAD_STATUS_COUNT);
   if (load_status != LOADING_SUCCEEDED) {
     result->Reset();
     foreground_task_runner_->PostTask(FROM_HERE,
                                       base::Bind(callback,
                                                  base::Passed(&result)));
     return;
   }
 
+  // |result->registrations| contains both GCM registrations and InstanceID
+  // tokens. Count them separately.
+  int gcm_registration_count = 0;
+  int instance_id_token_count = 0;
+  for (auto iter = result->registrations.begin();
+       iter != result->registrations.end();
+       ++iter) {

[Alexei Svitkine (slow), 2015/06/04 18:59:32]

Nit: Use C++ for loop:

for (const auto& entry : result->registrations) {
  if (StartsWithASCII(entry.first, ...
}

[jianli, 2015/06/04 20:50:21]

Done.

+    if (StartsWithASCII(iter->first, "iid-", true))
+      instance_id_token_count++;
+    else
+      gcm_registration_count++;
+  }
+
   // Only record histograms if GCM had already been set up for this device.
   if (result->device_android_id != 0 && result->device_security_token != 0) {
     int64 file_size = 0;
     if (base::GetFileSize(path_, &file_size)) {
       UMA_HISTOGRAM_COUNTS("GCM.StoreSizeKB",
                            static_cast<int>(file_size / 1024));
     }
-    UMA_HISTOGRAM_COUNTS("GCM.RestoredRegistrations",
-                         result->registrations.size());
+
+    UMA_HISTOGRAM_COUNTS("GCM.RestoredRegistrations", gcm_registration_count);
     UMA_HISTOGRAM_COUNTS("GCM.RestoredOutgoingMessages",
                          result->outgoing_messages.size());
     UMA_HISTOGRAM_COUNTS("GCM.RestoredIncomingMessages",
                          result->incoming_messages.size());
+
+    UMA_HISTOGRAM_COUNTS("InstanceID.RestoredTokens", instance_id_token_count);
+    UMA_HISTOGRAM_COUNTS("InstanceID.RestoredIDs",
+                         result->instance_id_data.size());
   }
 
-  DVLOG(1) << "Succeeded in loading " << result->registrations.size()
-           << " registrations, "
+  DVLOG(1) << "Succeeded in loading "
+           << gcm_registration_count << " GCM registrations, "
            << result->incoming_messages.size()
-           << " unacknowledged incoming messages and "
+           << " unacknowledged incoming messages "
            << result->outgoing_messages.size()
-           << " unacknowledged outgoing messages.";
+           << " unacknowledged outgoing messages, "
+           << result->instance_id_data.size() << " Instance IDs, "
+           << instance_id_token_count << " InstanceID tokens.";
   result->success = true;
   foreground_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(callback,
                                                base::Passed(&result)));
   return;
 }
 
 void GCMStoreImpl::Backend::Close() {
   DVLOG(1) << "Closing GCM store.";
   db_.reset();
@@ skipping 1068 matching lines @@
            removed_message_counts.begin();
        iter != removed_message_counts.end(); ++iter) {
     DCHECK_NE(app_message_counts_.count(iter->first), 0U);
     app_message_counts_[iter->first] -= iter->second;
     DCHECK_GE(app_message_counts_[iter->first], 0);
   }
   callback.Run(true);
 }
 
 }  // namespace gcm