error handling fix

KSemenenko · KSemenenko · commit 85fc510a3ab4 · 2026-06-15T14:15:55.000+02:00
diff --git a/AGENTS.md b/AGENTS.md
@@ -18,6 +18,7 @@ always check all test are passed.
 - Do not add redundant `result.Problem is not null` checks after `result.IsFailed`; rely on result nullability contract/attributes and only use null-forgiving where needed.
 - Keep documentation aligned with the current major version (for this repository now: version 10); do not add cross-major migration sections unless explicitly requested.
 - When behavior changes in Result/Problem flows, include a clear README update with concrete usage examples.
+- When a framework adapter catches an exception and converts it into a failed `Result`, it must log the original exception object before returning the failure so distributed traces keep the real stack trace.
 
 # Repository Guidelines
 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,8 +26,8 @@
         <RepositoryUrl>https://github.com/managedcode/Communication</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/Communication</PackageProjectUrl>
         <Product>Managed Code - Communication</Product>
-        <Version>10.0.2</Version>
-        <PackageVersion>10.0.2</PackageVersion>
+        <Version>10.0.4</Version>
+        <PackageVersion>10.0.4</PackageVersion>
 
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/ManagedCode.Communication.AspNetCore/WebApi/Filters/ExceptionFilterWithProblemDetails.cs b/ManagedCode.Communication.AspNetCore/WebApi/Filters/ExceptionFilterWithProblemDetails.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using ManagedCode.Communication.AspNetCore.Constants;
+using ManagedCode.Communication.Logging;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
@@ -18,6 +19,11 @@ public abstract class ExceptionFilterWithProblemDetails(ILogger logger) : IExcep
     public virtual void OnException(ExceptionContext context)
     {
         var exception = context.Exception;
+        var actionName = context.ActionDescriptor.DisplayName ?? "Unknown";
+        var controllerName = context.ActionDescriptor.RouteValues["controller"] ?? "Unknown";
+
+        LoggerCenter.LogControllerException(Logger, exception, controllerName, actionName);
+
         var statusCode = GetStatusCodeForException(exception);
 
         // Option 1: Create ProblemDetails and convert to Problem
@@ -55,4 +61,4 @@ public virtual void OnException(ExceptionContext context)
 
         context.ExceptionHandled = true;
     }
-}
+}
diff --git a/ManagedCode.Communication.Extensions/ManagedCode.Communication.Extensions.csproj b/ManagedCode.Communication.Extensions/ManagedCode.Communication.Extensions.csproj
@@ -16,7 +16,7 @@
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
         <ProjectReference Include="..\ManagedCode.Communication.AspNetCore\ManagedCode.Communication.AspNetCore.csproj" />
-        <PackageReference Include="Polly" Version="8.6.6" />
+        <PackageReference Include="Polly" Version="8.7.0" />
     </ItemGroup>
 
 </Project>
diff --git a/ManagedCode.Communication.Orleans/Filters/CommunicationGrainCallResultFactory.cs b/ManagedCode.Communication.Orleans/Filters/CommunicationGrainCallResultFactory.cs
@@ -17,14 +17,20 @@ internal static class CommunicationGrainCallResultFactory
         ?? throw new MissingMethodException(nameof(CommunicationGrainCallResultFactory), nameof(CreateFailureGeneric));
 
     public static bool TrySetFailure(IGrainCallContext context, Exception exception)
+    {
+        return TrySetFailure(context, exception, out _);
+    }
+
+    public static bool TrySetFailure(IGrainCallContext context, Exception exception, out HttpStatusCode statusCode)
     {
         var resultType = GetCommunicationResultType(context.InterfaceMethod.ReturnType);
         if (resultType is null)
         {
+            statusCode = HttpStatusCode.InternalServerError;
             return false;
         }
 
-        var statusCode = OrleansHttpStatusCodeHelper.GetStatusCodeForException(exception);
+        statusCode = OrleansHttpStatusCodeHelper.GetStatusCodeForException(exception);
         context.Result = CreateFailure(resultType, exception, statusCode);
         return true;
     }
