Remove analysis logger, replace with calls to InstrumentationService

Change-Id: Ifddd58b731aa0af8f76a91261757997dc52a9fc7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/123328
Commit-Queue: Mike Fairhurst <mfairhurst@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

Author: MichaelRFairhurst

pkg/analysis_server/lib/src/analysis_logger.dart

@@ -13,7 +13,6 @@ import 'package:analysis_server/protocol/protocol_constants.dart'
     show PROTOCOL_VERSION;
 import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisOptions;
-import 'package:analysis_server/src/analysis_logger.dart';
 import 'package:analysis_server/src/analysis_server_abstract.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analysis_server/src/computer/computer_highlights.dart';
@@ -241,7 +240,6 @@ class AnalysisServer extends AbstractAnalysisServer {
     ServerContextManagerCallbacks contextManagerCallbacks =
         new ServerContextManagerCallbacks(this, resourceProvider);
     contextManager.callbacks = contextManagerCallbacks;
-    AnalysisEngine.instance.logger = new AnalysisLogger(this);
     _onAnalysisStartedController = new StreamController.broadcast();
     onAnalysisStarted.first.then((_) {
       onAnalysisComplete.then((_) {
@@ -897,7 +895,8 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
       if (result.contextKey != null) {
         message += ' context: ${result.contextKey}';
       }
-      AnalysisEngine.instance.logger.logError(message, result.exception);
+      AnalysisEngine.instance.instrumentationService.logException(
+          new CaughtException.wrapInMessage(message, result.exception));
     });
     analysisServer.driverMap[folder] = analysisDriver;
     return analysisDriver;

pkg/analysis_server/lib/src/analysis_server.dart

@@ -110,9 +110,9 @@ abstract class AbstractAnalysisServer {
           _analyzedFilesGlobs
               .add(new Glob(resourceProvider.pathContext.separator, pattern));
         } catch (exception, stackTrace) {
-          AnalysisEngine.instance.logger.logError(
-              'Invalid glob pattern: "$pattern"',
-              new CaughtException(exception, stackTrace));
+          AnalysisEngine.instance.instrumentationService.logException(
+              new CaughtException.withMessage(
+                  'Invalid glob pattern: "$pattern"', exception, stackTrace));
         }
       }
     }

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -625,7 +625,8 @@ class LspServerContextManagerCallbacks extends ContextManagerCallbacks {
       if (result.contextKey != null) {
         message += ' context: ${result.contextKey}';
       }
-      AnalysisEngine.instance.logger.logError(message, result.exception);
+      AnalysisEngine.instance.instrumentationService.logException(
+          new CaughtException.wrapInMessage(message, result.exception));
     });
     analysisServer.driverMap[folder] = analysisDriver;
     return analysisDriver;

pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart

@@ -202,7 +202,6 @@ test:file:///home/test/lib
 
   void tearDown() {
     AnalysisEngine.instance.clearCaches();
-    AnalysisEngine.instance.logger = null;
   }
 
   /// Update `/home/test/pubspec.yaml` and create the driver.

pkg/analysis_server/test/abstract_context.dart

@@ -8,6 +8,7 @@ import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/plugin/notification_manager.dart';
 import 'package:analysis_server/src/utilities/null_string_sink.dart';
 import 'package:analyzer/error/error.dart';
+import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/source/error_processor.dart';
@@ -2509,8 +2510,9 @@ class TestContextManagerCallbacks extends ContextManagerCallbacks {
 
     driverMap[path] = currentDriver;
     currentDriver.exceptions.listen((ExceptionResult result) {
-      AnalysisEngine.instance.logger
-          .logError('Analysis failed: ${result.path}', result.exception);
+      AnalysisEngine.instance.instrumentationService.logException(
+          new CaughtException.wrapInMessage(
+              'Analysis failed: ${result.path}', result.exception));
     });
     return currentDriver;
   }

pkg/analysis_server/test/context_manager_test.dart

