MultiTenancy Logger Scope (#279)

src/Messaging/NBB.Messaging.MultiTenancy/TenantMiddleware.cs

@@ -66,7 +66,10 @@ public async Task Invoke(MessagingContext context, CancellationToken cancellatio
 
             Activity.Current?.SetTag(TracingTags.TenantId, tenant.TenantId);
 
-            await next();
+            using (logger.BeginScope(new TenantLogScope(tenantContextAccessor.TenantContext)))
+            {
+                await next();
+            }
         }
 
         private async Task<Tenant> LoadTenant(CancellationToken cancellationToken)

src/MultiTenancy/NBB.MultiTenancy.Abstractions/TenantLogScope.cs

@@ -0,0 +1,61 @@
+// Copyright (c) TotalSoft.
+// This source code is licensed under the MIT license.
+
+using NBB.MultiTenancy.Abstractions.Context;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace NBB.MultiTenancy.Abstractions
+{
+    public sealed class TenantLogScope(TenantContext tenantContext) : IReadOnlyList<KeyValuePair<string, object>>
+    {
+        private string? _cachedToString;
+
+        public Guid TenantId => tenantContext?.GetTenantId() ?? throw new ArgumentNullException(nameof(tenantContext));
+        public string TenantCode => tenantContext?.GetTenantCode() ?? throw new ArgumentNullException(nameof(tenantContext));
+        public int Count => 2;
+
+        public KeyValuePair<string, object> this[int index]
+        {
+            get
+            {
+                if (index == 0)
+                {
+                    return new KeyValuePair<string, object>(nameof(TenantId), TenantId);
+                }
+                else if (index == 1)
+                {
+                    return new KeyValuePair<string, object>(nameof(TenantCode), TenantCode);
+                }
+
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+        }
+
+        public override string ToString()
+        {
+            _cachedToString ??= string.Format(
+                    CultureInfo.InvariantCulture,
+                    "TenantId:{0} TenantCode:{1}",
+                    TenantId,
+                    TenantCode);
+
+            return _cachedToString;
+        }
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            for (var i = 0; i < Count; ++i)
+            {
+                yield return this[i];
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

src/MultiTenancy/NBB.MultiTenancy.AspNet/TenantMiddleware.cs

@@ -10,18 +10,12 @@
 using NBB.MultiTenancy.Abstractions.Repositories;
 using NBB.MultiTenancy.Identification.Services;
 using NBB.MultiTenancy.Abstractions;
+using Microsoft.Extensions.Logging;
 
 namespace NBB.MultiTenancy.AspNet
 {
-    public class TenantMiddleware
+    public class TenantMiddleware(RequestDelegate next, ILogger<TenantMiddleware> logger)
     {
-        private readonly RequestDelegate _next;
-
-        public TenantMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
-
         public async Task Invoke(HttpContext context, ITenantIdentificationService tenantIdentificationService,
             ITenantContextAccessor tenantContextAccessor, ITenantRepository tenantRepository, IOptions<TenancyHostingOptions> tenancyOptions)
         {
@@ -34,7 +28,7 @@ public async Task Invoke(HttpContext context, ITenantIdentificationService tenan
             if (tenancyOptions.Value.TenancyType == TenancyType.MonoTenant)
             {
                 tenantContextAccessor.TenantContext = new TenantContext(Tenant.Default);
-                await _next(context);
+                await next(context);
                 return;
             }
 
@@ -44,9 +38,10 @@ public async Task Invoke(HttpContext context, ITenantIdentificationService tenan
 
             tenantContextAccessor.TenantContext = new TenantContext(tenant);
 
-            await _next(context);
+            using (logger.BeginScope(new TenantLogScope(tenantContextAccessor.TenantContext)))
+            {
+                await next(context);
+            }
         }
-
-
     }
 }