Rework instrumentation API

pkg/analysis_server/lib/src/channel/byte_stream_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.byte_stream;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ skipping 70 matching lines @@
    * wait for it to complete before sending more data.  There may or may not be
    * outstanding data in [_pendingOutput].
    */
   static const int _STATE_FLUSH_PENDING = 2;
 
   final Stream input;
 
   final IOSink _output;
 
   /**
-   * 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;
 
   /**
    * Completer that will be signalled when the input stream is closed.
    */
   final Completer _closed = new Completer();
 
   /**
    * State of the output stream (see constants above).
    */
   int _outputState = _STATE_IDLE;
 
   /**
    * List of strings that need to be sent to [_output] at the next available
    * opportunity.
    */
   List<String> _pendingOutput = <String>[];
 
   /**
    * True if [close] has been called.
    */
   bool _closeRequested = false;
 
-  ByteStreamServerChannel(this.input, this._output, this.instrumentationServer);
+  ByteStreamServerChannel(this.input, this._output,
+      this.instrumentationService);
 
   /**
    * Future that will be completed when the input stream is closed.
    */
   Future get closed {
     return _closed.future;
   }
 
   @override
   void close() {
@@ skipping 27 matching lines @@
   void sendNotification(Notification notification) {
     // Don't send any further notifications after the communication channel is
     // closed.
     if (_closeRequested) {
       return;
     }
     ServerCommunicationChannel.ToJson.start();
     String jsonEncoding = JSON.encode(notification.toJson());
     ServerCommunicationChannel.ToJson.stop();
     _outputLine(jsonEncoding);
-    instrumentationServer.log(jsonEncoding);
+    instrumentationService.logNotification(jsonEncoding);
   }
 
   @override
   void sendResponse(Response response) {
     // Don't send any further responses after the communication channel is
     // closed.
     if (_closeRequested) {
       return;
     }
     ServerCommunicationChannel.ToJson.start();
     String jsonEncoding = JSON.encode(response.toJson());
     ServerCommunicationChannel.ToJson.stop();
     _outputLine(jsonEncoding);
-    instrumentationServer.log(jsonEncoding);
+    instrumentationService.logResponse(jsonEncoding);
   }
 
   /**
    * Callback invoked after a flush of [_output] completes.  Closes the stream
    * if necessary.  Otherwise schedules additional pending output.
    */
   void _flushCompleted(_) {
     assert(_outputState == _STATE_FLUSH_PENDING);
     if (_pendingOutput.isNotEmpty) {
       _output.write(_pendingOutput.join());
@@ skipping 37 matching lines @@
 
   /**
    * Read a request from the given [data] and use the given function to handle
    * the request.
    */
   void _readRequest(Object data, void onRequest(Request request)) {
     // Ignore any further requests after the communication channel is closed.
     if (_closed.isCompleted) {
       return;
     }
-    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);
   }
 }