Version 3.5.0-136.0.dev

Merge 8e5b70a into dev
dart-lang · May 8, 2024 · da7a5a9 · da7a5a9
2 parents a0dbd17 + 8e5b70a
commit da7a5a9
Show file tree

Hide file tree

Showing 77 changed files with 1,429 additions and 698 deletions.
diff --git a/pkg/analysis_server/doc/api.html b/pkg/analysis_server/doc/api.html
@@ -110,7 +110,7 @@
 <body>
 <h1>Analysis Server API Specification</h1>
 <h1 style="color:#999999">Version
-  1.37.0
+  1.38.0
 </h1>
 <p>
   This document contains a specification of the API provided by the
@@ -245,6 +245,11 @@ <h3>Enumerations</h3>
   ignoring the item or treating it with some default/fallback handling.
 </p>
 <h3>Changelog</h3>
+<h4>1.38.0</h4>
+<ul>
+  <li>Deprecated the <tt>analytics.enable</tt> request.</li>
+  <li>Deprecated the <tt>analytics.isEnabled</tt> request.</li>
+</ul>
 <h4>1.37.0</h4>
 <ul>
   <li><tt>SourceEdit</tt> now has an optional human-readable <tt>description</tt> that

diff --git a/pkg/analysis_server/lib/protocol/protocol_constants.dart b/pkg/analysis_server/lib/protocol/protocol_constants.dart
@@ -6,7 +6,7 @@
 // To regenerate the file, use the script
 // "pkg/analysis_server/tool/spec/generate_files".
 
-const String PROTOCOL_VERSION = '1.37.0';
+const String PROTOCOL_VERSION = '1.38.0';
 
 const String ANALYSIS_NOTIFICATION_ANALYZED_FILES = 'analysis.analyzedFiles';
 const String ANALYSIS_NOTIFICATION_ANALYZED_FILES_DIRECTORIES = 'directories';

