From 22b91337eff2179230753e5d8421045cae4f8e43 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:58:47 -0800
Subject: [PATCH 1/2] Fix inspector V2 metrics

---
 .../lib/src/shared/analytics/_analytics_web.dart      | 11 +++++++++++
 packages/devtools_app/web/devtools_analytics.js       |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
index 4e67114c6e0..073492345d1 100644
--- a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
+++ b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
@@ -111,6 +111,7 @@ extension type GtagEventDevTools._(JSObject _) implements GtagEvent {
     int? inspector_tree_controller_id, // metric12
     String? android_app_id, //metric13
     String? ios_bundle_id, //metric14
+    bool? is_v2_inspector, // metric15
   });
 
   factory GtagEventDevTools._create({
@@ -181,6 +182,8 @@ extension type GtagEventDevTools._(JSObject _) implements GtagEvent {
       inspector_tree_controller_id: screenMetrics is InspectorScreenMetrics
           ? screenMetrics.inspectorTreeControllerId
           : null,
+      is_v2_inspector:
+          screenMetrics is InspectorScreenMetrics ? screenMetrics.isV2 : null,
       // [DeepLinkScreenMetrics]
       android_app_id: screenMetrics is DeepLinkScreenMetrics
           ? screenMetrics.androidAppId
@@ -219,6 +222,7 @@ extension type GtagEventDevTools._(JSObject _) implements GtagEvent {
   external int? get root_set_count;
   external int? get row_count;
   external int? get inspector_tree_controller_id;
+  external bool? get is_v2_inspector;
   external String? get android_app_id;
   external String? get ios_bundle_id;
 }
@@ -273,6 +277,8 @@ extension type GtagExceptionDevTools._(JSObject _) implements GtagException {
     int? root_set_count, // metric10
     int? row_count, // metric11
     int? inspector_tree_controller_id, // metric12
+    bool? is_v2_inspector, // metric15
+    // Deep links screen metrics. See [DeepLinkScreenMetrics].
     String? android_app_id, //metric13
     String? ios_bundle_id, //metric14
   });
@@ -339,6 +345,8 @@ extension type GtagExceptionDevTools._(JSObject _) implements GtagException {
       inspector_tree_controller_id: screenMetrics is InspectorScreenMetrics
           ? screenMetrics.inspectorTreeControllerId
           : null,
+      is_v2_inspector:
+          screenMetrics is InspectorScreenMetrics ? screenMetrics.isV2 : null,
       // [DeepLinkScreenMetrics]
       android_app_id: screenMetrics is DeepLinkScreenMetrics
           ? screenMetrics.androidAppId
@@ -379,6 +387,7 @@ extension type GtagExceptionDevTools._(JSObject _) implements GtagException {
   external int? get inspector_tree_controller_id;
   external String? get android_app_id;
   external String? get ios_bundle_id;
+  external bool? get is_v2_inspector;
 }
 
 /// Whether google analytics are enabled.
@@ -909,6 +918,7 @@ ua.Event _uaEventFromGtagEvent(GtagEventDevTools gtagEvent) {
     inspectorTreeControllerId: gtagEvent.inspector_tree_controller_id,
     androidAppId: gtagEvent.android_app_id,
     iosBundleId: gtagEvent.ios_bundle_id,
+    isV2Inspector: gtagEvent.is_v2_inspector,
   );
 }
 
@@ -942,6 +952,7 @@ ua.Event _uaEventFromGtagException(GtagExceptionDevTools gtagException) {
       'rootSetCount': gtagException.root_set_count,
       'rowCount': gtagException.row_count,
       'inspectorTreeControllerId': gtagException.inspector_tree_controller_id,
+      'isV2Inspector': gtagException.is_v2_inspector,
     },
   );
 }
diff --git a/packages/devtools_app/web/devtools_analytics.js b/packages/devtools_app/web/devtools_analytics.js
index f44f93a0336..cb6ddb0f838 100644
--- a/packages/devtools_app/web/devtools_analytics.js
+++ b/packages/devtools_app/web/devtools_analytics.js
@@ -44,6 +44,9 @@ function initializeGA() {
       'metric10': 'root_set_count',
       'metric11': 'row_count',
       'metric12': 'inspector_tree_controller_id',
+      'metric13': 'android_app_id',
+      'metric14': 'ios_bundle_id',
+      'metric15': 'is_v2_inspector',
     },
     cookie_flags: 'SameSite=None;Secure',
   });

From a55b24a9ab0cc25b0f8fe8331b7426f0fcd92658 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:49:04 -0800
Subject: [PATCH 2/2] Update order

---
 .../lib/src/shared/analytics/_analytics_web.dart             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
index 8c38ac5e9ff..e0983bb3d47 100644
--- a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
+++ b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
@@ -223,9 +223,9 @@ extension type GtagEventDevTools._(JSObject _) implements GtagEvent {
   external int? get root_set_count;
   external int? get row_count;
   external int? get inspector_tree_controller_id;
-  external bool? get is_v2_inspector;
   external String? get android_app_id;
   external String? get ios_bundle_id;
+  external bool? get is_v2_inspector;
 }
 
 extension type GtagExceptionDevTools._(JSObject _) implements GtagException {
@@ -278,10 +278,9 @@ extension type GtagExceptionDevTools._(JSObject _) implements GtagException {
     int? root_set_count, // metric10
     int? row_count, // metric11
     int? inspector_tree_controller_id, // metric12
-    bool? is_v2_inspector, // metric15
-    // Deep links screen metrics. See [DeepLinkScreenMetrics].
     String? android_app_id, //metric13
     String? ios_bundle_id, //metric14
+    bool? is_v2_inspector, // metric15
   });
 
   factory GtagExceptionDevTools._create(