Track merged nudge sources

sync/protocol/client_debug_info.proto

Index: sync/protocol/client_debug_info.proto
diff --git a/sync/protocol/client_debug_info.proto b/sync/protocol/client_debug_info.proto
index 7be62d5729a917c65b6afd1261323db51bd17839..b36e32006cddff192a9a2dda862a179966691a7e 100644
--- a/sync/protocol/client_debug_info.proto
+++ b/sync/protocol/client_debug_info.proto
@@ -13,6 +13,18 @@ package sync_pb;
 
 import "get_updates_caller_info.proto";
 
+// Information about hints sent with nudges.
+message TypeHint {
+  optional int32 data_type_id = 1;
+  optional string notification_hint = 2;

[Raz Mathias, 2012/11/27 21:52:18]

To your question above, a bool would be better -- I think since the notification
payload is already being sent separately it would be best not to resend it here.

+}
+
+// Information about the source that triggered a sync.
+message SourceInfo {
+  optional GetUpdatesCallerInfo.GetUpdatesSource source = 1;
+  repeated TypeHint type_hint = 2;
+}
+
 // The additional info here is from the StatusController. They get sent when
 // the event SYNC_CYCLE_COMPLETED  is sent.
 message SyncCycleCompletedEventInfo {
@@ -38,6 +50,8 @@ message SyncCycleCompletedEventInfo {
   optional int32 num_updates_downloaded = 8;
   optional int32 num_reflected_updates_downloaded = 9;
   optional GetUpdatesCallerInfo caller_info = 10;
+
+  repeated SourceInfo merged_source_info = 11;
 }
 
 // Datatype specifics statistics gathered at association time.