Message Bus: Distributed Tracing

phongnguyend · Jan 21, 2025 · a5871df · a5871df
1 parent d0b860a
commit a5871df
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 68 deletions.
diff --git a/...nfrastructure/Logging/ActivityEnricher.cs → ...ingConcerns/Logging/ActivityExtensions.cs b/...nfrastructure/Logging/ActivityEnricher.cs → ...ingConcerns/Logging/ActivityExtensions.cs
@@ -1,32 +1,8 @@
-/*
- * https://github.com/serilog/serilog-aspnetcore/issues/207
- *
- */
+using System.Diagnostics;
 
-using Serilog.Core;
-using Serilog.Events;
-using System.Diagnostics;
+namespace ClassifiedAds.CrossCuttingConcerns.Logging;
 
-namespace ClassifiedAds.Infrastructure.Logging;
-
-public class ActivityEnricher : ILogEventEnricher
-{
-    public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
-    {
-        var activity = Activity.Current;
-
-        if (activity == null)
-        {
-            return;
-        }
-
-        logEvent.AddPropertyIfAbsent(new LogEventProperty("SpanId", new ScalarValue(activity.GetSpanId())));
-        logEvent.AddPropertyIfAbsent(new LogEventProperty("TraceId", new ScalarValue(activity.GetTraceId())));
-        logEvent.AddPropertyIfAbsent(new LogEventProperty("ParentId", new ScalarValue(activity.GetParentId())));
-    }
-}
-
-internal static class ActivityExtensions
+public static class ActivityExtensions
 {
     public static string GetSpanId(this Activity activity)
     {
@@ -57,4 +33,17 @@ public static string GetParentId(this Activity activity)
             _ => null,
         } ?? string.Empty;
     }
+
+    public static Activity StartNew(string name, string parentId = null)
+    {
+        var activity = new Activity(name);
+
+        if (!string.IsNullOrEmpty(parentId))
+        {
+            activity.SetParentId(parentId);
+        }
+
+        activity.Start();
+        return activity;
+    }
 }
diff --git a/src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/Logging/ILogger.cs b/src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/Logging/ILogger.cs
diff --git a/...oservices/Common/ClassifiedAds.Infrastructure/MessageBrokers/RabbitMQ/RabbitMQReceiver.cs b/...oservices/Common/ClassifiedAds.Infrastructure/MessageBrokers/RabbitMQ/RabbitMQReceiver.cs
@@ -86,6 +86,7 @@ public async Task ReceiveAsync(Func<T, MetaData, Task> action, CancellationToken
 
             await _channel.QueueDeclareAsync(_options.QueueName, true, false, false, arguments, cancellationToken: cancellationToken);
             await _channel.QueueBindAsync(_options.QueueName, _options.ExchangeName, _options.RoutingKey, null, cancellationToken: cancellationToken);
+            await _channel.QueueBindAsync(_options.QueueName, "amq.direct", $"direct_route_to_queue_{_options.QueueName}", null, cancellationToken: cancellationToken);
         }
 
         await _channel.BasicQosAsync(prefetchSize: 0, prefetchCount: 1, global: false, cancellationToken: cancellationToken);

diff --git a/...vices/Common/ClassifiedAds.Infrastructure/Web/ExceptionHandlers/GlobalExceptionHandler.cs b/...vices/Common/ClassifiedAds.Infrastructure/Web/ExceptionHandlers/GlobalExceptionHandler.cs
@@ -1,5 +1,5 @@
 using ClassifiedAds.CrossCuttingConcerns.Exceptions;
-using ClassifiedAds.Infrastructure.Logging;
+using ClassifiedAds.CrossCuttingConcerns.Logging;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/...es/Common/ClassifiedAds.Infrastructure/Web/Middleware/GlobalExceptionHandlerMiddleware.cs b/...es/Common/ClassifiedAds.Infrastructure/Web/Middleware/GlobalExceptionHandlerMiddleware.cs
@@ -1,5 +1,5 @@
 using ClassifiedAds.CrossCuttingConcerns.Exceptions;
