Instrument top-level exceptions

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 211 matching lines @@
     AnalysisEngine.instance.instrumentationService = service;
 
     socketServer = new SocketServer(analysisServerOptions, defaultSdk, service);
     httpServer = new HttpAnalysisServer(socketServer);
     stdioServer = new StdioAnalysisServer(socketServer);
 
     if (serve_http) {
       httpServer.serveHttp(port);
     }
 
-    _captureExceptions(() {
+    _captureExceptions(service, () {
       stdioServer.serveStdio().then((_) {
         if (serve_http) {
           httpServer.close();
         }
         service.shutdown();
         exit(0);
       });
     },
         print: results[INTERNAL_PRINT_TO_CONSOLE] ? null : httpServer.recordPrint);
   }
 
   /**
-   * Execute the given [callback], capturing any unhandled exceptions and
-   * reporting them to the client. If a [print] function is provided, then also
+   * Execute the given [callback] within a zone that will capture any unhandled
+   * exceptions and both report them to the client and send them to the given
+   * instrumentation [service]. If a [print] function is provided, then also
    * capture any data printed by the callback and redirect it to the function.
    */
-  dynamic _captureExceptions(dynamic callback(), {void print(String line)}) {
-    ZoneSpecification zoneSpecification = new ZoneSpecification(
-        handleUncaughtError: (Zone self, ZoneDelegate parent, Zone zone,
-            dynamic exception, StackTrace stackTrace) {
+  dynamic _captureExceptions(InstrumentationService service, dynamic callback(),
+      {void print(String line)}) {
+    Function errorFunction =
+        (Zone self, ZoneDelegate parent, Zone zone, dynamic exception,
+            StackTrace stackTrace) {
+      service.logException(exception, stackTrace);
       socketServer.analysisServer.reportException(exception, stackTrace);
       throw exception;
-    },
-        print: print == null ?
-            null :
-            (Zone self, ZoneDelegate parent, Zone zone, String line) {
+    };
+    Function printFunction = print == null ?
+        null :
+        (Zone self, ZoneDelegate parent, Zone zone, String line) {
       // Note: we don't pass the line on to stdout, because that is reserved
       // for communication to the client.
       print(line);
-    });
+    };
+    ZoneSpecification zoneSpecification = new ZoneSpecification(
+        handleUncaughtError: errorFunction,
+        print: printFunction);
     return runZoned(callback, zoneSpecification: zoneSpecification);
   }
 
   /**
    * 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);
   }
 }