commit 10306be9d8bf9aa009c7c1eeebc206d546684847
author Kenzie Schmoll <kenzieschmoll@google.com> Mon Feb 26 19:21:27 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Feb 26 19:21:27 2024 +0000
tree 253b18d3411889b68999ad495ede6c3196311bf2
parent 3ba864a9d7b032ccd9cf8b0137b30a872cfac4e8

[dds] Only initialize analytics when assigning the `handler` for DevTools server.

Otherwise, `DevToolsUtils.initializeAnalytics()` was getting called even when it was unused (e.g. the g3 case).

Change-Id: I9f911b776f8ea4ba63c1384feb5c1cd73fa18c3c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/354342
Reviewed-by: Elias Yishak <eliasyishak@google.com>
Reviewed-by: Derek Xu <derekx@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>
Commit-Queue: Kenzie Davisson <kenzieschmoll@google.com>

pkg/dds/lib/devtools_server.dart

diff --git a/pkg/dds/lib/devtools_server.dart b/pkg/dds/lib/devtools_server.dart
index 49b3d24..2aaa6be 100644
--- a/pkg/dds/lib/devtools_server.dart
+++ b/pkg/dds/lib/devtools_server.dart
@@ -12,7 +12,6 @@
 import 'package:path/path.dart' as path;
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf;
-import 'package:unified_analytics/unified_analytics.dart';
 
 import 'src/devtools/client.dart';
 import 'src/devtools/handler.dart';
@@ -52,7 +51,6 @@
 
   MachineModeCommandHandler? _machineModeCommandHandler;
   late ClientManager clientManager;
-  late Analytics analytics;
   final bool _isChromeOS = File('/dev/.cros_milestone').existsSync();
 
   /// Builds an arg parser for the DevTools server.
@@ -275,12 +273,11 @@
     clientManager = ClientManager(
       requestNotificationPermissions: enableNotifications,
     );
-    analytics = DevToolsUtils.initializeAnalytics();
     handler ??= await defaultHandler(
       buildDir: customDevToolsPath!,
       clientManager: clientManager,
       dtdUri: dtdUri,
-      analytics: analytics,
+      analytics: DevToolsUtils.initializeAnalytics(),
     );
 
     HttpServer? server;