Rework instrumentation API

pkg/analysis_server/lib/src/channel/web_socket_channel.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 channel.web_socket;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ skipping 55 matching lines @@
  * [ServerCommunicationChannel] that uses a [WebSocket] to communicate with
  * clients.
  */
 class WebSocketServerChannel implements ServerCommunicationChannel {
   /**
    * The socket being wrapped.
    */
   final WebSocket socket;
 
   /**
-   * The instrumentation server that is to be used by this analysis server.
+   * The instrumentation service that is to be used by this analysis server.
    */
-  final InstrumentationServer instrumentationServer;
+  final InstrumentationService instrumentationService;
 
   /**
    * Initialize a newly create [WebSocket] wrapper to wrap the given [socket].
    */
-  WebSocketServerChannel(this.socket, this.instrumentationServer);
+  WebSocketServerChannel(this.socket, this.instrumentationService);
 
   @override
   void close() {
     socket.close(WebSocketStatus.NORMAL_CLOSURE);
   }
 
   @override
   void listen(void onRequest(Request request), {void onError(), void
       onDone()}) {
     socket.listen(
         (data) => readRequest(data, onRequest),
         onError: onError,
         onDone: onDone);
   }
 
   /**
    * Read a request from the given [data] and use the given function to handle
    * the request.
    */
   void readRequest(Object data, void onRequest(Request request)) {
     if (data is String) {
-      instrumentationServer.log(data);
+      instrumentationService.logRequest(data);
       // Parse the string as a JSON descriptor and process the resulting
       // structure as a request.
       ServerCommunicationChannel.FromJson.start();
       Request request = new Request.fromString(data);
       ServerCommunicationChannel.FromJson.stop();
       if (request == null) {
         sendResponse(new Response.invalidRequestFormat());
         return;
       }
       onRequest(request);
     } else if (data is List<int>) {
       // TODO(brianwilkerson) Implement a more efficient protocol.
       sendResponse(new Response.invalidRequestFormat());
     } else {
       sendResponse(new Response.invalidRequestFormat());
     }
   }
 
   @override
   void sendNotification(Notification notification) {
     ServerCommunicationChannel.ToJson.start();
     String jsonEncoding = JSON.encode(notification.toJson());
     ServerCommunicationChannel.ToJson.stop();
     socket.add(jsonEncoding);
-    instrumentationServer.log(jsonEncoding);
+    instrumentationService.logNotification(jsonEncoding);
   }
 
   @override
   void sendResponse(Response response) {
     ServerCommunicationChannel.ToJson.start();
     String jsonEncoding = JSON.encode(response.toJson());
     ServerCommunicationChannel.ToJson.stop();
     socket.add(jsonEncoding);
-    instrumentationServer.log(jsonEncoding);
+    instrumentationService.logResponse(jsonEncoding);
   }
 }