[tool,web] track web-renderer, and Wasm build args in analytics (#125336

) Addresses part of #125164
flutter · Apr 21, 2023 · 702f014 · 702f014
1 parent f86b922
commit 702f014
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/packages/flutter_tools/lib/src/web/compile.dart b/packages/flutter_tools/lib/src/web/compile.dart
@@ -129,7 +129,10 @@ class WebBuilder {
     BuildEvent(
       'web-compile',
       type: 'web',
-      settings: 'wasm-compile: ${compilerConfig.isWasm}',
+      settings: _buildEventAnalyticsSettings(
+        config: compilerConfig,
+        buildInfo: buildInfo,
+      ),
       flutterUsage: _flutterUsage,
     ).send();
 
@@ -222,3 +225,20 @@ const Map<WebRendererMode, Map<NullSafetyMode, HostArtifact>> kDartSdkJsMapArtif
 };
 
 const String kWasmPreviewUri = 'https://flutter.dev/wasm';
+
+String _buildEventAnalyticsSettings({
+  required WebCompilerConfig config,
+  required BuildInfo buildInfo,
+}) {
+  final Map<String, Object> values = <String, Object>{
+    ...config.buildEventAnalyticsValues,
+    'web-renderer': buildInfo.webRenderer.cliName,
+  };
+
+  final List<String> sortedList = values.entries
+      .map((MapEntry<String, Object> e) => '${e.key}: ${e.value};')
+      .toList()
+    ..sort();
+
+  return sortedList.join(' ');
+}
diff --git a/packages/flutter_tools/lib/src/web/compiler_config.dart b/packages/flutter_tools/lib/src/web/compiler_config.dart
@@ -11,6 +11,10 @@ abstract class WebCompilerConfig {
   bool get isWasm;
 
   Map<String, String> toBuildSystemEnvironment();
+
+  Map<String, Object> get buildEventAnalyticsValues => <String, Object>{
+        'wasm-compile': isWasm,
+      };
 }
 
 /// Configuration for the Dart-to-Javascript compiler (dart2js).
@@ -165,4 +169,14 @@ class WasmCompilerConfig extends WebCompilerConfig {
   List<String> toCommandOptions() => <String>[
     if (omitTypeChecks) '--omit-type-checks',
   ];
+
+  @override
+  Map<String, Object> get buildEventAnalyticsValues => <String, Object>{
+    ...super.buildEventAnalyticsValues,
+    for (MapEntry<String, String> entry in toBuildSystemEnvironment()
+        .entries
+        .where(
+            (MapEntry<String, String> element) => element.value == 'true'))
+      entry.key: entry.value,
+  };
 }
diff --git a/packages/flutter_tools/test/general.shard/web/compile_web_test.dart b/packages/flutter_tools/test/general.shard/web/compile_web_test.dart
@@ -88,7 +88,7 @@ void main() {
         'build',
         'web',
         label: 'web-compile',
-        parameters: CustomDimensions(buildEventSettings: 'wasm-compile: true')
+        parameters: CustomDimensions(buildEventSettings: 'wasm-compile: true; web-renderer: auto;')
       ),
     ]));