Merge pull request #11066 from wordpress-mobile/issue/1718-track-gutenberg-rollout-v2

Analytics: Track phase 2 of the Gutenberg Rollout

Author: maxme

WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java

@@ -77,7 +77,12 @@ public static void migrateAppWideMobileEditorPreferenceToRemote(final AccountSto
                     }
                 }
 
-                // Enable Gutenberg for all sites using a single network call
+                // Track and enable Gutenberg for all sites using a single network call. Ideally we would track this
+                // on the network response, but this would make this rollout even more complex.
+                // There might be some rare events when we register a site switched to Gutenberg which is actually
+                // still on Aztec.
+                trackGutenbergEnabledForNonGutenbergSites(siteStore,
+                        BlockEditorEnabledSource.ON_PROGRESSIVE_ROLLOUT_PHASE_2);
                 dispatcher.dispatch(SiteActionBuilder.newDesignateMobileEditorForAllSitesAction(
                         new DesignateMobileEditorForAllSitesPayload(SiteUtils.GB_EDITOR_NAME, false)));
 
@@ -114,7 +119,12 @@ public static void migrateAppWideMobileEditorPreferenceToRemote(final AccountSto
                 }
             }
 
-            // Enable Gutenberg for all sites using a single network call
+            // Track and enable and  Gutenberg for all sites using a single network call. Ideally we would track this
+            // on the network response, but this would make this rollout even more complex.
+            // There might be some rare events when we register a site switched to Gutenberg which is actually
+            // still on Aztec.
+            trackGutenbergEnabledForNonGutenbergSites(siteStore,
+                    BlockEditorEnabledSource.ON_PROGRESSIVE_ROLLOUT_PHASE_1);
             dispatcher.dispatch(SiteActionBuilder.newDesignateMobileEditorForAllSitesAction(
                     new DesignateMobileEditorForAllSitesPayload(SiteUtils.GB_EDITOR_NAME)));
 
@@ -136,6 +146,15 @@ public static void migrateAppWideMobileEditorPreferenceToRemote(final AccountSto
         }
     }
 
+    private static void trackGutenbergEnabledForNonGutenbergSites(final SiteStore siteStore,
+                                                                  final BlockEditorEnabledSource source) {
+        for (SiteModel site : siteStore.getSites()) {
+            if (!TextUtils.equals(site.getMobileEditor(), GB_EDITOR_NAME)) {
+                AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, site, source.asPropertyMap());
+            }
+        }
+    }
+
     private static boolean atLeastOneSiteHasAztecEnabled(final SiteStore siteStore) {
         // We want to make sure to enable Gutenberg only on the sites they didn't opt-out.
         for (SiteModel site : siteStore.getSites()) {

WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java

@@ -74,7 +74,8 @@ public enum BlockEditorEnabledSource {
         VIA_SITE_SETTINGS,
         ON_SITE_CREATION,
         ON_BLOCK_POST_OPENING,
-        ON_PROGRESSIVE_ROLLOUT;
+        ON_PROGRESSIVE_ROLLOUT_PHASE_1,
+        ON_PROGRESSIVE_ROLLOUT_PHASE_2;
 
         public Map<String, Object> asPropertyMap() {
             Map<String, Object> properties = new HashMap<>();