Hooks for instrumentation

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';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/socket_server.dart';
 import 'package:analysis_server/stdio_server.dart';
+import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/src/generated/incremental_logger.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:args/args.dart';
 
 
 /**
  * Initializes incremental logger.
  *
@@ skipping 83 matching lines @@
    * TODO(paulberry): get rid of this once the 'analysis.updateSdks' request is
    * operational.
    */
   static const String SDK_OPTION = "sdk";
 
   /**
    * The name of the option used to disable error notifications.
    */
   static const String NO_ERROR_NOTIFICATION = "no-error-notification";
 
+  /**
+   * The instrumentation server that is to be used by the analysis server.
+   */
+  InstrumentationServer instrumentationServer;
+
   SocketServer socketServer;
 
   HttpAnalysisServer httpServer;
 
   StdioAnalysisServer stdioServer;
 
   Driver();
   /**
    * Use the given command-line arguments to start this server.
    */
@@ skipping 39 matching lines @@
         help:
             "disable sending all analysis error notifications to the server (not yet implemented)",
         defaultsTo: false,
         negatable: false);
 
     ArgResults results = parser.parse(args);
     if (results[HELP_OPTION]) {
       _printUsage(parser);
       return;
     }
-    if (results[ENABLE_INSTRUMENTATION_OPTION]) {
-      if (results[INSTRUMENTATION_LOG_FILE_OPTION] != null) {
-        // TODO(brianwilkerson) Initialize the instrumentation system with
-        // logging.
-      } else {
-        // TODO(brianwilkerson) Initialize the instrumentation system without
-        // logging.
-      }
-    }
+
+    // TODO(brianwilkerson) Enable this after it is possible for an
+    // instrumentation server to be provided.
+//    if (results[ENABLE_INSTRUMENTATION_OPTION]) {
+////      if (results[INSTRUMENTATION_LOG_FILE_OPTION] != null) {
+////        // TODO(brianwilkerson) Initialize the instrumentation server with
+////        // logging.
+////      } else {
+////        // TODO(brianwilkerson) Initialize the instrumentation server without
+////        // logging.
+////      }
+//      if (instrumentationServer == null) {
+//        print('Exiting server: enabled instrumentation without providing an instrumentation server');
+//        print('');
+//        _printUsage(parser);
+//        return;
+//      }
+//    } else {
+//      if (instrumentationServer != null) {
+//        print('Exiting server: providing an instrumentation server without enabling instrumentation');
+//        print('');
+//        _printUsage(parser);
+//        return;
+//      }
+//    }
 
     int port;
     bool serve_http = false;
     if (results[PORT_OPTION] != null) {
       serve_http = true;
       try {
         port = int.parse(results[PORT_OPTION]);
       } on FormatException {
         print('Invalid port number: ${results[PORT_OPTION]}');
         print('');
@@ skipping 13 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);
+    socketServer = new SocketServer(
+        analysisServerOptions,
+        defaultSdk,
+        instrumentationServer == null ?
+            new NullInstrumentationServer() :
+            instrumentationServer);
     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);
   }
 }