Exclude RetryConsumeContext logs (R-RETRY) (#241)

* Exclude RetryConsumeContext logs (R-RETRY)

* Removed excluding log through r-retry (and removed test)

Author: Casper-Olsen

src/ProjectOrigin.Stamp.Server/Extensions/IConfigurationExtensions.cs

@@ -52,6 +52,7 @@ public static WebApplication BuildApp(this IConfigurationRoot configuration)
 
         builder.Logging.ClearProviders();
         builder.Logging.AddSerilog(Log.Logger);
+        builder.Host.UseSerilog(Log.Logger);
 
         var startup = new Startup(builder.Configuration);
         startup.ConfigureServices(builder.Services);
@@ -66,10 +67,11 @@ public static Serilog.ILogger GetSeriLogger(this IConfiguration configuration)
         var loggerConfiguration = new LoggerConfiguration()
             .Filter.ByExcluding("RequestPath like '/health%'")
             .Filter.ByExcluding("RequestPath like '/metrics%'")
-            .Filter.ByExcluding("SourceContext = 'MassTransit.ReceiveTransport' and MessageTemplate like 'R-RETRY%'")
             .Filter.ByExcluding(logEvent =>
-                logEvent.MessageTemplate.Text.Contains("R-RETRY") &&
-                logEvent.MessageTemplate.Text.Contains("MassTransit.ReceiveTransport"))
+                logEvent.Properties.TryGetValue("SourceContext", out var source)
+                && source.ToString().Contains("MassTransit.ReceiveTransport")
+                && logEvent.Properties.TryGetValue("MessageType", out var type)
+                && type.ToString().Contains("RetryConsumeContext"))
             .Enrich.WithSpan();
 
         var logOutputFormat = configuration.GetValue<string>("LogOutputFormat");

src/ProjectOrigin.Stamp.Test/Serilog/ConfigurationExtensionsTests.cs

@@ -47,34 +47,4 @@ public void LogOutput_WithMassTransitRRetryInStructuredLogging_ExcludesLogs()
         // Assert
         Assert.DoesNotContain("R-RETRY", logOutput);
     }
-
-    [Fact]
-    public void LogOutput_WithMassTransitRRetryInJsonLogging_ExcludesLogs()
-    {
-        // Arrange
-        var inMemorySettings = new List<KeyValuePair<string, string?>>
-        {
-            new("LogOutputFormat", "json")
-        };
-
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(inMemorySettings)
-            .Build();
-
-        var output = new StringWriter();
-        Console.SetOut(output);
-
-        var logger = configuration.GetSeriLogger();
-
-        var jsonString = @"{""Timestamp"":""2025-07-04T08:40:09.5774548+00:00"",""Level"":""Warning"",""MessageTemplate"":""R-RETRY {InputAddress} {MessageId} {MessageType}"",""TraceId"":""0f42ca4998cdada788181186db329640"",""SpanId"":""b5346b195559e7cd"",""Exception"":""ProjectOrigin.Stamp.Server.EventHandlers.RegistryTransactionStillProcessingException: Transaction wAlcfUeOfWF7iUO3pmKXi+djR+zYATURjo69utxFt6Q= is still processing on registry for certificateId: 6a1d25a9-6787-494f-a588-9fb7f6bac37c.\n   at ProjectOrigin.Stamp.Server.EventHandlers.WaitForCommittedRegistryTransactionConsumer.Consume(ConsumeContext`1 context) in /src/ProjectOrigin.Stamp.Server/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs:line 76\n   at MassTransit.DependencyInjection.ScopeConsumerFactory`1.Send[TMessage](ConsumeContext`1 context, IPipe`1 next) in /_/src/MassTransit/DependencyInjection/DependencyInjection/ScopeConsumerFactory.cs:line 22\n   at MassTransit.DependencyInjection.ScopeConsumerFactory`1.Send[TMessage](ConsumeContext`1 context, IPipe`1 next) in /_/src/MassTransit/DependencyInjection/DependencyInjection/ScopeConsumerFactory.cs:line 22\n   at MassTransit.Middleware.ConsumerMessageFilter`2.MassTransit.IFilter<MassTransit.ConsumeContext<TMessage>>.Send(ConsumeContext`1 context, IPipe`1 next) in /_/src/MassTransit/Middleware/ConsumerMessageFilter.cs:line 48\n   at MassTransit.Middleware.ConsumerMessageFilter`2.MassTransit.IFilter<MassTransit.ConsumeContext<TMessage>>.Send(ConsumeContext`1 context, IPipe`1 next) in /_/src/MassTransit/Middleware/ConsumerMessageFilter.cs:line 73\n   at MassTransit.Middleware.RetryFilter`1.MassTransit.IFilter<TContext>.Send(TContext context, IPipe`1 next) in /_/src/MassTransit/Middleware/RetryFilter.cs:line 47"",""Properties"":{""InputAddress"":""rabbitmq://rabbitmq/wait-for-committed-registry-transaction"",""MessageId"":""01000000-b436-1ef5-45cb-08ddbad6627f"",""MessageType"":""MassTransit.RetryPolicies.RetryConsumeContext<ProjectOrigin.Stamp.Server.EventHandlers.CertificateSentToRegistryEvent>"",""SourceContext"":""MassTransit.ReceiveTransport"",""SpanId"":""b5346b195559e7cd"",""TraceId"":""0f42ca4998cdada788181186db329640"",""ParentId"":""2235a58033c47f60""}}";
-
-        // Act
-        logger.Warning(jsonString);
-
-        Log.CloseAndFlush();
-        var logOutput = output.ToString();
-
-        // Assert
-        Assert.DoesNotContain("R-RETRY", logOutput);
-    }
 }