Merge branch 'main' into oauth2-readme

Author: AbgarSim

.github/workflows/markdown_flutter.yaml

@@ -1,3 +1,10 @@
+## 8.0.3
+- Changed `Event.contextStructure` to make optional data that's no longer being
+  collected and to add data about the size of library cycles.
+
+## 8.0.2
+- Added `Event.dartMCPEvent` for events from the `dart mcp-server` command.
+
 ## 8.0.1
 - Added `Event.flutterInjectDarwinPlugins` event for plugins injected into an iOS/macOS project.
 

pkgs/unified_analytics/CHANGELOG.md

@@ -1,4 +1,4 @@
-[![package:unified_analytics](https://github.com/dart-lang/tools/actions/workflows/unified_analytics.yml/badge.svg)](https://github.com/dart-lang/tools/actions/workflows/unified_analytics.yml)
+[![package:unified_analytics](https://github.com/dart-lang/tools/actions/workflows/unified_analytics.yaml/badge.svg)](https://github.com/dart-lang/tools/actions/workflows/unified_analytics.yaml)
 [![pub package](https://img.shields.io/pub/v/unified_analytics.svg)](https://pub.dev/packages/unified_analytics)
 [![package publisher](https://img.shields.io/pub/publisher/unified_analytics.svg)](https://pub.dev/packages/unified_analytics/publisher)
 

pkgs/unified_analytics/README.md

@@ -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.1';
+const String kPackageVersion = '8.0.3';
 
 /// The minimum length for a session.
 const int kSessionDurationMinutes = 30;

pkgs/unified_analytics/lib/src/constants.dart

@@ -55,6 +55,11 @@ enum DashEvent {
     description: 'Pub package resolution details',
     toolOwner: DashTool.dartTool,
   ),
+  dartMCPEvent(
+    label: 'dart_mcp_server',
+    description: 'Information for a Dart MCP server event',
+    toolOwner: DashTool.dartTool,
+  ),
 
   // Events for Flutter devtools
 

pkgs/unified_analytics/lib/src/enums.dart

@@ -309,18 +309,6 @@ final class Event {
   /// Event that is emitted on shutdown to report the structure of the analysis
   /// contexts created immediately after startup.
   ///
-  /// [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.
-  ///
   /// [immediateFileCount] - the number of files in one of the analysis
   ///     contexts.
   ///
@@ -341,32 +329,54 @@ final class Event {
   ///
   /// [transitiveFileUniqueLineCount] - the number of lines in the unique
   ///     transitive files.
+  ///
+  /// [libraryCycleLibraryCounts] - json encoded percentile values indicating
+  ///     the number of libraries in a single library cycle.
+  ///
+  /// [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.
   Event.contextStructure({
-    required int contextsFromBothFiles,
-    required int contextsFromOptionsFiles,
-    required int contextsFromPackagesFiles,
-    required int contextsWithoutFiles,
     required int immediateFileCount,
     required int immediateFileLineCount,
     required int numberOfContexts,
     required int transitiveFileCount,
     required int transitiveFileLineCount,
     required int transitiveFileUniqueCount,
     required int transitiveFileUniqueLineCount,
+    String libraryCycleLibraryCounts = '',
+    String libraryCycleLineCounts = '',
+    int contextsFromBothFiles = 0,
+    int contextsFromOptionsFiles = 0,
+    int contextsFromPackagesFiles = 0,
+    int contextsWithoutFiles = 0,
   }) : this._(
           eventName: DashEvent.contextStructure,
           eventData: {
-            'contextsFromBothFiles': contextsFromBothFiles,
-            'contextsFromOptionsFiles': contextsFromOptionsFiles,
-            'contextsFromPackagesFiles': contextsFromPackagesFiles,
-            'contextsWithoutFiles': contextsWithoutFiles,
             'immediateFileCount': immediateFileCount,
             'immediateFileLineCount': immediateFileLineCount,
             'numberOfContexts': numberOfContexts,
             'transitiveFileCount': transitiveFileCount,
             'transitiveFileLineCount': transitiveFileLineCount,
             'transitiveFileUniqueCount': transitiveFileUniqueCount,
             'transitiveFileUniqueLineCount': transitiveFileUniqueLineCount,
+            'libraryCycleLibraryCounts': libraryCycleLibraryCounts,
+            'libraryCycleLineCounts': libraryCycleLineCounts,
+            'contextsFromBothFiles': contextsFromBothFiles,
+            'contextsFromOptionsFiles': contextsFromOptionsFiles,
+            'contextsFromPackagesFiles': contextsFromPackagesFiles,
+            'contextsWithoutFiles': contextsWithoutFiles,
           },
         );
 
@@ -905,6 +915,32 @@ final class Event {
           },
         );
 
+  /// An event that is sent from the Dart MCP server.
+  ///
+  /// The [client] is the name of the client, as given when it connected to the
+  /// MCP server, and [clientVersion] is the version of the client.
+  ///
+  /// The [serverVersion] is the version of the Dart MCP server.
+  ///
+  /// The [type] identifies the kind of event this is, and [additionalData] is
+  /// the actual data for the event.
+  Event.dartMCPEvent({
+    required String client,
+    required String clientVersion,
+    required String serverVersion,
+    required String type,
+    CustomMetrics? additionalData,
+  }) : this._(
+          eventName: DashEvent.dartMCPEvent,
+          eventData: {
+            'client': client,
+            'clientVersion': clientVersion,
+            'serverVersion': serverVersion,
+            'type': type,
+            ...?additionalData?.toMap(),
+          },
+        );
+
   @override
   int get hashCode => Object.hash(eventName, jsonEncode(eventData));
 

pkgs/unified_analytics/lib/src/event.dart

@@ -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.1
+version: 8.0.3
 # 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/pubspec.yaml

@@ -85,35 +85,35 @@ void main() {
 
   test('Event.contextStructure constructed', () {
     Event generateEvent() => Event.contextStructure(
-          contextsFromBothFiles: 1,
-          contextsFromOptionsFiles: 2,
-          contextsFromPackagesFiles: 3,
-          contextsWithoutFiles: 4,
-          immediateFileCount: 5,
-          immediateFileLineCount: 6,
-          numberOfContexts: 7,
-          transitiveFileCount: 8,
-          transitiveFileLineCount: 9,
-          transitiveFileUniqueCount: 10,
-          transitiveFileUniqueLineCount: 11,
+          immediateFileCount: 1,
+          immediateFileLineCount: 2,
+          numberOfContexts: 3,
+          transitiveFileCount: 4,
+          transitiveFileLineCount: 5,
+          transitiveFileUniqueCount: 6,
+          transitiveFileUniqueLineCount: 7,
+          libraryCycleLibraryCounts: 'a',
+          libraryCycleLineCounts: 'b',
         );
 
     final constructedEvent = generateEvent();
 
     expect(generateEvent, returnsNormally);
     expect(constructedEvent.eventName, DashEvent.contextStructure);
-    expect(constructedEvent.eventData['contextsFromBothFiles'], 1);
-    expect(constructedEvent.eventData['contextsFromOptionsFiles'], 2);
-    expect(constructedEvent.eventData['contextsFromPackagesFiles'], 3);
-    expect(constructedEvent.eventData['contextsWithoutFiles'], 4);
-    expect(constructedEvent.eventData['immediateFileCount'], 5);
-    expect(constructedEvent.eventData['immediateFileLineCount'], 6);
-    expect(constructedEvent.eventData['numberOfContexts'], 7);
-    expect(constructedEvent.eventData['transitiveFileCount'], 8);
-    expect(constructedEvent.eventData['transitiveFileLineCount'], 9);
-    expect(constructedEvent.eventData['transitiveFileUniqueCount'], 10);
-    expect(constructedEvent.eventData['transitiveFileUniqueLineCount'], 11);
-    expect(constructedEvent.eventData.length, 11);
+    expect(constructedEvent.eventData['immediateFileCount'], 1);
+    expect(constructedEvent.eventData['immediateFileLineCount'], 2);
+    expect(constructedEvent.eventData['numberOfContexts'], 3);
+    expect(constructedEvent.eventData['transitiveFileCount'], 4);
+    expect(constructedEvent.eventData['transitiveFileLineCount'], 5);
+    expect(constructedEvent.eventData['transitiveFileUniqueCount'], 6);
+    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);
   });
 
   test('Event.dartCliCommandExecuted constructed', () {
@@ -655,6 +655,27 @@ void main() {
     expect(constructedEvent.eventData.length, 20);
   });
 
+  test('Event.dartMCPEvent constructed', () {
+    final event = Event.dartMCPEvent(
+        client: 'test client',
+        clientVersion: '1.0.0',
+        serverVersion: '1.1.0',
+        type: 'some_event',
+        additionalData:
+            _TestMetrics(boolField: true, stringField: 'hello', intField: 1));
+    expect(
+        event.eventData,
+        equals({
+          'client': 'test client',
+          'clientVersion': '1.0.0',
+          'serverVersion': '1.1.0',
+          'type': 'some_event',
+          'boolField': true,
+          'stringField': 'hello',
+          'intField': 1,
+        }));
+  });
+
   test('Confirm all constructors were checked', () {
     var constructorCount = 0;
     for (final declaration in reflectClass(Event).declarations.keys) {
@@ -667,7 +688,7 @@ void main() {
 
     // Change this integer below if your PR either adds or removes
     // an Event constructor
-    final eventsAccountedForInTests = 28;
+    final eventsAccountedForInTests = 29;
     expect(eventsAccountedForInTests, constructorCount,
         reason: 'If you added or removed an event constructor, '
             'ensure you have updated '