Add support for a client id

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';
@@ skipping 39 matching lines @@
  * server application.  It is responsible for parsing command line options
  * and starting the HTTP and/or stdio servers.
  */
 class Driver {
   /**
    * The name of the application that is used to start a server.
    */
   static const BINARY_NAME = "server";
 
   /**
+   * The name of the option used to set the identifier for the client.
+   */
+  static const String CLIENT_ID = "client-id";
+
+  /**
    * The name of the option used to enable incremental resolution.
    */
   static const String ENABLE_INCREMENTAL_RESOLUTION =
       "enable-incremental-resolution";
 
   /**
    * The name of the option used to enable incremental resolution of API
    * changes.
    */
   static const String ENABLE_INCREMENTAL_RESOLUTION_API =
       "enable-incremental-resolution-api";
 
   /**
    * The name of the option used to describe the incremental resolution logger.
    */
   static const String INCREMENTAL_RESOLUTION_LOG = "incremental-resolution-log";
 
   /**
    * The name of the option used to enable instrumentation.
    */
   static const String ENABLE_INSTRUMENTATION_OPTION = "enable-instrumentation";
 
   /**
    * The name of the option used to print usage information.
    */
   static const String HELP_OPTION = "help";
 
   /**
-   * The name of the option used to specify the log file to which
-   * instrumentation data is to be written.
-   */
-  static const String INSTRUMENTATION_LOG_FILE_OPTION =
-      "instrumentation-log-file";
-
-  /**
    * The name of the option used to specify if [print] should print to the
    * console instead of being intercepted.
    */
   static const String INTERNAL_PRINT_TO_CONSOLE = "internal-print-to-console";
 
   /**
    * The name of the option used to specify the port to which the server will
    * connect.
    */
   static const String PORT_OPTION = "port";
@@ skipping 20 matching lines @@
   HttpAnalysisServer httpServer;
 
   StdioAnalysisServer stdioServer;
 
   Driver();
   /**
    * Use the given command-line arguments to start this server.
    */
   void start(List<String> args) {
     ArgParser parser = new ArgParser();
+    parser.addOption(
+        CLIENT_ID,
+        help: "an identifier used to identify the client");
     parser.addFlag(
         ENABLE_INCREMENTAL_RESOLUTION,
         help: "enable using incremental resolution",
         defaultsTo: false,
         negatable: false);
     parser.addFlag(
         ENABLE_INCREMENTAL_RESOLUTION_API,
         help: "enable using incremental resolution for API changes",
         defaultsTo: false,
         negatable: false);
     parser.addFlag(
         ENABLE_INSTRUMENTATION_OPTION,
         help: "enable sending instrumentation information to a server",
         defaultsTo: false,
         negatable: false);
     parser.addFlag(
         HELP_OPTION,
         help: "print this help message without starting a server",
         defaultsTo: false,
         negatable: false);
     parser.addOption(
         INCREMENTAL_RESOLUTION_LOG,
         help: "the description of the incremental resolotion log");
-    parser.addOption(
-        INSTRUMENTATION_LOG_FILE_OPTION,
-        help: "[path] the file to which instrumentation data will be logged");
     parser.addFlag(
         INTERNAL_PRINT_TO_CONSOLE,
         help: "enable sending `print` output to the console",
         defaultsTo: false,
         negatable: false);
     parser.addOption(
         PORT_OPTION,
         help: "[port] the port on which the server will listen");
     parser.addOption(SDK_OPTION, help: "[path] the path to the sdk");
     parser.addFlag(
         NO_ERROR_NOTIFICATION,
         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;
     }
 
     // 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('');
@@ skipping 29 matching lines @@
     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;
     }
 
     InstrumentationService service =
         new InstrumentationService(instrumentationServer);
-//    service.logVersion(defaultSdk.sdkVersion);
+//    service.logVersion(results[CLIENT_ID], defaultSdk.sdkVersion);
 
     socketServer = new SocketServer(analysisServerOptions, defaultSdk, service);
     httpServer = new HttpAnalysisServer(socketServer);
     stdioServer = new StdioAnalysisServer(socketServer);
 
     if (serve_http) {
       httpServer.serveHttp(port);
     }
 
     if (results[INTERNAL_PRINT_TO_CONSOLE]) {
@@ skipping 32 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);
   }
 }