diff --git a/pkg/analysis_server/lib/src/handler/legacy/analysis_reanalyze.dart b/pkg/analysis_server/lib/src/handler/legacy/analysis_reanalyze.dart
@@ -17,8 +17,6 @@ class AnalysisReanalyzeHandler extends LegacyHandler {
 
   @override
   Future<void> handle() async {
-    unawaited(server.options.analytics?.sendEvent('analysis', 'reanalyze'));
-
     // Send the response before starting any work so that analysis results and
     // status events will only arrive after the response.
     sendResult(AnalysisReanalyzeResult());

diff --git a/pkg/analysis_server/lib/src/handler/legacy/analysis_set_analysis_roots.dart b/pkg/analysis_server/lib/src/handler/legacy/analysis_set_analysis_roots.dart
@@ -21,11 +21,6 @@ class AnalysisSetAnalysisRootsHandler extends LegacyHandler {
     var includedPathList = params.included;
     var excludedPathList = params.excluded;
 
-    unawaited(server.options.analytics?.sendEvent(
-      'analysis',
-      'setAnalysisRoots',
-      value: includedPathList.length,
-    ));
     server.analyticsManager.startedSetAnalysisRoots(params);
 
     // validate

diff --git a/pkg/analysis_server/lib/src/handler/legacy/analytics_enable.dart b/pkg/analysis_server/lib/src/handler/legacy/analytics_enable.dart
@@ -16,11 +16,6 @@ class AnalyticsEnableHandler extends LegacyHandler {
 
   @override
   Future<void> handle() async {
-    var params = AnalyticsEnableParams.fromRequest(request);
-    var analytics = server.options.analytics;
-    if (analytics != null) {
-      analytics.enabled = params.value;
-    }
     sendResult(AnalyticsEnableResult());
   }
 }
diff --git a/pkg/analysis_server/lib/src/handler/legacy/analytics_is_enabled.dart b/pkg/analysis_server/lib/src/handler/legacy/analytics_is_enabled.dart
@@ -16,7 +16,6 @@ class AnalyticsIsEnabledHandler extends LegacyHandler {
 
   @override
   Future<void> handle() async {
-    sendResult(
-        AnalyticsIsEnabledResult(server.options.analytics?.enabled ?? false));
+    sendResult(AnalyticsIsEnabledResult(false));
   }
 }
diff --git a/pkg/analysis_server/lib/src/handler/legacy/analytics_send_event.dart b/pkg/analysis_server/lib/src/handler/legacy/analytics_send_event.dart
@@ -14,18 +14,8 @@ class AnalyticsSendEventHandler extends LegacyHandler {
   AnalyticsSendEventHandler(
       super.server, super.request, super.cancellationToken, super.performance);
 
-  String get _clientId => server.options.clientId ?? 'client';
-
   @override
   Future<void> handle() async {
-    var analytics = server.options.analytics;
-    if (analytics == null) {
-      sendResult(AnalyticsSendEventResult());
-      return;
-    }
-
-    var params = AnalyticsSendEventParams.fromRequest(request);
-    unawaited(analytics.sendEvent(_clientId, params.action));
     sendResult(AnalyticsSendEventResult());
   }
 }
diff --git a/pkg/analysis_server/lib/src/handler/legacy/analytics_send_timing.dart b/pkg/analysis_server/lib/src/handler/legacy/analytics_send_timing.dart
@@ -14,19 +14,8 @@ class AnalyticsSendTimingHandler extends LegacyHandler {
   AnalyticsSendTimingHandler(
       super.server, super.request, super.cancellationToken, super.performance);
 
-  String get _clientId => server.options.clientId ?? 'client';
-
   @override
   Future<void> handle() async {
-    var analytics = server.options.analytics;
-    if (analytics == null) {
-      sendResult(AnalyticsSendTimingResult());
-      return;
-    }
-
-    var params = AnalyticsSendTimingParams.fromRequest(request);
-    unawaited(
-        analytics.sendTiming(params.event, params.millis, category: _clientId));
     sendResult(AnalyticsSendTimingResult());
   }
 }
diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_format.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_format.dart
@@ -21,11 +21,9 @@ class EditFormatHandler extends LegacyHandler {
 
   @override
   Future<void> handle() async {
-    unawaited(server.options.analytics?.sendEvent('edit', 'format'));
-
     var params = EditFormatParams.fromRequest(request);
     var file = params.file;
-//
+
     String unformattedCode;
     try {
       var resource = server.resourceProvider.getFile(file);

diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_get_postfix_completion.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_get_postfix_completion.dart
@@ -18,11 +18,6 @@ class EditGetPostfixCompletionHandler extends LegacyHandler {
 
   @override
   Future<void> handle() async {
-    unawaited(server.options.analytics?.sendEvent(
-      'edit',
-      'getPostfixCompletion',
-    ));
-
     var params = EditGetPostfixCompletionParams.fromRequest(request);
     var file = params.file;
 

diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_organize_directives.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_organize_directives.dart
@@ -20,12 +20,6 @@ class EditOrganizeDirectivesHandler extends LegacyHandler {
 
   @override
   Future<void> handle() async {
-    // TODO(brianwilkerson): Move analytics tracking out of [handleRequest].
-    unawaited(server.options.analytics?.sendEvent(
-      'edit',
-      'organizeDirectives',
-    ));
-
     var params = EditOrganizeDirectivesParams.fromRequest(request);
     var file = params.file;
 

diff --git a/pkg/analysis_server/lib/src/legacy_analysis_server.dart b/pkg/analysis_server/lib/src/legacy_analysis_server.dart
@@ -113,7 +113,6 @@ import 'package:analyzer_plugin/utilities/navigation/navigation_dart.dart';
 import 'package:http/http.dart' as http;
 import 'package:meta/meta.dart';
 import 'package:telemetry/crash_reporting.dart';
-import 'package:telemetry/telemetry.dart' as telemetry;
 import 'package:watcher/watcher.dart';
 
 /// A function that can be executed to create a handler for a request.
@@ -136,10 +135,6 @@ class AnalysisServerOptions {
   /// If `null`, then the default discovery mechanism is used.
   String? packagesFile;
 
-  /// The analytics instance; note, this object can be `null`, and should be
-  /// accessed via a null-aware operator.
-  telemetry.Analytics? analytics;
-
   /// The crash report sender instance; note, this object can be `null`, and
   /// should be accessed via a null-aware operator.
   CrashReportSender? crashReportSender;
@@ -876,17 +871,6 @@ class LegacyAnalysisServer extends AnalysisServer {
 
     pubApi.close();
 
-    // TODO(brianwilkerson): Remove the following 6 lines when the
-    //  analyticsManager is being correctly initialized.
-    var analytics = options.analytics;
-    if (analytics != null) {
-      unawaited(analytics
-          .waitForLastPing(timeout: Duration(milliseconds: 200))
-          .then((_) {
-        analytics.close();
-      }));
-    }
-
     detachableFileSystemManager?.dispose();
 
     // Defer closing the channel and shutting down the instrumentation server so

diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart
@@ -38,7 +38,6 @@ import 'package:analyzer/src/util/sdk.dart';
 import 'package:args/args.dart';
 import 'package:linter/src/rules.dart' as linter;
 import 'package:telemetry/crash_reporting.dart';
-import 'package:telemetry/telemetry.dart' as telemetry;
 import 'package:unified_analytics/unified_analytics.dart';
 
 import '../utilities/usage_tracking/usage_tracking.dart';
@@ -197,23 +196,6 @@ class Driver implements ServerStarter {
       disableAnalyticsForSession = true;
     }
 
-    // Use sdkConfig to optionally override legacy analytics settings.
-    var analyticsId = sdkConfig.analyticsId ?? 'UA-26406144-29';
-    var forceAnalyticsEnabled = sdkConfig.analyticsForceEnabled == true;
-    var analytics = telemetry.createAnalyticsInstance(
-      analyticsId,
-      'analysis-server',
-      disableForSession: disableAnalyticsForSession,
-      forceEnabled: forceAnalyticsEnabled,
-    );
-    analysisServerOptions.analytics = analytics;
-
-    // Record the client name as the application installer ID.
-    analytics.setSessionValue('aiid', analysisServerOptions.clientId);
-    if (analysisServerOptions.clientVersion != null) {
-      analytics.setSessionValue('cd1', analysisServerOptions.clientVersion);
-    }
-
     var defaultSdkPath = _getSdkPath(results);
     var dartSdkManager = DartSdkManager(defaultSdkPath);
 
@@ -255,14 +237,6 @@ class Driver implements ServerStarter {
     var crashReportSender =
         CrashReportSender.prod(crashProductId, shouldSendCallback);
 
-    if (telemetry.showAnalyticsUI) {
-      if (results.wasParsed(ANALYTICS_FLAG)) {
-        analytics.enabled = results[ANALYTICS_FLAG] as bool;
-        print(telemetry.createAnalyticsStatusMessage(analytics.enabled));
-        return;
-      }
-    }
-
     {
       var disableCompletion =
           results[DISABLE_SERVER_FEATURE_COMPLETION] as bool;
@@ -276,7 +250,7 @@ class Driver implements ServerStarter {
     }
 
     if (results[HELP_OPTION] as bool) {
-      _printUsage(parser, analytics, fromHelp: true);
+      _printUsage(parser, fromHelp: true);
       return;
     }
 
@@ -328,7 +302,7 @@ class Driver implements ServerStarter {
       } on FormatException {
         print('Invalid port number: $portValue');
         print('');
-        _printUsage(parser, analytics);
+        _printUsage(parser);
         exitCode = 1;
         return;
       }
@@ -360,7 +334,6 @@ class Driver implements ServerStarter {
           crashReportingAttachmentsBuilder,
           instrumentationService,
           RequestStatisticsHelper(),
-          analytics,
           diagnosticServerPort,
           errorNotifier,
           sendPort);
@@ -381,7 +354,6 @@ class Driver implements ServerStarter {
     CrashReportingAttachmentsBuilder crashReportingAttachmentsBuilder,
     InstrumentationService instrumentationService,
     RequestStatisticsHelper requestStatistics,
-    telemetry.Analytics analytics,
     int? diagnosticServerPort,
     ErrorNotifier errorNotifier,
     SendPort? sendPort,
@@ -402,9 +374,6 @@ class Driver implements ServerStarter {
 
     var diagnosticServer = _DiagnosticServerImpl();
 
-    // Ping analytics with our initial call.
-    analytics.sendScreenView('home');
-
     //
     // Create the sockets and start listening for requests.
     //
@@ -671,24 +640,13 @@ class Driver implements ServerStarter {
 
   /// Print information about how to use the server.
   void _printUsage(
-    ArgParser parser,
-    telemetry.Analytics analytics, {
+    ArgParser parser, {
     bool fromHelp = false,
   }) {
     print('Usage: $BINARY_NAME [flags]');
     print('');
     print('Supported flags are:');
     print(parser.usage);
-
-    if (telemetry.showAnalyticsUI) {
-      // Print analytics status and information.
-      if (fromHelp) {
-        print('');
-        print(telemetry.analyticsNotice);
-      }
-      print('');
-      print(telemetry.createAnalyticsStatusMessage(analytics.enabled));
-    }
   }
 
   /// Read the UUID from disk, generating and storing a new one if necessary.
@@ -803,7 +761,7 @@ class Driver implements ServerStarter {
     parser.addFlag(ANALYTICS_FLAG,
         help: 'Allow or disallow sending analytics information to '
             'Google for this session.',
-        hide: !telemetry.showAnalyticsUI);
+        hide: true);
     parser.addFlag(SUPPRESS_ANALYTICS_FLAG,
         negatable: false,
         help: 'Suppress analytics for this session.',

diff --git a/pkg/analysis_server/lib/src/server/sdk_configuration.dart b/pkg/analysis_server/lib/src/server/sdk_configuration.dart
@@ -39,14 +39,6 @@ class SdkConfiguration {
     }
   }
 
-  /// Whether analytics is forced on.
-  bool? get analyticsForceEnabled =>
-      _values['server.analytics.forceEnabled'] as bool?;
-
-  /// Return an override value for the analysis server's google analytics ID, or
-  /// `null` if the default value should be used.
-  String? get analyticsId => _values['server.analytics.id'] as String?;
-
   /// Whether crash reporting is forced on.
   bool? get crashReportingForceEnabled =>
       _values['server.crash.reporting.forceEnabled'] as bool?;

diff --git a/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml b/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml
@@ -223,6 +223,8 @@ CompileTimeErrorCode.AUGMENTATION_WITHOUT_IMPORT:
     The fix is to add `import augment`.
 CompileTimeErrorCode.AUGMENTATION_WITHOUT_LIBRARY:
   status: noFix
+CompileTimeErrorCode.AUGMENTED_EXPRESSION_IS_SETTER:
+  status: noFix
 CompileTimeErrorCode.AUGMENTED_EXPRESSION_NOT_OPERATOR:
   status: noFix
 CompileTimeErrorCode.AWAIT_IN_LATE_LOCAL_VARIABLE_INITIALIZER:
@@ -2674,6 +2676,8 @@ ParserErrorCode.COVARIANT_TOP_LEVEL_DECLARATION:
   status: needsFix
   notes: |-
     Remove `covariant`.
+ParserErrorCode.DECLARATION_NAMED_AUGMENTED_INSIDE_AUGMENTATION:
+  status: noFix
 ParserErrorCode.DEFAULT_IN_SWITCH_EXPRESSION:
   status: hasFix
 ParserErrorCode.DEFAULT_VALUE_IN_FUNCTION_TYPE:

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
@@ -105,9 +105,6 @@ class RefactoringManager {
       return;
     }
 
-    server.options.analytics
-        ?.sendEvent('refactor', params.kind.name.toLowerCase());
-
     runZonedGuarded(() async {
       await _init(
           params.kind, file, params.offset, params.length, cancellationToken);

diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml
@@ -148,8 +148,6 @@ dependency_overrides:
     path: ../../third_party/pkg/typed_data
   unified_analytics:
     path: ../../third_party/pkg/tools/pkgs/unified_analytics
-  usage:
-    path: ../../third_party/pkg/usage
   vm_service:
     path: ../vm_service
   watcher:

diff --git a/pkg/analysis_server/test/integration/analytics/enable_test.dart b/pkg/analysis_server/test/integration/analytics/enable_test.dart