@@ -44,6 +44,11 @@ class CaughtException implements Exception {
    */
   final Object exception;
 
+  /**
+   * The message describing where/how/why this was caught.
+   */
+  final String message;
+
   /**
    * The stack trace associated with the exception.
    */
@@ -53,16 +58,21 @@ class CaughtException implements Exception {
    * Initialize a newly created caught exception to have the given [exception]
    * and [stackTrace].
    */
-  CaughtException(this.exception, stackTrace) {
-    if (stackTrace == null) {
-      try {
-        throw this;
-      } catch (_, st) {
-        stackTrace = st;
-      }
-    }
-    this.stackTrace = stackTrace;
-  }
+  CaughtException(exception, stackTrace)
+      : this.withMessage(null, exception, stackTrace);
+
+  /**
+   * Initialize a newly created caught exception to have the given [exception],
+   * [stackTrace], and [message].
+   */
+  CaughtException.withMessage(this.message, this.exception, stackTrace)
+      : this.stackTrace = stackTrace ?? StackTrace.current;
+
+  /**
+   * Create a [CaughtException] to wrap a prior one, adding a [message].
+   */
+  CaughtException.wrapInMessage(String message, CaughtException exception)
+      : this.withMessage(message, exception, null);
 
   @override
   String toString() {
@@ -76,6 +86,9 @@ class CaughtException implements Exception {
    * stack trace.
    */
   void _writeOn(StringBuffer buffer) {
+    if (message != null) {
+      buffer.writeln(message);
+    }
     if (exception is AnalysisException) {
       AnalysisException analysisException = exception;
       buffer.writeln(analysisException.message);

pkg/analyzer/lib/exception/exception.dart

@@ -131,7 +131,7 @@ class InstrumentationService {
    * Log that the given non-priority [exception] was thrown, with the given
    * [stackTrace].
    */
-  void logException(dynamic exception, StackTrace stackTrace) {
+  void logException(dynamic exception, [StackTrace stackTrace]) {
     if (_instrumentationServer != null) {
       String message = _toString(exception);
       String trace = _toString(stackTrace);
@@ -154,7 +154,8 @@ class InstrumentationService {
   /**
    * Log unstructured text information for debugging purposes.
    */
-  void logInfo(String message) => _log(TAG_INFO, message);
+  void logInfo(String message, [dynamic exception]) =>
+      _log(TAG_INFO, message + (exception == null ? "" : _toString(exception)));
 
   /**
    * Log that a log entry that was written to the analysis engine's log. The log

pkg/analyzer/lib/instrumentation/instrumentation.dart

@@ -98,14 +98,21 @@ class SourceFactoryImpl implements SourceFactory {
   @override
   Source forUri(String absoluteUri) {
     try {
-      Uri uri = Uri.parse(absoluteUri);
+      Uri uri;
+      try {
+        uri = Uri.parse(absoluteUri);
+      } catch (exception, stackTrace) {
+        AnalysisEngine.instance.instrumentationService
+            .logInfo('Could not resolve URI: $absoluteUri $stackTrace');
+        return null;
+      }
       if (uri.isAbsolute) {
         return _internalResolveUri(null, uri);
       }
     } catch (exception, stackTrace) {
-      AnalysisEngine.instance.logger.logError(
-          "Could not resolve URI: $absoluteUri",
-          new CaughtException(exception, stackTrace));
+      AnalysisEngine.instance.instrumentationService.logException(
+          new CaughtException.withMessage(
+              "Could not resolve URI: $absoluteUri", exception, stackTrace));
     }
     return null;
   }
@@ -116,9 +123,9 @@ class SourceFactoryImpl implements SourceFactory {
       try {
         return _internalResolveUri(null, absoluteUri);
       } on AnalysisException catch (exception, stackTrace) {
-        AnalysisEngine.instance.logger.logError(
-            "Could not resolve URI: $absoluteUri",
-            new CaughtException(exception, stackTrace));
+        AnalysisEngine.instance.instrumentationService.logException(
+            new CaughtException.withMessage(
+                "Could not resolve URI: $absoluteUri", exception, stackTrace));
       }
     }
     return null;
@@ -137,10 +144,12 @@ class SourceFactoryImpl implements SourceFactory {
     } catch (exception, stackTrace) {
       String containingFullName =
           containingSource != null ? containingSource.fullName : '<null>';
-      AnalysisEngine.instance.logger.logInformation(
-          "Could not resolve URI ($containedUri) "
-          "relative to source ($containingFullName)",
-          new CaughtException(exception, stackTrace));
+      AnalysisEngine.instance.instrumentationService
+          .logException(new CaughtException.withMessage(
+              "Could not resolve URI ($containedUri) "
+              "relative to source ($containingFullName)",
+              exception,
+              stackTrace));
       return null;
     }
   }

pkg/analyzer/lib/src/context/source.dart

@@ -647,8 +647,9 @@ class AssignmentExpressionImpl extends ExpressionImpl
       } else {
         message = "The right-hand size is null";
       }
-      AnalysisEngine.instance.logger.logError(
-          message, new CaughtException(new AnalysisException(message), null));
+      AnalysisEngine.instance.instrumentationService.logException(
+          new CaughtException(new AnalysisException(message), null),
+          StackTrace.current);
     }
     _leftHandSide = _becomeParentOf(leftHandSide);
     _rightHandSide = _becomeParentOf(rightHandSide);