diff --git a/ManagedCode.Communication.Orleans/Filters/CommunicationIncomingGrainCallFilter.cs b/ManagedCode.Communication.Orleans/Filters/CommunicationIncomingGrainCallFilter.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Net;
 using System.Threading.Tasks;
+using ManagedCode.Communication.Logging;
+using Microsoft.Extensions.Logging;
 using Orleans;
 
 namespace ManagedCode.Communication.Filters;
 
-public class CommunicationIncomingGrainCallFilter : IIncomingGrainCallFilter
+public class CommunicationIncomingGrainCallFilter(ILogger<CommunicationIncomingGrainCallFilter> logger) : IIncomingGrainCallFilter
 {
     public async Task Invoke(IIncomingGrainCallContext context)
     {
@@ -14,12 +17,26 @@ public async Task Invoke(IIncomingGrainCallContext context)
         }
         catch (Exception exception)
         {
-            if (CommunicationGrainCallResultFactory.TrySetFailure(context, exception))
+            if (CommunicationGrainCallResultFactory.TrySetFailure(context, exception, out var statusCode))
             {
+                LogExceptionConverted(context, exception, (int)statusCode);
                 return;
             }
 
+            LogExceptionConverted(context, exception, (int)HttpStatusCode.InternalServerError);
+
             throw;
         }
     }
+
+    private void LogExceptionConverted(IIncomingGrainCallContext context, Exception exception, int statusCode)
+    {
+        LoggerCenter.LogOrleansGrainCallExceptionConverted(
+            logger,
+            exception,
+            context.InterfaceName,
+            context.MethodName,
+            context.TargetId.ToString(),
+            statusCode);
+    }
 }
diff --git a/ManagedCode.Communication.Orleans/Filters/CommunicationOutgoingGrainCallFilter.cs b/ManagedCode.Communication.Orleans/Filters/CommunicationOutgoingGrainCallFilter.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Net;
 using System.Threading.Tasks;
+using ManagedCode.Communication.Logging;
+using Microsoft.Extensions.Logging;
 using Orleans;
 
 namespace ManagedCode.Communication.Filters;
 
-public class CommunicationOutgoingGrainCallFilter : IOutgoingGrainCallFilter
+public class CommunicationOutgoingGrainCallFilter(ILogger<CommunicationOutgoingGrainCallFilter> logger) : IOutgoingGrainCallFilter
 {
     public async Task Invoke(IOutgoingGrainCallContext context)
     {
@@ -14,12 +17,26 @@ public async Task Invoke(IOutgoingGrainCallContext context)
         }
         catch (Exception exception)
         {
-            if (CommunicationGrainCallResultFactory.TrySetFailure(context, exception))
+            if (CommunicationGrainCallResultFactory.TrySetFailure(context, exception, out var statusCode))
             {
+                LogExceptionConverted(context, exception, (int)statusCode);
                 return;
             }
 
+            LogExceptionConverted(context, exception, (int)HttpStatusCode.InternalServerError);
+
             throw;
         }
     }
+
+    private void LogExceptionConverted(IOutgoingGrainCallContext context, Exception exception, int statusCode)
+    {
+        LoggerCenter.LogOrleansGrainCallExceptionConverted(
+            logger,
+            exception,
+            context.InterfaceName,
+            context.MethodName,
+            context.TargetId.ToString(),
+            statusCode);
+    }
 }
