Rework instrumentation API

pkg/analysis_server/test/socket_server_test.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 test.socket.server;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
@@ skipping 18 matching lines @@
         'requestHandler_futureException',
         SocketServerTest.requestHandler_futureException);
   });
 }
 
 class SocketServerTest {
   static void createAnalysisServer_alreadyStarted() {
     SocketServer server = new SocketServer(
         new AnalysisServerOptions(),
         DirectoryBasedDartSdk.defaultSdk,
-        new NullInstrumentationServer());
+        InstrumentationService.NULL_SERVICE);
     MockServerChannel channel1 = new MockServerChannel();
     MockServerChannel channel2 = new MockServerChannel();
     server.createAnalysisServer(channel1);
     expect(channel1.notificationsReceived[0].event, SERVER_CONNECTED);
     server.createAnalysisServer(channel2);
     channel1.expectMsgCount(notificationCount: 1);
     channel2.expectMsgCount(responseCount: 1);
     expect(channel2.responsesReceived[0].id, equals(''));
     expect(channel2.responsesReceived[0].error, isNotNull);
     expect(
         channel2.responsesReceived[0].error.code,
         equals(RequestErrorCode.SERVER_ALREADY_STARTED));
     channel2.sendRequest(
         new ServerShutdownParams().toRequest('0')).then((Response response) {
       expect(response.id, equals('0'));
       expect(response.error, isNotNull);
       expect(
           response.error.code,
           equals(RequestErrorCode.SERVER_ALREADY_STARTED));
       channel2.expectMsgCount(responseCount: 2);
     });
   }
 
   static Future createAnalysisServer_successful() {
     SocketServer server = new SocketServer(
         new AnalysisServerOptions(),
         DirectoryBasedDartSdk.defaultSdk,
-        new NullInstrumentationServer());
+        InstrumentationService.NULL_SERVICE);
     MockServerChannel channel = new MockServerChannel();
     server.createAnalysisServer(channel);
     channel.expectMsgCount(notificationCount: 1);
     expect(channel.notificationsReceived[0].event, SERVER_CONNECTED);
     return channel.sendRequest(
         new ServerShutdownParams().toRequest('0')).then((Response response) {
       expect(response.id, equals('0'));
       expect(response.error, isNull);
       channel.expectMsgCount(responseCount: 1, notificationCount: 1);
     });
   }
 
   static Future requestHandler_exception() {
     SocketServer server = new SocketServer(
         new AnalysisServerOptions(),
         DirectoryBasedDartSdk.defaultSdk,
-        new NullInstrumentationServer());
+        InstrumentationService.NULL_SERVICE);
     MockServerChannel channel = new MockServerChannel();
     server.createAnalysisServer(channel);
     channel.expectMsgCount(notificationCount: 1);
     expect(channel.notificationsReceived[0].event, SERVER_CONNECTED);
     _MockRequestHandler handler = new _MockRequestHandler(false);
     server.analysisServer.handlers = [handler];
     var request = new ServerGetVersionParams().toRequest('0');
     return channel.sendRequest(request).then((Response response) {
       expect(response.id, equals('0'));
       expect(response.error, isNotNull);
       expect(response.error.code, equals(RequestErrorCode.SERVER_ERROR));
       expect(response.error.message, equals('mock request exception'));
       expect(response.error.stackTrace, isNotNull);
       expect(response.error.stackTrace, isNot(isEmpty));
       channel.expectMsgCount(responseCount: 1, notificationCount: 1);
     });
   }
 
   static Future requestHandler_futureException() {
     SocketServer server = new SocketServer(
         new AnalysisServerOptions(),
         DirectoryBasedDartSdk.defaultSdk,
-        new NullInstrumentationServer());
+        InstrumentationService.NULL_SERVICE);
     MockServerChannel channel = new MockServerChannel();
     server.createAnalysisServer(channel);
     _MockRequestHandler handler = new _MockRequestHandler(true);
     server.analysisServer.handlers = [handler];
     var request = new ServerGetVersionParams().toRequest('0');
     return channel.sendRequest(request).then((Response response) {
       expect(response.id, equals('0'));
       expect(response.error, isNull);
       channel.expectMsgCount(responseCount: 1, notificationCount: 2);
       expect(channel.notificationsReceived[1].event, SERVER_ERROR);
@@ skipping 12 matching lines @@
       new Future(throwException);
       return new Response(request.id);
     }
     throw 'mock request exception';
   }
 
   void throwException() {
     throw 'mock future exception';
   }
 }