Add data about workspaces to Dart Analysis Server analytics (#2222)

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: keertip

pkgs/unified_analytics/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 8.0.7
+- Added optional fields `contextWorkspaceType` and `numberOfPackagesInWorkspace`
+  to `Event.contextStructure` for workspace and packages distribution from the 
+  Dart Analysis Server.
+- Removed `Event.contextStructure` optional fields `contextsFromBothFiles`, 
+  `contextsFromOptionsFiles`,`contextsFromPackagesFiles`,`contextsWithoutFiles`.
+
 ## 8.0.6
 - Added `Event.analysisStatistics` for events from Dart Analysis Server, about analysis.
 

pkgs/unified_analytics/lib/src/constants.dart

@@ -87,7 +87,7 @@ const int kMaxLogFileSize = 25 * (1 << 20);
 const String kLogFileName = 'dart-flutter-telemetry.log';
 
 /// The current version of the package, should be in line with pubspec version.
-const String kPackageVersion = '8.0.6';
+const String kPackageVersion = '8.0.7';
 
 /// The minimum length for a session.
 const int kSessionDurationMinutes = 30;

pkgs/unified_analytics/lib/src/event.dart

@@ -350,17 +350,14 @@ final class Event {
   /// [libraryCycleLineCounts] - json encoded percentile values indicating the
   ///     number of lines of code in all of the files in a single library cycle.
   ///
-  /// [contextsFromBothFiles] - the number of contexts that were created because
-  ///     of both a package config and an analysis options file.
-  ///
-  /// [contextsFromOptionsFiles] - the number of contexts that were created
-  ///     because of an analysis options file.
-  ///
-  /// [contextsFromPackagesFiles] - the number of contexts that were created
-  ///     because of a package config file.
-  ///
-  /// [contextsWithoutFiles] - the number of contexts that were created because
-  ///     of the lack of either a package config or an analysis options file.
+  /// [contextWorkspaceType] - json encoded list with the total number of
+  ///     workspaces of each type for all of the contexts:
+  ///     - index 0: Blaze, GN or other workspace count
+  ///     - index 1: Package workspace count
+  ///     - index 2: Pub workspace count
+  ///
+  /// [numberOfPackagesInWorkspace] - json encoded percentile values for the
+  ///     number of packages in the Pub workspaces.
   Event.contextStructure({
     required int immediateFileCount,
     required int immediateFileLineCount,
@@ -371,10 +368,8 @@ final class Event {
     required int transitiveFileUniqueLineCount,
     String libraryCycleLibraryCounts = '',
     String libraryCycleLineCounts = '',
-    int contextsFromBothFiles = 0,
-    int contextsFromOptionsFiles = 0,
-    int contextsFromPackagesFiles = 0,
-    int contextsWithoutFiles = 0,
+    String contextWorkspaceType = '',
+    String numberOfPackagesInWorkspace = '',
   }) : this._(
           eventName: DashEvent.contextStructure,
           eventData: {
@@ -387,10 +382,8 @@ final class Event {
             'transitiveFileUniqueLineCount': transitiveFileUniqueLineCount,
             'libraryCycleLibraryCounts': libraryCycleLibraryCounts,
             'libraryCycleLineCounts': libraryCycleLineCounts,
-            'contextsFromBothFiles': contextsFromBothFiles,
-            'contextsFromOptionsFiles': contextsFromOptionsFiles,
-            'contextsFromPackagesFiles': contextsFromPackagesFiles,
-            'contextsWithoutFiles': contextsWithoutFiles,
+            'contextWorkspaceType': contextWorkspaceType,
+            'numberOfPackagesInWorkspace': numberOfPackagesInWorkspace,
           },
         );
 

pkgs/unified_analytics/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 # LINT.IfChange
 # When updating this, keep the version consistent with the changelog and the
 # value in lib/src/constants.dart.
-version: 8.0.6
+version: 8.0.7
 # LINT.ThenChange(lib/src/constants.dart)
 repository: https://github.com/dart-lang/tools/tree/main/pkgs/unified_analytics
 issue_tracker: https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aunified_analytics

pkgs/unified_analytics/test/event_test.dart

@@ -106,6 +106,8 @@ void main() {
           transitiveFileUniqueLineCount: 7,
           libraryCycleLibraryCounts: 'a',
           libraryCycleLineCounts: 'b',
+          contextWorkspaceType: '[0,1,2]',
+          numberOfPackagesInWorkspace: '32',
         );
 
     final constructedEvent = generateEvent();
@@ -121,11 +123,9 @@ void main() {
     expect(constructedEvent.eventData['transitiveFileUniqueLineCount'], 7);
     expect(constructedEvent.eventData['libraryCycleLibraryCounts'], 'a');
     expect(constructedEvent.eventData['libraryCycleLineCounts'], 'b');
-    expect(constructedEvent.eventData['contextsFromBothFiles'], 0);
-    expect(constructedEvent.eventData['contextsFromOptionsFiles'], 0);
-    expect(constructedEvent.eventData['contextsFromPackagesFiles'], 0);
-    expect(constructedEvent.eventData['contextsWithoutFiles'], 0);
-    expect(constructedEvent.eventData.length, 13);
+    expect(constructedEvent.eventData['contextWorkspaceType'], '[0,1,2]');
+    expect(constructedEvent.eventData['numberOfPackagesInWorkspace'], '32');
+    expect(constructedEvent.eventData.length, 11);
   });
 
   test('Event.dartCliCommandExecuted constructed', () {