diff --git a/ManagedCode.Communication.Orleans/ManagedCode.Communication.Orleans.csproj b/ManagedCode.Communication.Orleans/ManagedCode.Communication.Orleans.csproj
@@ -15,9 +15,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Orleans.Sdk" Version="10.1.0" />
-        <PackageReference Include="Microsoft.Orleans.Runtime" Version="10.1.0" />
-        <PackageReference Include="Microsoft.Orleans.Serialization.Abstractions" Version="10.1.0" />
+        <PackageReference Include="Microsoft.Orleans.Sdk" Version="10.2.0" />
+        <PackageReference Include="Microsoft.Orleans.Runtime" Version="10.2.0" />
+        <PackageReference Include="Microsoft.Orleans.Serialization.Abstractions" Version="10.2.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ManagedCode.Communication.Tests/AspNetCore/Filters/ExceptionFilterWithProblemDetailsTests.cs b/ManagedCode.Communication.Tests/AspNetCore/Filters/ExceptionFilterWithProblemDetailsTests.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ManagedCode.Communication.AspNetCore.Filters;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+using Shouldly;
+using Xunit;
+
+namespace ManagedCode.Communication.Tests.AspNetCore.Filters;
+
+public sealed class ExceptionFilterWithProblemDetailsTests
+{
+    [Fact]
+    public void OnException_ShouldLogOriginalExceptionBeforeHandling()
+    {
+        var logger = new CapturingLogger();
+        var filter = new TestExceptionFilter(logger);
+        var exception = new InvalidOperationException("problem-details failure");
+        var context = CreateExceptionContext(exception);
+
+        filter.OnException(context);
+
+        context.ExceptionHandled.ShouldBeTrue();
+        context.Result.ShouldBeOfType<ObjectResult>();
+
+        var entry = logger.Entries.Single();
+        entry.Level.ShouldBe(LogLevel.Error);
+        entry.EventId.Id.ShouldBe(5001);
+        entry.Exception.ShouldBeSameAs(exception);
+        entry.Message.ShouldContain("TestController");
+        entry.Message.ShouldContain("TestAction");
+    }
+
+    private static ExceptionContext CreateExceptionContext(Exception exception)
+    {
+        var actionDescriptor = new ActionDescriptor
+        {
+            DisplayName = "TestAction",
+            RouteValues = { ["controller"] = "TestController" }
+        };
+        var actionContext = new ActionContext(
+            new DefaultHttpContext(),
+            new RouteData(),
+            actionDescriptor);
+
+        return new ExceptionContext(actionContext, [])
+        {
+            Exception = exception
+        };
+    }
+
+    private sealed class TestExceptionFilter(ILogger logger) : ExceptionFilterWithProblemDetails(logger);
+
+    private sealed class CapturingLogger : ILogger
+    {
+        public List<CapturedLogEntry> Entries { get; } = [];
+
+        public IDisposable BeginScope<TState>(TState state)
+            where TState : notnull
+        {
+            return NullScope.Instance;
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return true;
+        }
+
+        public void Log<TState>(
+            LogLevel logLevel,
+            EventId eventId,
+            TState state,
+            Exception? exception,
+            Func<TState, Exception?, string> formatter)
+        {
+            Entries.Add(new CapturedLogEntry(logLevel, eventId, exception, formatter(state, exception)));
+        }
+    }
+
+    private sealed class NullScope : IDisposable
+    {
+        public static readonly NullScope Instance = new();
+
+        public void Dispose()
+        {
+        }
+    }
+
+    private sealed record CapturedLogEntry(
+        LogLevel Level,
+        EventId EventId,
+        Exception? Exception,
+        string Message);
+}
diff --git a/ManagedCode.Communication.Tests/ManagedCode.Communication.Tests.csproj b/ManagedCode.Communication.Tests/ManagedCode.Communication.Tests.csproj
@@ -22,12 +22,12 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Orleans.TestingHost" Version="10.1.0" />
+        <PackageReference Include="Microsoft.Orleans.TestingHost" Version="10.2.0" />
         <PackageReference Include="Shouldly" Version="4.3.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.8" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.8" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.9" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.9" />
         <PackageReference Include="xunit" Version="2.9.3"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/ManagedCode.Communication.Tests/Orleans/Filters/OrleansCommunicationFilterLoggingTests.cs b/ManagedCode.Communication.Tests/Orleans/Filters/OrleansCommunicationFilterLoggingTests.cs
