Make Driver.instrumentationService private and final

Change-Id: I903c293771c6666e5f1b0f7dc2637abc51943849
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401580
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/server/driver.dart

@@ -141,7 +141,7 @@ class Driver implements ServerStarter {
   DetachableFileSystemManager? detachableFileSystemManager;
 
   /// The instrumentation service that is to be used by the analysis server.
-  InstrumentationService? instrumentationService;
+  late final InstrumentationService _instrumentationService;
 
   /// Use the given command-line [arguments] to start this server.
   ///
@@ -270,10 +270,7 @@ class Driver implements ServerStarter {
     var logFilePath =
         results.option(PROTOCOL_TRAFFIC_LOG) ??
         results.option(PROTOCOL_TRAFFIC_LOG_ALIAS);
-    var allInstrumentationServices =
-        this.instrumentationService == null
-            ? <InstrumentationService>[]
-            : [this.instrumentationService!];
+    var allInstrumentationServices = <InstrumentationService>[];
     if (logFilePath != null) {
       _rollLogFiles(logFilePath, 5);
       allInstrumentationServices.add(
@@ -289,21 +286,20 @@ class Driver implements ServerStarter {
     allInstrumentationServices.add(
       CrashReportingInstrumentation(crashReportSender),
     );
-    var instrumentationService = MulticastInstrumentationService(
+    _instrumentationService = MulticastInstrumentationService(
       allInstrumentationServices,
     );
-    this.instrumentationService = instrumentationService;
 
-    instrumentationService.logVersion(
+    _instrumentationService.logVersion(
       results.option(TRAIN_USING) != null
           ? 'training-0'
-          : _readUuid(instrumentationService),
+          : _readUuid(_instrumentationService),
       analysisServerOptions.clientId ?? '',
       analysisServerOptions.clientVersion ?? '',
       PROTOCOL_VERSION,
       defaultSdk.languageVersion.toString(),
     );
-    AnalysisEngine.instance.instrumentationService = instrumentationService;
+    AnalysisEngine.instance.instrumentationService = _instrumentationService;
 
     int? diagnosticServerPort;
     var portValue =
@@ -335,7 +331,7 @@ class Driver implements ServerStarter {
         analysisServerOptions,
         dartSdkManager,
         analyticsManager,
-        instrumentationService,
+        _instrumentationService,
         diagnosticServerPort,
         errorNotifier,
       );
@@ -347,7 +343,7 @@ class Driver implements ServerStarter {
         dartSdkManager,
         analyticsManager,
         crashReportingAttachmentsBuilder,
-        instrumentationService,
+        _instrumentationService,
         RequestStatisticsHelper(),
         diagnosticServerPort,
         errorNotifier,

pkg/analysis_server/lib/starter.dart

@@ -7,7 +7,6 @@ import 'dart:isolate';
 import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
 import 'package:analysis_server/src/server/detachable_filesystem_manager.dart';
 import 'package:analysis_server/src/server/driver.dart';
-import 'package:analyzer/instrumentation/instrumentation.dart';
 
 /// An object that can be used to start an analysis server. This class exists so
 /// that clients can configure an analysis server before starting it.
@@ -27,10 +26,6 @@ abstract class ServerStarter {
   /// available.
   set detachableFileSystemManager(DetachableFileSystemManager manager);
 
-  /// Set the instrumentation [service] that is to be used by the analysis
-  /// server.
-  set instrumentationService(InstrumentationService service);
-
   /// Use the given command-line [arguments] to start this server.
   void start(
     List<String> arguments, {