Ensure tenant correlation runs first and tags activities

Author: mheidari988

docs/extensions/multitenancy-core.md

@@ -107,9 +107,9 @@ builder.Services.AddMediatR(cfg =>
 
 The pipeline includes:
 
+- `TenantCorrelationBehavior` (adds tenant ID to logs and activity baggage)
 - `TenantValidationBehavior` (optional validation against cache or store)
 - `TenantEnforcementBehavior` (enforces resolution and lifecycle)
-- `TenantCorrelationBehavior` (adds tenant ID to logs and activity baggage)
 
 ## Tenant requirements
 

src/CleanArchitecture.Extensions.Multitenancy.AspNetCore/Middleware/TenantResolutionMiddleware.cs

@@ -74,17 +74,10 @@ public async Task InvokeAsync(HttpContext httpContext)
 
     private IDisposable? BeginLoggingScope(string? tenantId)
     {
-        if (!_options.AddTenantToLogScope)
-        {
-            return null;
-        }
-
         var scopeKey = string.IsNullOrWhiteSpace(_options.LogScopeKey)
             ? "tenant_id"
             : _options.LogScopeKey;
 
-        var scope = _logger.BeginScope(new Dictionary<string, object?> { [scopeKey] = tenantId });
-
         if (_options.AddTenantToActivity)
         {
             var activity = Activity.Current;
@@ -95,6 +88,11 @@ public async Task InvokeAsync(HttpContext httpContext)
             }
         }
 
-        return scope;
+        if (!_options.AddTenantToLogScope)
+        {
+            return null;
+        }
+
+        return _logger.BeginScope(new Dictionary<string, object?> { [scopeKey] = tenantId });
     }
 }

src/CleanArchitecture.Extensions.Multitenancy/Behaviors/TenantCorrelationBehavior.cs

@@ -35,24 +35,22 @@ public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TRe
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        if (!_options.AddTenantToLogScope)
-        {
-            return await next().ConfigureAwait(false);
-        }
-
         var tenantId = _currentTenant.TenantId;
         var scopeKey = string.IsNullOrWhiteSpace(_options.LogScopeKey) ? "tenant_id" : _options.LogScopeKey;
+        var activity = Activity.Current;
 
-        using (_logger.BeginScope(new Dictionary<string, object?> { [scopeKey] = tenantId }))
+        if (_options.AddTenantToActivity && activity is not null)
         {
-            var activity = Activity.Current;
-            if (_options.AddTenantToActivity && activity is not null)
-            {
-                activity.SetBaggage(scopeKey, tenantId ?? string.Empty);
-                activity.SetTag(scopeKey, tenantId);
-            }
+            activity.SetBaggage(scopeKey, tenantId ?? string.Empty);
+            activity.SetTag(scopeKey, tenantId);
+        }
 
+        if (!_options.AddTenantToLogScope)
+        {
             return await next().ConfigureAwait(false);
         }
+
+        using var scope = _logger.BeginScope(new Dictionary<string, object?> { [scopeKey] = tenantId });
+        return await next().ConfigureAwait(false);
     }
 }

src/CleanArchitecture.Extensions.Multitenancy/DependencyInjectionExtensions.cs

@@ -59,9 +59,9 @@ public static MediatRServiceConfiguration AddCleanArchitectureMultitenancyPipeli
     {
         ArgumentNullException.ThrowIfNull(configuration);
 
+        configuration.AddOpenBehavior(typeof(TenantCorrelationBehavior<,>));
         configuration.AddOpenBehavior(typeof(TenantValidationBehavior<,>));
         configuration.AddOpenBehavior(typeof(TenantEnforcementBehavior<,>));
-        configuration.AddOpenBehavior(typeof(TenantCorrelationBehavior<,>));
         return configuration;
     }
 }

tests/CleanArchitecture.Extensions.Multitenancy.Tests/TenantBehaviorTests.cs

@@ -197,7 +197,7 @@ private sealed record DefaultRequest : IRequest<string>;
 public class TenantCorrelationBehaviorTests
 {
     [Fact]
-    public async Task Handle_skips_scope_when_disabled()
+    public async Task Handle_sets_activity_when_log_scope_disabled()
     {
         var currentTenant = new CurrentTenantAccessor
         {
@@ -217,8 +217,8 @@ public async Task Handle_skips_scope_when_disabled()
 
         await behavior.Handle(new DefaultRequest(), _ => Task.FromResult("ok"), CancellationToken.None);
 
-        Assert.Null(activity.GetBaggageItem("tenant_id"));
-        Assert.Null(activity.GetTagItem("tenant_id"));
+        Assert.Equal("tenant-1", activity.GetBaggageItem("tenant_id"));
+        Assert.Equal("tenant-1", activity.GetTagItem("tenant_id"));
         activity.Stop();
     }