Fix bugs and add instrumentation

pkg/analyzer/lib/instrumentation/instrumentation.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 analyzer.instrumentation.instrumentation;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:analyzer/task/model.dart';
 
 /**
  * A container with analysis performance constants.
  */
 class AnalysisPerformanceKind {
   static const String FULL = 'analysis_full';
   static const String INCREMENTAL = 'analysis_incremental';
 }
 
 /**
  * The interface used by client code to communicate with an instrumentation
  * server.
  */
 abstract class InstrumentationServer {
   /**
+   * A user-friendly description of this instrumentation server.
+   */
+  String get describe;
+
+  /**
    * Return the identifier used to identify the current session.
    */
   String get sessionId;
 
   /**
-   * A user-friendly description of this instrumentation server.
-   */
-  String get describe;
-
-  /**
    * Pass the given [message] to the instrumentation server so that it will be
    * logged with other messages.
    *
    * This method should be used for most logging.
    */
   void log(String message);
 
   /**
    * Pass the given [message] to the instrumentation server so that it will be
    * logged with other messages.
@@ skipping 22 matching lines @@
   static final InstrumentationService NULL_SERVICE =
       new InstrumentationService(null);
 
   static const String TAG_ANALYSIS_TASK = 'Task';
   static const String TAG_ERROR = 'Err';
   static const String TAG_EXCEPTION = 'Ex';
   static const String TAG_FILE_READ = 'Read';
   static const String TAG_LOG_ENTRY = 'Log';
   static const String TAG_NOTIFICATION = 'Noti';
   static const String TAG_PERFORMANCE = 'Perf';
+  static const String TAG_PLUGIN_NOTIFICATION = 'PluginNoti';
+  static const String TAG_PLUGIN_REQUEST = 'PluginReq';
+  static const String TAG_PLUGIN_RESPONSE = 'PluginRes';
   static const String TAG_REQUEST = 'Req';
   static const String TAG_RESPONSE = 'Res';
   static const String TAG_SUBPROCESS_START = 'SPStart';
   static const String TAG_SUBPROCESS_RESULT = 'SPResult';
   static const String TAG_VERSION = 'Ver';
   static const String TAG_WATCH_EVENT = 'Watch';
 
   /**
    * The instrumentation server used to communicate with the server, or `null`
    * if instrumentation data should not be logged.
    */
   InstrumentationServer _instrumentationServer;
 
   /**
    * Counter used to generate unique ID's for [logSubprocessStart].
    */
   int _subprocessCounter = 0;
 
   /**
    * Initialize a newly created instrumentation service to communicate with the
    * given [_instrumentationServer].
    */
   InstrumentationService(this._instrumentationServer);
 
+  InstrumentationServer get instrumentationServer => _instrumentationServer;
+
   /**
    * Return `true` if this [InstrumentationService] was initialized with a
    * non-`null` server (and hence instrumentation is active).
    */
   bool get isActive => _instrumentationServer != null;
 
   /**
    * Return the identifier used to identify the current session.
    */
   String get sessionId => _instrumentationServer?.sessionId ?? '';
 
   /**
    * The current time, expressed as a decimal encoded number of milliseconds.
    */
   String get _timestamp => new DateTime.now().millisecondsSinceEpoch.toString();
 
-  InstrumentationServer get instrumentationServer => _instrumentationServer;
-
   /**
    * Log that the given analysis [task] is being performed in the given
    * [context].
    */
   void logAnalysisTask(String context, AnalysisTask task) {
     if (_instrumentationServer != null) {
       _instrumentationServer
           .log(_join([TAG_ANALYSIS_TASK, context, task.description]));
     }
   }
@@ skipping 64 matching lines @@
    */
   void logPerformance(String kind, Stopwatch sw, String message) {
     sw.stop();
     String elapsed = sw.elapsedMilliseconds.toString();
     if (_instrumentationServer != null) {
       _instrumentationServer
           .log(_join([TAG_PERFORMANCE, kind, elapsed, message]));
     }
   }
 
+  void logPluginNotification(Uri pluginUri, String notification) {
+    if (_instrumentationServer != null) {
+      _instrumentationServer.log(
+          _join([TAG_PLUGIN_NOTIFICATION, _toString(pluginUri), notification]));
+    }
+  }
+
+  void logPluginRequest(Uri pluginUri, String request) {
+    if (_instrumentationServer != null) {
+      _instrumentationServer
+          .log(_join([TAG_PLUGIN_REQUEST, _toString(pluginUri), request]));
+    }
+  }
+
+  void logPluginResponse(Uri pluginUri, String response) {
+    if (_instrumentationServer != null) {
+      _instrumentationServer
+          .log(_join([TAG_PLUGIN_RESPONSE, _toString(pluginUri), response]));
+    }
+  }
+
   /**
    * Log that the given priority [exception] was thrown, with the given
    * [stackTrace].
    */
   void logPriorityException(dynamic exception, StackTrace stackTrace) {
     if (_instrumentationServer != null) {
       String message = _toString(exception);
       String trace = _toString(stackTrace);
       _instrumentationServer
           .logWithPriority(_join([TAG_EXCEPTION, message, trace]));
@@ skipping 153 matching lines @@
 
 /**
  * An [InstrumentationServer] that sends messages to multiple instances.
  */
 class MulticastInstrumentationServer implements InstrumentationServer {
   final List<InstrumentationServer> _servers;
 
   MulticastInstrumentationServer(this._servers);
 
   @override
-  String get sessionId => _servers[0].sessionId;
-
-  @override
   String get describe {
     return _servers
         .map((InstrumentationServer server) => server.describe)
         .join("\n");
   }
 
   @override
+  String get sessionId => _servers[0].sessionId;
+
+  @override
   void log(String message) {
     for (InstrumentationServer server in _servers) {
       server.log(message);
     }
   }
 
   @override
   void logWithPriority(String message) {
     for (InstrumentationServer server in _servers) {
       server.logWithPriority(message);
     }
   }
 
   @override
   Future shutdown() async {
     for (InstrumentationServer server in _servers) {
       await server.shutdown();
     }
   }
 }