Enable message logging in Sentry

src/Cody.Core/Logging/Logger.cs

@@ -65,7 +65,7 @@ public void Error(string message, [CallerMemberName] string callerName = "")
             // TODO: _fileLogger.Error(customMessage);
             DebugWrite(customMessage);
             _outputWindowPane?.Error(message, callerName);
-            _sentryLog?.Error(customMessage, callerName);
+            _sentryLog?.Error(message, callerName);
             _testLogger?.WriteLog(message, "ERROR", callerName);
         }
 
@@ -87,7 +87,7 @@ public void Error(string message, Exception ex, [CallerMemberName] string caller
             // TODO: _fileLogger.Error(originalException, customMessage);
             DebugWrite(customMessage);
             _outputWindowPane?.Error(outputMessage, callerName);
-            _sentryLog?.Error(outputMessage, originalException, callerName);
+            _sentryLog?.Error(message, originalException, callerName);
             _testLogger?.WriteLog(message, "ERROR", callerName);
         }
 

src/Cody.Core/Logging/SentryLog.cs

@@ -11,21 +11,29 @@ namespace Cody.Core.Logging
     public class SentryLog : ISentryLog
     {
         public const string CodyAssemblyPrefix = "Cody.";
+        public const string ErrorData = "ErrorData";
 
         public void Error(string message, Exception ex, [CallerMemberName] string callerName = "")
         {
             SentrySdk.CaptureException(ex, scope =>
             {
-                scope.SetExtra(nameof(callerName), callerName);
-                scope.SetExtra(nameof(message), message);
+                scope.Contexts[ErrorData] = new
+                {
+                    Message = message,
+                    CallerName = callerName,
+                };
             });
         }
 
         public void Error(string message, [CallerMemberName] string callerName = "")
         {
             SentrySdk.CaptureMessage(message, scope =>
             {
-                scope.SetExtra(nameof(callerName), callerName);
+                scope.Contexts[ErrorData] = new
+                {
+                    Message = message,
+                    CallerName = callerName,
+                };
             });
         }
 
@@ -49,9 +57,10 @@ public static void Initialize()
                         if (se.Exception?.Source?.StartsWith(CodyAssemblyPrefix) ?? false) return se;
                         if (se.Exception?.InnerException?.Source?.StartsWith(CodyAssemblyPrefix) ?? false) return se;
                         if (se.Message != null) return se;
+                        if (se.Contexts.ContainsKey(ErrorData)) return se;
                         if (se.SentryExceptions == null) return se;
 
-                        foreach(var ex in se.SentryExceptions)
+                        foreach (var ex in se.SentryExceptions)
                         {
                             if (ex.Module?.StartsWith(CodyAssemblyPrefix) ?? false) return se;
                             if (ex.Stacktrace != null)

src/Cody.VisualStudio/Client/AgentClient.cs

@@ -78,10 +78,10 @@ public async Task<IAgentService> Initialize(ClientInfo clientInfo)
 
         private void OnDisconnected(object sender, JsonRpcDisconnectedEventArgs e)
         {
-            if(e.Exception != null)
+            if (e.Exception != null)
                 log.Error($"Agent disconnected due to {e.Description} (reason: {e.Reason})", e.Exception);
             else
-                log.Info($"Agent disconnected due to {e.Description} (reason: {e.Reason})");
+                log.Error($"Agent disconnected due to {e.Description} (reason: {e.Reason})");
         }
 
         private void CreateAgentService()
@@ -139,7 +139,7 @@ public void Stop()
 
         private void DisconnectInternal()
         {
-            jsonRpc.Dispose();
+            if (!jsonRpc.IsDisposed) jsonRpc.Dispose();
             connector.ErrorReceived -= OnErrorReceived;
             connector.Disconnected -= OnAgentDisconnected;
             connector.Disconnect();

src/Cody.VisualStudio/CodyPackage.cs

@@ -156,7 +156,6 @@ private void ReportSentryVsVersion()
             {
                 scope.SetTag("vs", VsVersionService.DisplayVersion);
                 scope.SetTag("agent", VersionService.Agent);
-                SentrySdk.CaptureMessage("Initialized");
             });
         }