diff --git a/ManagedCode.Communication/Logging/LoggerCenter.cs b/ManagedCode.Communication/Logging/LoggerCenter.cs
diff --git a/ManagedCode.Communication/ManagedCode.Communication.csproj b/ManagedCode.Communication/ManagedCode.Communication.csproj
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,20 @@ internal static class CommunicationGrainCallResultFactory`
`17`	`17`	`?? throw new MissingMethodException(nameof(CommunicationGrainCallResultFactory), nameof(CreateFailureGeneric));`
`18`	`18`
`19`	`19`	`public static bool TrySetFailure(IGrainCallContext context, Exception exception)`
	`20`	`+ {`
	`21`	`+ return TrySetFailure(context, exception, out _);`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ public static bool TrySetFailure(IGrainCallContext context, Exception exception, out HttpStatusCode statusCode)`
`20`	`25`	`{`
`21`	`26`	`var resultType = GetCommunicationResultType(context.InterfaceMethod.ReturnType);`
`22`	`27`	`if (resultType is null)`
`23`	`28`	`{`
	`29`	`+ statusCode = HttpStatusCode.InternalServerError;`
`24`	`30`	`return false;`
`25`	`31`	`}`
`26`	`32`
`27`		`- var statusCode = OrleansHttpStatusCodeHelper.GetStatusCodeForException(exception);`
	`33`	`+ statusCode = OrleansHttpStatusCodeHelper.GetStatusCodeForException(exception);`
`28`	`34`	`context.Result = CreateFailure(resultType, exception, statusCode);`
`29`	`35`	`return true;`
`30`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Net;`
`2`	`3`	`using System.Threading.Tasks;`
	`4`	`+using ManagedCode.Communication.Logging;`
	`5`	`+using Microsoft.Extensions.Logging;`
`3`	`6`	`using Orleans;`
`4`	`7`
`5`	`8`	`namespace ManagedCode.Communication.Filters;`
`6`	`9`
`7`		`-public class CommunicationIncomingGrainCallFilter : IIncomingGrainCallFilter`
	`10`	`+public class CommunicationIncomingGrainCallFilter(ILogger<CommunicationIncomingGrainCallFilter> logger) : IIncomingGrainCallFilter`
`8`	`11`	`{`
`9`	`12`	`public async Task Invoke(IIncomingGrainCallContext context)`
`10`	`13`	`{`
`@@ -14,12 +17,26 @@ public async Task Invoke(IIncomingGrainCallContext context)`
`14`	`17`	`}`
`15`	`18`	`catch (Exception exception)`
`16`	`19`	`{`
`17`		`- if (CommunicationGrainCallResultFactory.TrySetFailure(context, exception))`
	`20`	`+ if (CommunicationGrainCallResultFactory.TrySetFailure(context, exception, out var statusCode))`
`18`	`21`	`{`
	`22`	`+ LogExceptionConverted(context, exception, (int)statusCode);`
`19`	`23`	`return;`
`20`	`24`	`}`
`21`	`25`
	`26`	`+ LogExceptionConverted(context, exception, (int)HttpStatusCode.InternalServerError);`
	`27`	`+`
`22`	`28`	`throw;`
`23`	`29`	`}`
`24`	`30`	`}`
	`31`	`+`
	`32`	`+ private void LogExceptionConverted(IIncomingGrainCallContext context, Exception exception, int statusCode)`
	`33`	`+ {`
	`34`	`+ LoggerCenter.LogOrleansGrainCallExceptionConverted(`
	`35`	`+ logger,`
	`36`	`+ exception,`
	`37`	`+ context.InterfaceName,`
	`38`	`+ context.MethodName,`
	`39`	`+ context.TargetId.ToString(),`
	`40`	`+ statusCode);`
	`41`	`+ }`
`25`	`42`	`}`