[Sync] Declare Sync.*ConfigureFailure and Sync.*AssociationTime by suffixes

These histograms were declared manually for all data types. As a result,
many of them (for newer data types) were missing. This CL uses histogram
suffixes instead.

This CL also puts the related suffix SyncModelType up-to-date.

Bug: 883252
Change-Id: Ia594f068919bee4ed233b7c1477460a7f04ab797
Reviewed-on: https://chromium-review.googlesource.com/1245117Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594613}

components/sync/base/data_type_histogram.h

@@ -39,6 +39,8 @@ void SyncRecordModelTypeCountHistogram(syncer::ModelType model_type,
 // in macros, pass in the histogram method directly as a parameter.
 // See http://connect.microsoft.com/VisualStudio/feedback/details/380090/
 // variadic-macro-replacement#details
+// When adding a new datatype in the switch below, also update the SyncModelType
+// and SyncModelTypeByMacro histogram suffixes in histograms.xml.
 #define SYNC_DATA_TYPE_HISTOGRAM(datatype)                       \
   do {                                                           \
     switch (datatype) {                                          \

components/sync/base/model_type.h

@@ -35,8 +35,9 @@ namespace syncer {
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.sync
 //
 // |kModelTypeInfoMap| struct entries are in the same order as their definition
-// in ModelType enum. Don't forget to update the |kModelTypeInfoMap| struct in
-// model_type.cc when you make changes in ModelType enum.
+// in ModelType enum. When you make changes in ModelType enum, don't forget to
+// update the |kModelTypeInfoMap| struct in model_type.cc and also the
+// SyncModelType and SyncModelTypeByMacro histogram suffixes in histograms.xml
 enum ModelType {
   // Object type unknown.  Objects may transition through
   // the unknown state during their initial creation, before

tools/metrics/histograms/histograms.xml

@@ -103572,28 +103572,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.AppsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during app association.</summary>
-</histogram>
-
-<histogram name="Sync.AppsConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of app configuration failures.</summary>
-</histogram>
-
-<histogram name="Sync.AppSettingsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during app settings association.</summary>
-</histogram>
-
-<histogram name="Sync.AppSettingsConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of app settings configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.AppSettingsStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by AppSettingsConfigureFailure. See crbug.com/478226.
@@ -103621,6 +103599,13 @@ uploading your change for review.
   </summary>
 </histogram>
 
+<histogram base="true" name="Sync.AssociationTime" units="ms"
+    expires_after="2019-10-01">
+  <owner>jkrcal@chromium.org</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>Time taken during association of this data type.</summary>
+</histogram>
+
 <histogram name="Sync.Attachments.DownloadChecksumResult" enum="BooleanMatched">
   <obsolete>
     Deprecated 2018-04, Sync attachments were never launched.
@@ -103726,17 +103711,10 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.AutofillAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during autofill association.</summary>
-</histogram>
-
-<histogram name="Sync.AutofillConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of autofill configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.AutofillProfileAssociationTime" units="ms">
+  <obsolete>
+    Replaced by Sync.AutofillProfilesAssociationTime.
+  </obsolete>
   <owner>zea@chromium.org</owner>
   <summary>
     Time taken during autofill profile association (M18 and earlier were
@@ -103756,19 +103734,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.AutofillProfilesAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during autofill profile association.</summary>
-</histogram>
-
-<histogram name="Sync.AutofillProfilesConfigureFailure"
-    enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of autofill profile configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.AutofillProfilesStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by AutofillProfilesConfigureFailure. See crbug.com/478226.
@@ -103890,16 +103855,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.BookmarksAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during bookmark association.</summary>
-</histogram>
-
-<histogram name="Sync.BookmarksConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of bookmark configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.BookmarksDuplicationsAtAssociation">
   <owner>stanisc@chromium.org</owner>
   <summary>
@@ -103979,6 +103934,15 @@ uploading your change for review.
   <summary>Count of model association failures for each type.</summary>
 </histogram>
 
+<histogram base="true" name="Sync.ConfigureFailure" enum="SyncConfigureResult"
+    expires_after="2020-04-01">
+  <owner>jkrcal@chromium.org</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    Enumeration of types of configuration failures of this data type.
+  </summary>
+</histogram>
+
 <histogram name="Sync.ConfigureTime.ABORTED" units="ms">
   <obsolete>
     Replaced by Sync.ConfigureTime_Long.ABORTED in m21.
@@ -104250,16 +104214,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.DictionaryAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during dictionary association.</summary>
-</histogram>
-
-<histogram name="Sync.DictionaryConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of dictionary configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.DictionaryStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by DictionaryConfigureFailure. See crbug.com/478226.
@@ -104380,29 +104334,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.ExtensionsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during extension association.</summary>
-</histogram>
-
-<histogram name="Sync.ExtensionsConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of extension configuration failures.</summary>
-</histogram>
-
-<histogram name="Sync.ExtensionSettingsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during extension settings association.</summary>
-</histogram>
-
-<histogram name="Sync.ExtensionSettingsConfigureFailure"
-    enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of extension settings configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.ExtensionSettingsStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by ExtensionSettingsConfigureFailure. See crbug.com/478226.
@@ -104458,18 +104389,6 @@ uploading your change for review.
   <summary>Number of synced favicons at initialization time.</summary>
 </histogram>
 
-<histogram name="Sync.FaviconImagesAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during favicon images association.</summary>
-</histogram>
-
-<histogram name="Sync.FaviconImagesConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of favicon images configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.FaviconImagesStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by FaviconImagesConfigureFailure. See crbug.com/478226.
@@ -104491,19 +104410,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.FaviconTrackingAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during favicon tracking association.</summary>
-</histogram>
-
-<histogram name="Sync.FaviconTrackingConfigureFailure"
-    enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of favicon tracking configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.FaviconTrackingStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by FaviconTrackingConfigureFailure. See crbug.com/478226.
@@ -105159,16 +105065,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.PasswordsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during password association.</summary>
-</histogram>
-
-<histogram name="Sync.PasswordsConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of password configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.PasswordsStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by PasswordsConfigureFailure. See crbug.com/478226.
@@ -105242,16 +105138,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.PreferencesAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during preference association.</summary>
-</histogram>
-
-<histogram name="Sync.PreferencesConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of preference configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.PreferencesStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by PreferencesConfigureFailure. See crbug.com/478226.
@@ -105370,18 +105256,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.SearchEnginesAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during search engine association.</summary>
-</histogram>
-
-<histogram name="Sync.SearchEnginesConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of search engine configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.SearchEnginesStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by SearchEnginesConfigureFailure. See crbug.com/478226.
@@ -105437,11 +105311,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.SessionsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during session association.</summary>
-</histogram>
-
 <histogram name="Sync.SessionsBadForeignHashOnMergeCount"
     units="Sessions Entries">
   <owner>skym@chromium.org</owner>
@@ -105452,11 +105321,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.SessionsConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of session configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.SessionsRefreshDelay" units="ms">
   <owner>zea@chromium.org</owner>
   <summary>
@@ -105599,25 +105463,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.SyncedNotificationsAssociationTime" units="ms">
-  <obsolete>
-    Deprecated in M53.
-  </obsolete>
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during synced notifications association.</summary>
-</histogram>
-
-<histogram name="Sync.SyncedNotificationsConfigureFailure"
-    enum="SyncConfigureResult">
-  <obsolete>
-    Deprecated in M53.
-  </obsolete>
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Enumeration of types of synced notifications configuration failures.
-  </summary>
-</histogram>
-
 <histogram name="Sync.SyncedNotificationsStartFailure" enum="SyncStartResult">
   <obsolete>
     Deprecated in M53. Replaced by SyncedNotificationsConfigureFailure. See
@@ -105680,16 +105525,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.ThemesAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during theme association.</summary>
-</histogram>
-
-<histogram name="Sync.ThemesConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of theme configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.ThemesStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by ThemesConfigureFailure. See crbug.com/478226.
@@ -105764,16 +105599,6 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Sync.TypedUrlsAssociationTime" units="ms">
-  <owner>zea@chromium.org</owner>
-  <summary>Time taken during typed url association.</summary>
-</histogram>
-
-<histogram name="Sync.TypedUrlsConfigureFailure" enum="SyncConfigureResult">
-  <owner>zea@chromium.org</owner>
-  <summary>Enumeration of types of typed url configuration failures.</summary>
-</histogram>
-
 <histogram name="Sync.TypedUrlsStartFailure" enum="SyncStartResult">
   <obsolete>
     Replaced by TypedUrlsConfigureFailure. See crbug.com/478226.
@@ -132203,9 +132028,18 @@ uploading your change for review.
 <histogram_suffixes name="SyncModelType" separator=".">
   <suffix name="APP" label="APP"/>
   <suffix name="APP_LIST" label="APP_LIST"/>
-  <suffix name="APP_NOTIFICATION" label="APP_NOTIFICATION"/>
+  <suffix name="APP_NOTIFICATION" label="APP_NOTIFICATION">
+    <obsolete>
+      Deprecated 2/2017.
+    </obsolete>
+  </suffix>
   <suffix name="APP_SETTING" label="APP_SETTING"/>
-  <suffix name="ARTICLE" label="ARTICLE"/>
+  <suffix name="ARC_PACKAGE" label="ARC_PACKAGE"/>
+  <suffix name="ARTICLE" label="ARTICLE">
+    <obsolete>
+      Deprecated 7/2018.
+    </obsolete>
+  </suffix>
   <suffix name="AUTOFILL" label="AUTOFILL"/>
   <suffix name="AUTOFILL_PROFILE" label="AUTOFILL_PROFILE"/>
   <suffix name="AUTOFILL_WALLET" label="AUTOFILL_WALLET"/>
@@ -132219,21 +132053,40 @@ uploading your change for review.
   <suffix name="FAVICON_IMAGE" label="FAVICON_IMAGE"/>
   <suffix name="FAVICON_TRACKING" label="FAVICON_TRACKING"/>
   <suffix name="HISTORY_DELETE_DIRECTIVE" label="HISTORY_DELETE_DIRECTIVE"/>
-  <suffix name="MANAGED_USER" label="MANAGED_USER"/>
+  <suffix name="MANAGED_USER" label="MANAGED_USER">
+    <obsolete>
+      Deprecated 4/2018.
+    </obsolete>
+  </suffix>
   <suffix name="MANAGED_USER_SETTING" label="MANAGED_USER_SETTING"/>
   <suffix name="MANAGED_USER_SHARED_SETTING"
-      label="MANAGED_USER_SHARED_SETTING"/>
+      label="MANAGED_USER_SHARED_SETTING">
+    <obsolete>
+      Deprecated 4/2018.
+    </obsolete>
+  </suffix>
   <suffix name="MANAGED_USER_WHITELIST" label="MANAGED_USER_WHITELIST"/>
   <suffix name="MOUNTAIN_SHARE" label="MOUNTAIN_SHARE"/>
   <suffix name="NIGORI" label="NIGORI"/>
   <suffix name="PASSWORD" label="PASSWORD"/>
   <suffix name="PREFERENCE" label="PREFERENCE"/>
+  <suffix name="PRINTERS" label="PRINTERS"/>
   <suffix name="PRIORITY_PREFERENCE" label="PRIORITY_PREFERENCE"/>
+  <suffix name="PROXY_TABS" label="PROXY_TABS"/>
+  <suffix name="READING_LIST" label="READING_LIST"/>
   <suffix name="SEARCH_ENGINE" label="SEARCH_ENGINE"/>
   <suffix name="SESSION" label="SESSION"/>
-  <suffix name="SYNCED_NOTIFICATION" label="SYNCED_NOTIFICATION"/>
+  <suffix name="SYNCED_NOTIFICATION" label="SYNCED_NOTIFICATION">
+    <obsolete>
+      Deprecated in M53.
+    </obsolete>
+  </suffix>
   <suffix name="SYNCED_NOTIFICATION_APP_INFO"
-      label="SYNCED_NOTIFICATION_APP_INFO"/>
+      label="SYNCED_NOTIFICATION_APP_INFO">
+    <obsolete>
+      Deprecated in M53.
+    </obsolete>
+  </suffix>
   <suffix name="THEME" label="THEME"/>
   <suffix name="TYPED_URL" label="TYPED_URL"/>
   <suffix name="USER_CONSENT" label="USER_CONSENT"/>
@@ -132261,6 +132114,74 @@ uploading your change for review.
   <affected-histogram name="Sync.ModelTypeMemoryKB"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="SyncModelTypeByMacro" separator="" ordering="prefix">
+  <suffix name="AppList" label="App list"/>
+  <suffix name="AppNotifications" label="App notifications">
+    <obsolete>
+      Deprecated 2/2017.
+    </obsolete>
+  </suffix>
+  <suffix name="Apps" label="Apps"/>
+  <suffix name="AppSettings" label="App settings"/>
+  <suffix name="ArcPackage" label="Arc package"/>
+  <suffix name="Article" label="Article">
+    <obsolete>
+      Deprecated 7/2018.
+    </obsolete>
+  </suffix>
+  <suffix name="Autofill" label="Autocomplete"/>
+  <suffix name="AutofillProfiles" label="Autofill profiles"/>
+  <suffix name="AutofillWallet" label="Autofill wallet"/>
+  <suffix name="AutofillWalletMetadata" label="Autofill wallet metadata"/>
+  <suffix name="Bookmarks" label="Bookmarks"/>
+  <suffix name="DeviceInfo" label="Device info"/>
+  <suffix name="Dictionary" label="Dictionary"/>
+  <suffix name="Experiments" label="Experiments"/>
+  <suffix name="Extensions" label="Extensions"/>
+  <suffix name="ExtensionSettings" label="Extension settings"/>
+  <suffix name="FaviconImages" label="Favicon images"/>
+  <suffix name="FaviconTracking" label="Favicon tracking"/>
+  <suffix name="HistoryDeleteDirectives" label="History delete directives"/>
+  <suffix name="ManagedUser" label="Managed user">
+    <obsolete>
+      Deprecated 4/2018.
+    </obsolete>
+  </suffix>
+  <suffix name="ManagedUserSetting" label="Managed user setting"/>
+  <suffix name="ManagedUserSharedSetting" label="Managed user shared setting">
+    <obsolete>
+      Deprecated 4/2018.
+    </obsolete>
+  </suffix>
+  <suffix name="ManagedUserWhitelist" label="Managed user whitelist"/>
+  <suffix name="MountainShares" label="Mountain shares"/>
+  <suffix name="Nigori" label="Nigori"/>
+  <suffix name="Passwords" label="Passwords"/>
+  <suffix name="Preferences" label="Preferences"/>
+  <suffix name="Printers" label="Printers"/>
+  <suffix name="PriorityPreferences" label="Priority preferences"/>
+  <suffix name="ReadingList" label="Reading list"/>
+  <suffix name="SearchEngines" label="Search engines"/>
+  <suffix name="Sessions" label="Sessions"/>
+  <suffix name="SyncedNotificationAppInfo" label="Synced notification app info">
+    <obsolete>
+      Deprecated in M53.
+    </obsolete>
+  </suffix>
+  <suffix name="SyncedNotifications" label="Synced notifications">
+    <obsolete>
+      Deprecated in M53.
+    </obsolete>
+  </suffix>
+  <suffix name="Themes" label="Themes"/>
+  <suffix name="TypedUrls" label="Typed urls"/>
+  <suffix name="UserConsents" label="User consents"/>
+  <suffix name="UserEvents" label="User events"/>
+  <suffix name="WifiCredentials" label="Wifi credentials"/>
+  <affected-histogram name="Sync.AssociationTime"/>
+  <affected-histogram name="Sync.ConfigureFailure"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="SyzygyStartupTime" separator="_">
   <obsolete>
     No longer logged.