Add More Data For RemoteInvocationException

src/Razor/src/Microsoft.AspNetCore.Razor.Common/Telemetry/IFaultExceptionHandler.cs

@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Telemetry;
+
+internal interface IFaultExceptionHandler
+{
+    bool HandleException(ITelemetryReporter reporter, Exception exception, string? message, object?[] @params);
+}

src/Razor/src/Microsoft.AspNetCore.Razor.Common/Telemetry/ITelemetryReporter.cs

@@ -11,5 +11,5 @@ public interface ITelemetryReporter
 {
     void ReportEvent(string name, TelemetrySeverity severity);
     void ReportEvent<T>(string name, TelemetrySeverity severity, ImmutableDictionary<string, T> values);
-    void ReportFault(Exception exception, string? message, object[] @params);
+    void ReportFault(Exception exception, string? message, params object?[] @params);
 }

src/Razor/src/Microsoft.AspNetCore.Razor.Common/Telemetry/TelemetryReporter.cs

@@ -17,17 +17,21 @@ namespace Microsoft.AspNetCore.Razor.Telemetry;
 internal class TelemetryReporter : ITelemetryReporter
 {
     private readonly ImmutableArray<TelemetrySession> _telemetrySessions;
+    private readonly IEnumerable<IFaultExceptionHandler> _faultExceptionHandlers;
     private readonly ILogger? _logger;
 
     [ImportingConstructor]
-    public TelemetryReporter([Import(AllowDefault = true)] ILoggerFactory? loggerFactory = null)
-        : this(ImmutableArray.Create(TelemetryService.DefaultSession), loggerFactory)
+    public TelemetryReporter(
+        [Import(AllowDefault = true)] ILoggerFactory? loggerFactory = null,
+        [ImportMany] IEnumerable<IFaultExceptionHandler>? faultExceptionHandlers = null)
+        : this(ImmutableArray.Create(TelemetryService.DefaultSession), loggerFactory, faultExceptionHandlers)
     {
     }
 
-    public TelemetryReporter(ImmutableArray<TelemetrySession> telemetrySessions, ILoggerFactory? loggerFactory)
+    public TelemetryReporter(ImmutableArray<TelemetrySession> telemetrySessions, ILoggerFactory? loggerFactory, IEnumerable<IFaultExceptionHandler>? faultExceptionHandlers)
     {
         _telemetrySessions = telemetrySessions;
+        _faultExceptionHandlers = faultExceptionHandlers ?? Array.Empty<IFaultExceptionHandler>();
         _logger = loggerFactory?.CreateLogger<TelemetryReporter>();
     }
 
@@ -48,7 +52,7 @@ public void ReportEvent<T>(string name, TelemetrySeverity severity, ImmutableDic
         Report(telemetryEvent);
     }
 
-    public void ReportFault(Exception exception, string? message, object[] @params)
+    public void ReportFault(Exception exception, string? message, params object?[] @params)
     {
         try
         {
@@ -69,6 +73,20 @@ public void ReportFault(Exception exception, string? message, object[] @params)
                 return;
             }
 
+            var handled = false;
+            foreach (var handler in _faultExceptionHandlers)
+            {
+                if (handler.HandleException(this, exception, message, @params))
+                {
+                    handled = true;
+                }
+            }
+
+            if (handled)
+            {
+                return;
+            }
+
             var currentProcess = Process.GetCurrentProcess();
 
             var faultEvent = new FaultEvent(
@@ -78,6 +96,16 @@ public void ReportFault(Exception exception, string? message, object[] @params)
                 exceptionObject: exception,
                 gatherEventDetails: faultUtility =>
                 {
+                    foreach (var data in @params)
+                    {
+                        if (data is null)
+                        {
+                            continue;
+                        }
+
+                        faultUtility.AddErrorInformation(data.ToString());
+                    }
+
                     // Returning "0" signals that, if sampled, we should send data to Watson.
                     // Any other value will cancel the Watson report. We never want to trigger a process dump manually,
                     // we'll let TargetedNotifications determine if a dump should be collected.

src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.OmniSharp/Project/OmniSharpTelemetryReporter.cs

@@ -17,7 +17,7 @@ public void ReportEvent<T>(string name, TelemetrySeverity severity, ImmutableDic
     {
     }
 
-    public void ReportFault(Exception exception, string? message, object[] @params)
+    public void ReportFault(Exception exception, string? message, params object?[] @params)
     {
     }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/JsonRPCFaultExceptionHandler.cs

@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Telemetry;
+using StreamJsonRpc;
+
+namespace Microsoft.AspNetCore.Razor.LanguageServer;
+
+internal class JsonRPCFaultExceptionHandler : IFaultExceptionHandler
+{
+    public bool HandleException(ITelemetryReporter reporter, Exception exception, string? message, object?[] @params)
+    {
+        if (exception is not RemoteInvocationException remoteInvocationException)
+        {
+            return false;
+        }
+
+        reporter.ReportFault(remoteInvocationException, remoteInvocationException.Message, remoteInvocationException.ErrorCode, remoteInvocationException.ErrorData, remoteInvocationException.DeserializedErrorData);
+        return true;
+    }
+}

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs

@@ -143,11 +143,16 @@ protected override ILspServices ConstructLspServices()
         // Folding Range Providers
         services.AddSingleton<RazorFoldingRangeProvider, RazorCodeBlockFoldingProvider>();
 
+        services.AddSingleton<IFaultExceptionHandler, JsonRPCFaultExceptionHandler>();
+
         // Get the DefaultSession for telemetry. This is set by VS with
         // TelemetryService.SetDefaultSession and provides the correct
         // appinsights keys etc
         services.AddSingleton<ITelemetryReporter>(provider =>
-            new TelemetryReporter(ImmutableArray.Create(TelemetryService.DefaultSession), provider.GetRequiredService<ILoggerFactory>()));
+            new TelemetryReporter(
+                ImmutableArray.Create(TelemetryService.DefaultSession),
+                provider.GetRequiredService<ILoggerFactory>(),
+                provider.GetServices<IFaultExceptionHandler>()));
 
         // Defaults: For when the caller hasn't provided them through the `configure` action.
         services.TryAddSingleton<HostServicesProvider, DefaultHostServicesProvider>();

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/NoOpTelemetryReporter.cs

@@ -24,7 +24,7 @@ public void ReportEvent<T>(string name, TelemetrySeverity severity, ImmutableDic
     {
     }
 
-    public void ReportFault(Exception exception, string? message, object[] @params)
+    public void ReportFault(Exception exception, string? message, params object?[] @params)
     {
     }
 }