Rework instrumentation API

pkg/analysis_server/lib/driver.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library driver;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:analysis_server/http_server.dart';
@@ skipping 219 matching lines @@
 
     DartSdk defaultSdk;
     if (results[SDK_OPTION] != null) {
       defaultSdk = new DirectoryBasedDartSdk(new JavaFile(results[SDK_OPTION]));
     } else {
       // No path to the SDK provided; use DirectoryBasedDartSdk.defaultSdk,
       // which will make a guess.
       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);
 
     if (serve_http) {
       httpServer.serveHttp(port);
     }
 
     if (results[INTERNAL_PRINT_TO_CONSOLE]) {
       stdioServer.serveStdio().then((_) {
         if (serve_http) {
@@ skipping 30 matching lines @@
   /**
    * Print information about how to use the server.
    */
   void _printUsage(ArgParser parser) {
     print('Usage: $BINARY_NAME [flags]');
     print('');
     print('Supported flags are:');
     print(parser.usage);
   }
 }