Record connection, registration, and receiving activities.

google_apis/gcm/monitoring/gcm_stats_recorder.cc

Index: google_apis/gcm/monitoring/gcm_stats_recorder.cc
diff --git a/google_apis/gcm/monitoring/gcm_stats_recorder.cc b/google_apis/gcm/monitoring/gcm_stats_recorder.cc
index 6e0cb48d7b57b0c0d0c6962886e71e77d47ba24b..8a2b942af1d3ca18cf1d5ff96e4d37c1058d48da 100644
--- a/google_apis/gcm/monitoring/gcm_stats_recorder.cc
+++ b/google_apis/gcm/monitoring/gcm_stats_recorder.cc
@@ -7,6 +7,7 @@
 #include <deque>
 #include <vector>
 
+#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ -54,6 +55,58 @@ std::string GetMessageSendStatusString(
   }
 }
 
+// Helper for getting string representation of the
+// ConnectionFactory::ConnectionResetReason enum.
+std::string GetConnectionResetReasonString(
+    gcm::ConnectionFactory::ConnectionResetReason reason) {
+  switch (reason) {
+    case gcm::ConnectionFactory::LOGIN_FAILURE:
+      return "LOGIN_FAILURE";
+    case gcm::ConnectionFactory::CLOSE_COMMAND:
+      return "CLOSE_COMMAND";
+    case gcm::ConnectionFactory::HEARTBEAT_FAILURE:
+      return "HEARTBEAT_FAILURE";
+    case gcm::ConnectionFactory::SOCKET_FAILURE:
+      return "SOCKET_FAILURE";
+    case gcm::ConnectionFactory::NETWORK_CHANGE:
+      return "NETWORK_CHANGE";
+    default:
+      NOTREACHED();
+      return "UNKNOWN_REASON";
+  }
+}
+
+// Helper for getting string representation of the RegistrationRequest::Status
+// enum.
+std::string GetRegistrationStatusString(
+    gcm::RegistrationRequest::Status status) {
+  switch (status) {
+    case gcm::RegistrationRequest::SUCCESS:
+      return "SUCCESS";
+    case gcm::RegistrationRequest::INVALID_PARAMETERS:
+      return "INVALID_PARAMETERS";
+    case gcm::RegistrationRequest::INVALID_SENDER:
+      return "INVALID_SENDER";
+    case gcm::RegistrationRequest::AUTHENTICATION_FAILED:
+      return "AUTHENTICATION_FAILED";
+    case gcm::RegistrationRequest::DEVICE_REGISTRATION_ERROR:
+      return "DEVICE_REGISTRATION_ERROR";
+    case gcm::RegistrationRequest::UNKNOWN_ERROR:
+      return "UNKNOWN_ERROR";
+    case gcm::RegistrationRequest::URL_FETCHING_FAILED:
+      return "URL_FETCHING_FAILED";
+    case gcm::RegistrationRequest::HTTP_NOT_OK:
+      return "HTTP_NOT_OK";
+    case gcm::RegistrationRequest::RESPONSE_PARSING_FAILED:
+      return "RESPONSE_PARSING_FAILED";
+    case gcm::RegistrationRequest::REACHED_MAX_RETRIES:
+      return "REACHED_MAX_RETRIES";
+    default:
+      NOTREACHED();
+      return "UNKNOWN_STATUS";
+  }
+}
+
 }  // namespace
 
 GCMStatsRecorder::Activity::Activity()
@@ -63,6 +116,25 @@ GCMStatsRecorder::Activity::Activity()
 GCMStatsRecorder::Activity::~Activity() {
 }
 
+GCMStatsRecorder::ConnectionActivity::ConnectionActivity() {
+}
+
+GCMStatsRecorder::ConnectionActivity::~ConnectionActivity() {
+}
+
+GCMStatsRecorder::RegistrationActivity::RegistrationActivity() {
+}
+
+GCMStatsRecorder::RegistrationActivity::~RegistrationActivity() {
+}
+
+GCMStatsRecorder::ReceivingActivity::ReceivingActivity() :

[jianli, 2014/04/23 17:22:35]

nit: ":" should be placed at the next line.

[juyik, 2014/04/23 21:36:56]

Done.

+    message_byte_size(0) {
+}
+
+GCMStatsRecorder::ReceivingActivity::~ReceivingActivity() {
+}
+
 GCMStatsRecorder::SendingActivity::SendingActivity() {
 }
 
@@ -83,11 +155,153 @@ void GCMStatsRecorder::Clear() {
   sending_activities_.clear();
 }
 
