Merge pull request #19787 from heejaechang/NFWDump

explicitly add current process's dump in the non-fatal watson

src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs

@@ -28,7 +28,15 @@ public static void Report(string description, Exception exception)
             TelemetryService.DefaultSession.PostFault(
                 eventName: FunctionId.NonFatalWatson.GetEventName(),
                 description: description,
-                exceptionObject: exception);
+                exceptionObject: exception,
+                gatherEventDetails: arg =>
+                {
+                    arg.AddProcessDump(System.Diagnostics.Process.GetCurrentProcess().Id);
+
+                    // 0 means send watson, otherwise, cancel watson
+                    // we always send watson since dump itself can have valuable data
+                    return 0;
+                });
         }
 
         /// <summary>
@@ -43,7 +51,12 @@ public static void Report(string description, Exception exception, Func<IFaultUt
                 eventName: FunctionId.NonFatalWatson.GetEventName(),
                 description: description,
                 exceptionObject: exception,
-                gatherEventDetails: callback);
+                gatherEventDetails: arg =>
+                {
+                    // always add current processes dump
+                    arg.AddProcessDump(System.Diagnostics.Process.GetCurrentProcess().Id);
+                    return callback(arg);
+                });
         }
     }
 }

src/Workspaces/Remote/ServiceHub/Telemetry/WatsonReporter.cs

@@ -43,7 +43,15 @@ public static void Report(string description, Exception exception)
             SessionOpt?.PostFault(
                 eventName: FunctionId.NonFatalWatson.GetEventName(),
                 description: description,
-                exceptionObject: exception);
+                exceptionObject: exception,
+                gatherEventDetails: arg =>
+                {
+                    arg.AddProcessDump(System.Diagnostics.Process.GetCurrentProcess().Id);
+
+                    // 0 means send watson, otherwise, cancel watson
+                    // we always send watson since dump itself can have valuable data
+                    return 0;
+                });
         }
     }
 }