-using ClassifiedAds.Infrastructure.Logging;
+using ClassifiedAds.CrossCuttingConcerns.Logging;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

diff --git a/...nfrastructure/Logging/ActivityEnricher.cs → ...ingConcerns/Logging/ActivityExtensions.cs b/...nfrastructure/Logging/ActivityEnricher.cs → ...ingConcerns/Logging/ActivityExtensions.cs
@@ -1,32 +1,8 @@
-/*
- * https://github.com/serilog/serilog-aspnetcore/issues/207
- *
- */
+using System.Diagnostics;
 
-using Serilog.Core;
-using Serilog.Events;
-using System.Diagnostics;
+namespace ClassifiedAds.CrossCuttingConcerns.Logging;
 
-namespace ClassifiedAds.Infrastructure.Logging;
-
-public class ActivityEnricher : ILogEventEnricher
-{
-    public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
-    {
-        var activity = Activity.Current;
-
-        if (activity == null)
-        {
-            return;
-        }
-
-        logEvent.AddPropertyIfAbsent(new LogEventProperty("SpanId", new ScalarValue(activity.GetSpanId())));
-        logEvent.AddPropertyIfAbsent(new LogEventProperty("TraceId", new ScalarValue(activity.GetTraceId())));
-        logEvent.AddPropertyIfAbsent(new LogEventProperty("ParentId", new ScalarValue(activity.GetParentId())));
-    }
-}
-
-internal static class ActivityExtensions
+public static class ActivityExtensions
 {
     public static string GetSpanId(this Activity activity)
     {
@@ -57,4 +33,17 @@ public static string GetParentId(this Activity activity)
             _ => null,
         } ?? string.Empty;
     }
+
+    public static Activity StartNew(string name, string parentId = null)
+    {
+        var activity = new Activity(name);
+
+        if (!string.IsNullOrEmpty(parentId))
+        {
+            activity.SetParentId(parentId);
+        }
+
+        activity.Start();
+        return activity;
+    }
 }
diff --git a/src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/Logging/ILogger.cs b/src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/Logging/ILogger.cs
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/MessageBrokers/RabbitMQ/RabbitMQReceiver.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/MessageBrokers/RabbitMQ/RabbitMQReceiver.cs
@@ -86,6 +86,7 @@ public async Task ReceiveAsync(Func<T, MetaData, Task> action, CancellationToken
 
             await _channel.QueueDeclareAsync(_options.QueueName, true, false, false, arguments, cancellationToken: cancellationToken);
             await _channel.QueueBindAsync(_options.QueueName, _options.ExchangeName, _options.RoutingKey, null, cancellationToken: cancellationToken);
+            await _channel.QueueBindAsync(_options.QueueName, "amq.direct", $"direct_route_to_queue_{_options.QueueName}", null, cancellationToken: cancellationToken);
         }
 
         await _channel.BasicQosAsync(prefetchSize: 0, prefetchCount: 1, global: false, cancellationToken: cancellationToken);

diff --git a/...ularMonolith/ClassifiedAds.Infrastructure/Web/ExceptionHandlers/GlobalExceptionHandler.cs b/...ularMonolith/ClassifiedAds.Infrastructure/Web/ExceptionHandlers/GlobalExceptionHandler.cs
@@ -1,5 +1,5 @@
 using ClassifiedAds.CrossCuttingConcerns.Exceptions;
-using ClassifiedAds.Infrastructure.Logging;
+using ClassifiedAds.CrossCuttingConcerns.Logging;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/...rMonolith/ClassifiedAds.Infrastructure/Web/Middleware/GlobalExceptionHandlerMiddleware.cs b/...rMonolith/ClassifiedAds.Infrastructure/Web/Middleware/GlobalExceptionHandlerMiddleware.cs
@@ -1,5 +1,5 @@
 using ClassifiedAds.CrossCuttingConcerns.Exceptions;
-using ClassifiedAds.Infrastructure.Logging;
+using ClassifiedAds.CrossCuttingConcerns.Logging;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;