-void GCMStatsRecorder::CollectSendingActivities(
-    std::vector<SendingActivity>* activities) const {
-  activities->insert(activities->begin(),
-                     sending_activities_.begin(),
-                     sending_activities_.end());
+void GCMStatsRecorder::RecordConnection(
+    const std::string& event,
+    const std::string& details) {
+  ConnectionActivity data;
+  ConnectionActivity* inserted_data = InsertCircularBuffer(
+      &connection_activities_, data);
+  inserted_data->event = event;
+  inserted_data->details = details;
+}
+
+void GCMStatsRecorder::RecordConnectionInitiated(const std::string& host) {
+  if (is_recording_) {

[jianli, 2014/04/23 17:22:35]

nit: brackets not needed

[juyik, 2014/04/23 21:36:56]

Done.

+    RecordConnection("Connection initiated", host);
+  }
+}
+
+void GCMStatsRecorder::RecordConnectionDelayedDueToBackoff(int64 delay_msec) {
+  if (is_recording_) {
+    RecordConnection("Connection backoff",
+                     base::StringPrintf("Delayed for %" PRId64 " msec",
+                                        delay_msec));
+  }
+}
+
+void GCMStatsRecorder::RecordConnectionSuccess() {
+  if (is_recording_) {
+    RecordConnection("Connection succeeded", std::string());
+  }
+}
+
+void GCMStatsRecorder::RecordConnectionResetSignaled(
+      ConnectionFactory::ConnectionResetReason reason) {
+  if (is_recording_) {
+    RecordConnection("Connection reset",
+                     GetConnectionResetReasonString(reason));
+  }
+}
+
+void GCMStatsRecorder::RecordRegistration(
+    const std::string& android_id,
+    const std::string& app_id,
+    const std::string& sender_ids,
+    const std::string& event,
+    const std::string& details) {
+  RegistrationActivity data;
+  RegistrationActivity* inserted_data = InsertCircularBuffer(
+      &registration_activities_, data);
+  inserted_data->android_id = android_id;
+  inserted_data->app_id = app_id;
+  inserted_data->sender_ids = sender_ids;
+  inserted_data->event = event;
+  inserted_data->details = details;
+}
+
+void GCMStatsRecorder::RecordRegistrationSent(
+    const std::string& android_id,
+    const std::string& app_id,
+    const std::string& sender_ids) {
+  UMA_HISTOGRAM_COUNTS("GCM.RegistrationRequest", 1);
+  if (is_recording_) {
+    RecordRegistration(android_id, app_id, sender_ids,
+                       "Registration request sent", std::string());
+  }
+}
+
+void GCMStatsRecorder::RecordRegistrationResponse(
+    const std::string& android_id,
+    const std::string& app_id,
+    const std::vector<std::string>& sender_ids,
+    RegistrationRequest::Status status) {
+  if (is_recording_) {
+    RecordRegistration(android_id, app_id, JoinString(sender_ids, ","),
+                       "Registration response received",
+                       GetRegistrationStatusString(status));
+  }
+}
+
+void GCMStatsRecorder::RecordRegistrationRetryRequested(
+    const std::string& android_id,
+    const std::string& app_id,
+    const std::vector<std::string>& sender_ids,
+    int retries_left) {
+  if (is_recording_) {
+    RecordRegistration(android_id, app_id, JoinString(sender_ids, ","),
+                       "Registration retry requested",
+                       base::StringPrintf("Retries left: %d", retries_left));
+  }
+}
+
+void GCMStatsRecorder::RecordReceiving(
+    const std::string& app_id,
+    const std::string& from,
+    int message_byte_size,
+    const std::string& event,
+    const std::string& details) {
+  ReceivingActivity data;
+  ReceivingActivity* inserted_data = InsertCircularBuffer(
+      &receiving_activities_, data);
+  inserted_data->app_id = app_id;
+  inserted_data->from = from;
+  inserted_data->message_byte_size = message_byte_size;
+  inserted_data->event = event;
+  inserted_data->details = details;
+}
+
+void GCMStatsRecorder::RecordDataRecieved(
+    const std::string& app_id,
+    const std::string& from,
+    int message_byte_size,
+    bool to_registered_app) {
+  if (to_registered_app)
+    UMA_HISTOGRAM_COUNTS("GCM.DataMessageReceived", 1);
+  if (is_recording_) {
+    RecordReceiving(app_id, from, message_byte_size, "Data msg received",
+                    to_registered_app ? std::string() :
+                                        "No such registered app found");
+  }
+}
+
+void GCMStatsRecorder::RecordDataDeletedMessage(
+    const std::string& app_id,
+    const std::string& from,
+    int message_byte_size) {
+  UMA_HISTOGRAM_COUNTS("GCM.DataMessageDeletedOnServer", 1);
+  if (is_recording_) {
+    RecordReceiving(app_id, from, message_byte_size, "Data msg received",
+                    "Message has been deleted on server");
+  }
+}
+
+void GCMStatsRecorder::CollectActivities(
+    std::vector<ConnectionActivity>* connection_activities,
+    std::vector<RegistrationActivity>* registration_activities,
+    std::vector<ReceivingActivity>* receiving_activities,
+    std::vector<SendingActivity>* sending_activities) const {
+  connection_activities->insert(connection_activities->begin(),
+                                connection_activities_.begin(),
+                                connection_activities_.end());
+  registration_activities->insert(registration_activities->begin(),
+                                  registration_activities_.begin(),
+                                  registration_activities_.end());
+  receiving_activities->insert(receiving_activities->begin(),
+                               receiving_activities_.begin(),
+                               receiving_activities_.end());
+  sending_activities->insert(sending_activities->begin(),
+                             sending_activities_.begin(),
+                             sending_activities_.end());
 }
 
 void GCMStatsRecorder::RecordSending(const std::string& app_id,