Rework instrumentation API

pkg/analysis_server/lib/driver.dart

Index: pkg/analysis_server/lib/driver.dart
diff --git a/pkg/analysis_server/lib/driver.dart b/pkg/analysis_server/lib/driver.dart
index 08d7bfac72635ac463412634eecd67266fb54cec..d4bd7ca2e9aadbee12ac57d84f2d422989c0e660 100644
--- a/pkg/analysis_server/lib/driver.dart
+++ b/pkg/analysis_server/lib/driver.dart
@@ -237,12 +237,11 @@ class Driver {
       defaultSdk = DirectoryBasedDartSdk.defaultSdk;
     }
 
-    socketServer = new SocketServer(
-        analysisServerOptions,
-        defaultSdk,
-        instrumentationServer == null ?
-            new NullInstrumentationServer() :
-            instrumentationServer);
+    InstrumentationService service =
+        new InstrumentationService(instrumentationServer);
+//    service.logVersion(defaultSdk.sdkVersion);
+
+    socketServer = new SocketServer(analysisServerOptions, defaultSdk, service);
     httpServer = new HttpAnalysisServer(socketServer);
     stdioServer = new StdioAnalysisServer(socketServer);