Rework instrumentation API

pkg/analysis_server/lib/src/socket_server.dart

Index: pkg/analysis_server/lib/src/socket_server.dart
diff --git a/pkg/analysis_server/lib/src/socket_server.dart b/pkg/analysis_server/lib/src/socket_server.dart
index 12337a89b44b7c8c60a65ff5fa843cf5a9deafe3..d6851ecde7bde364e52f5df4687959f9cde6f3b0 100644
--- a/pkg/analysis_server/lib/src/socket_server.dart
+++ b/pkg/analysis_server/lib/src/socket_server.dart
@@ -40,7 +40,7 @@ Index _createIndex() {
 class SocketServer {
   final AnalysisServerOptions analysisServerOptions;
   final DirectoryBasedDartSdk defaultSdk;
-  final InstrumentationServer instrumentationServer;
+  final InstrumentationService instrumentationService;
 
   /**
    * The analysis server that was created when a client established a
@@ -49,7 +49,7 @@ class SocketServer {
   AnalysisServer analysisServer;
 
   SocketServer(this.analysisServerOptions, this.defaultSdk,
-      this.instrumentationServer);
+      this.instrumentationService);
 
   /**
    * Create an analysis server which will communicate with the client using the
@@ -75,7 +75,7 @@ class SocketServer {
         _createIndex(),
         analysisServerOptions,
         defaultSdk,
-        instrumentationServer,
+        instrumentationService,
         rethrowExceptions: false);
     _initializeHandlers(analysisServer);
   }