Harden limiter lifecycle and key formatting

KSemenenko · KSemenenko · commit 6b31497342b7 · 2026-05-05T12:51:19.000+02:00
diff --git a/ManagedCode.Orleans.RateLimiting.Client/Extensions/HttpRequestExtensions.cs b/ManagedCode.Orleans.RateLimiting.Client/Extensions/HttpRequestExtensions.cs
@@ -7,11 +7,16 @@ namespace ManagedCode.Orleans.RateLimiting.Client.Extensions;
 
 public static class HttpRequestExtensions
 {
+    private const char CsvSeparator = ',';
+    private const string RealIpHeaderName = "X-Real-IP";
+    private const string ForwardedForHeaderName = "X-Forwarded-For";
+    private const string RemoteAddressHeaderName = "REMOTE_ADDR";
+
     private static readonly string[] DefaultIpHeaders =
     [
-        "X-Real-IP",
-        "X-Forwarded-For",
-        "REMOTE_ADDR"
+        RealIpHeaderName,
+        ForwardedForHeaderName,
+        RemoteAddressHeaderName
     ];
 
     public static string GetClientIpAddress(this HttpRequest request)
@@ -59,6 +64,6 @@ private static IEnumerable<string> SplitCsv(string? csvList)
         if (string.IsNullOrWhiteSpace(csvList))
             return Enumerable.Empty<string>();
 
-        return csvList.TrimEnd(',').Split(',').Select(s => s.Trim());
+        return csvList.TrimEnd(CsvSeparator).Split(CsvSeparator).Select(s => s.Trim());
     }
 }
diff --git a/ManagedCode.Orleans.RateLimiting.Client/Middlewares/OrleansBaseRateLimitingMiddleware.cs b/ManagedCode.Orleans.RateLimiting.Client/Middlewares/OrleansBaseRateLimitingMiddleware.cs
@@ -6,6 +6,7 @@
 using ManagedCode.Orleans.RateLimiting.Core.Extensions;
 using ManagedCode.Orleans.RateLimiting.Core.Models;
 using ManagedCode.Orleans.RateLimiting.Core.Models.Holders;
+using ManagedCode.Orleans.RateLimiting.Core.Models.Orchestration;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.DependencyInjection;
@@ -89,6 +90,6 @@ protected static (T attribute, string? postfix)? TryGetAttribute<T>(HttpContext
 
     protected static string CreateKey(params string[] parts)
     {
-        return string.Join(RateLimitMiddlewareConstants.KeySeparator, parts);
+        return RateLimitPartitionKeyFormatter.Join(parts);
     }
 }
diff --git a/ManagedCode.Orleans.RateLimiting.Client/Middlewares/OrleansUserRateLimitingMiddleware.cs b/ManagedCode.Orleans.RateLimiting.Client/Middlewares/OrleansUserRateLimitingMiddleware.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Security.Claims;
 using ManagedCode.Orleans.RateLimiting.Client.Attributes;
 using ManagedCode.Orleans.RateLimiting.Client.Extensions;
 using ManagedCode.Orleans.RateLimiting.Core.Models.Holders;
@@ -45,7 +46,7 @@ private bool AddAuthorizedRateLimiter(HttpContext httpContext, GroupLimiterHolde
         {
             var attribute = TryGetAttribute<AuthorizedIpRateLimiterAttribute>(httpContext);
             if (attribute.HasValue)
-                return holder.AddLimiter(TryGetLimiterHolder(CreateKey(httpContext.Request.GetClientIpAddress(), httpContext.User.Identity.Name ?? "rate-user-name", attribute.Value.postfix!), attribute.Value.attribute.ConfigurationName));
+                return holder.AddLimiter(TryGetLimiterHolder(CreateKey(httpContext.Request.GetClientIpAddress(), GetAuthenticatedUserKey(httpContext), attribute.Value.postfix!), attribute.Value.attribute.ConfigurationName));
         }
 
         return false;
@@ -56,9 +57,16 @@ private bool AddInRoleRateLimiter(HttpContext httpContext, GroupLimiterHolder ho
         var attribute = TryGetAttribute<InRoleIpRateLimiterAttribute>(httpContext);
         if (attribute.HasValue)
             if (httpContext.User?.Identity?.IsAuthenticated is true && httpContext.User.IsInRole(attribute.Value.attribute.Role))
-                return holder.AddLimiter(TryGetLimiterHolder(CreateKey(httpContext.Request.GetClientIpAddress(), httpContext.User.Identity.Name!, attribute.Value.attribute.Role, attribute.Value.postfix!),
+                return holder.AddLimiter(TryGetLimiterHolder(CreateKey(httpContext.Request.GetClientIpAddress(), GetAuthenticatedUserKey(httpContext), attribute.Value.attribute.Role, attribute.Value.postfix!),
                     attribute.Value.attribute.ConfigurationName));
 
         return false;
     }
-}
+
+    private static string GetAuthenticatedUserKey(HttpContext httpContext)
+    {
+        return httpContext.User.Identity?.Name
+               ?? httpContext.User.FindFirstValue(ClaimTypes.NameIdentifier)
+               ?? RateLimitMiddlewareConstants.UnknownAuthenticatedUserKey;
+    }
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Client/Middlewares/RateLimitMiddlewareConstants.cs b/ManagedCode.Orleans.RateLimiting.Client/Middlewares/RateLimitMiddlewareConstants.cs
@@ -3,7 +3,7 @@ namespace ManagedCode.Orleans.RateLimiting.Client.Middlewares;
 internal static class RateLimitMiddlewareConstants
 {
     public const string DefaultPath = "/";
-    public const string KeySeparator = ":";
+    public const string UnknownAuthenticatedUserKey = "rate-user-name";
     public const string OperationNameSeparator = " ";
     public const string ResourceSeparator = ".";
     public const string TooManyRequestsError = "Too many requests";
@@ -17,4 +17,5 @@ internal static class RateLimitMiddlewareConstants
     public const string ConfigurationMetadataKey = "configuration";
     public const string PartitionMetadataKey = "partition";
     public const string PathMetadataKey = "path";
+    public const string SignalRRateLimitedLogMessage = "SignalR invocation {HubMethodName} was rate limited: {Reason}";
 }
diff --git a/ManagedCode.Orleans.RateLimiting.Client/Middlewares/RateLimitResponseWriter.cs b/ManagedCode.Orleans.RateLimiting.Client/Middlewares/RateLimitResponseWriter.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using System.Globalization;
 using ManagedCode.Orleans.RateLimiting.Core.Models;
 using Microsoft.AspNetCore.Http;
 
@@ -17,7 +18,7 @@ await httpContext.Response.WriteAsJsonAsync(new RateLimitRejectedResponse(
             StatusCodes.Status429TooManyRequests,
             RateLimitMiddlewareConstants.TooManyRequestsError,
             lease.Reason,
-            lease.RetryAfter.ToString()));
+            lease.RetryAfter.ToString(null, CultureInfo.InvariantCulture)));
     }
 
     private sealed record RateLimitRejectedResponse(int StatusCode, string Error, string Reason, string RetryAfter);
diff --git a/ManagedCode.Orleans.RateLimiting.Client/Middlewares/RateLimitingHubFilter.cs b/ManagedCode.Orleans.RateLimiting.Client/Middlewares/RateLimitingHubFilter.cs
@@ -34,7 +34,7 @@ public RateLimitingHubFilter(
         var lease = await holder.AcquireAsync();
         if (lease is not null)
         {
-            _logger.LogInformation("SignalR invocation {HubMethodName} was rate limited: {Reason}", invocationContext.HubMethodName, lease.Reason);
+            _logger.LogInformation(RateLimitMiddlewareConstants.SignalRRateLimitedLogMessage, invocationContext.HubMethodName, lease.Reason);
             throw new RateLimitExceededException(lease.Reason, lease.RetryAfter);
         }
 
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Exceptions/RateLimitConfigurationNotFoundException.cs b/ManagedCode.Orleans.RateLimiting.Core/Exceptions/RateLimitConfigurationNotFoundException.cs
@@ -9,7 +9,7 @@ public RateLimitConfigurationNotFoundException()
     }
 
     public RateLimitConfigurationNotFoundException(string configurationName)
-        : base($"Rate limiter configuration '{configurationName}' was not found.")
+        : base(RateLimiterExceptionMessages.ConfigurationNotFound(configurationName))
     {
         ConfigurationName = configurationName;
     }
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Exceptions/RateLimitPartitionKeyNotFoundException.cs b/ManagedCode.Orleans.RateLimiting.Core/Exceptions/RateLimitPartitionKeyNotFoundException.cs
@@ -10,7 +10,7 @@ public RateLimitPartitionKeyNotFoundException()
     }
 
     public RateLimitPartitionKeyNotFoundException(RateLimitPartitionKind kind)
-        : base($"Rate limit partition key for '{kind}' was not found.")
+        : base(RateLimiterExceptionMessages.PartitionKeyNotFound(kind))
     {
         Kind = kind;
     }
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Exceptions/RateLimiterExceptionMessages.cs b/ManagedCode.Orleans.RateLimiting.Core/Exceptions/RateLimiterExceptionMessages.cs
@@ -0,0 +1,18 @@
+namespace ManagedCode.Orleans.RateLimiting.Core.Exceptions;
+
+public static class RateLimiterExceptionMessages
+{
+    private const string ConfigurationNotFoundPrefix = "Rate limiter configuration '";
+    private const string PartitionKeyNotFoundPrefix = "Rate limit partition key for '";
+    private const string NotFoundSuffix = "' was not found.";
+
+    public static string ConfigurationNotFound(string configurationName)
+    {
+        return string.Concat(ConfigurationNotFoundPrefix, configurationName, NotFoundSuffix);
+    }
+
+    public static string PartitionKeyNotFound(object kind)
+    {
+        return string.Concat(PartitionKeyNotFoundPrefix, kind, NotFoundSuffix);
+    }
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Extensions/GrainFactoryExtensions.cs b/ManagedCode.Orleans.RateLimiting.Core/Extensions/GrainFactoryExtensions.cs
@@ -19,7 +19,7 @@ public static ILimiterHolder GetRateLimiter<T>(this IGrainFactory factory, strin
             var type when type == typeof(ISlidingWindowRateLimiterGrain) => factory.GetSlidingWindowRateLimiter(key),
             var type when type == typeof(ITokenBucketRateLimiterGrain) => factory.GetTokenBucketRateLimiter(key),
 
-            _ => throw new System.NotSupportedException($"Rate limiter grain type '{typeof(T).FullName}' is not supported.")
+            _ => throw new System.NotSupportedException(RateLimiterLogMessages.UnsupportedGrainType(typeof(T).FullName))
         };
     }
 
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Models/Orchestration/RateLimitPartitionKeyDefaults.cs b/ManagedCode.Orleans.RateLimiting.Core/Models/Orchestration/RateLimitPartitionKeyDefaults.cs
@@ -0,0 +1,9 @@
+namespace ManagedCode.Orleans.RateLimiting.Core.Models.Orchestration;
+
+public static class RateLimitPartitionKeyDefaults
+{
+    public const string Separator = ":";
+    public const string EscapeToken = "%";
+    public const string EscapedEscapeToken = "%25";
+    public const string EscapedSeparator = "%3A";
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Models/Orchestration/RateLimitPartitionKeyFormatter.cs b/ManagedCode.Orleans.RateLimiting.Core/Models/Orchestration/RateLimitPartitionKeyFormatter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Linq;
+
+namespace ManagedCode.Orleans.RateLimiting.Core.Models.Orchestration;
+
+public static class RateLimitPartitionKeyFormatter
+{
+    public static string Join(params object?[] parts)
+    {
+        return string.Join(RateLimitPartitionKeyDefaults.Separator, parts.Select(FormatPart));
+    }
+
+    public static string FormatPart(object? part)
+    {
+        var value = Convert.ToString(part, CultureInfo.InvariantCulture) ?? string.Empty;
+
+        return value
+            .Replace(RateLimitPartitionKeyDefaults.EscapeToken, RateLimitPartitionKeyDefaults.EscapedEscapeToken, StringComparison.Ordinal)
+            .Replace(RateLimitPartitionKeyDefaults.Separator, RateLimitPartitionKeyDefaults.EscapedSeparator, StringComparison.Ordinal);
+    }
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Models/Orchestration/RateLimitRequestPartition.cs b/ManagedCode.Orleans.RateLimiting.Core/Models/Orchestration/RateLimitRequestPartition.cs
@@ -27,6 +27,8 @@ public RateLimitRequestPartition(RateLimitPartitionKind kind, string key, string
 
     public override string ToString()
     {
-        return ConfigurationName is null ? $"{Kind}:{Key}" : $"{Kind}:{ConfigurationName}:{Key}";
+        return ConfigurationName is null
+            ? RateLimitPartitionKeyFormatter.Join(Kind, Key)
+            : RateLimitPartitionKeyFormatter.Join(Kind, ConfigurationName, Key);
     }
 }
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Models/OrleansRateLimitLease.cs b/ManagedCode.Orleans.RateLimiting.Core/Models/OrleansRateLimitLease.cs
@@ -60,16 +60,14 @@ public async ValueTask DisposeAsync()
         {
             await GrainFactory.GetGrain(_grainId).AsReference<IRateLimiterGrain>().ReleaseLease(_guid);
         }
-        catch (TimeoutException)
+        catch
         {
-            //ignore
+            // Lease release is best-effort during shutdown, timeout, or deactivation races.
         }
-        catch (AggregateException ex) when (ex.InnerException is TimeoutException)
+        finally
         {
-            // ignore
+            GC.SuppressFinalize(this);
         }
-
-        GC.SuppressFinalize(this);
     }
 
     public void ThrowIfNotAcquired([CallerMemberName] string? caller = null, [CallerLineNumber] int? lineNumber = null, [CallerFilePath] string? filePath = null)
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Models/RateLimitLeaseMetadata.cs b/ManagedCode.Orleans.RateLimiting.Core/Models/RateLimitLeaseMetadata.cs
@@ -12,7 +12,7 @@ public class RateLimitLeaseMetadata
 {
     public RateLimitLeaseMetadata(Guid leaseId, GrainId grainId, RateLimitLease lease)
     {
-        LeaseId = leaseId;
+        LeaseId = lease.IsAcquired ? leaseId : Guid.Empty;
         GrainId = grainId;
         IsAcquired = lease.IsAcquired;
         Metadata = lease.GetAllMetadata().ToArray();
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Models/RateLimiterLogMessages.cs b/ManagedCode.Orleans.RateLimiting.Core/Models/RateLimiterLogMessages.cs
@@ -0,0 +1,14 @@
+namespace ManagedCode.Orleans.RateLimiting.Core.Models;
+
+public static class RateLimiterLogMessages
+{
+    private const string UnsupportedGrainTypePrefix = "Rate limiter grain type '";
+    private const string UnsupportedGrainTypeSuffix = "' is not supported.";
+
+    public const string ConfiguredLimiter = "Configured {LimiterType} with id:{GrainId}";
+
+    public static string UnsupportedGrainType(string? grainType)
+    {
+        return string.Concat(UnsupportedGrainTypePrefix, grainType, UnsupportedGrainTypeSuffix);
+    }
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Services/DefaultRateLimitRequestKeyResolver.cs b/ManagedCode.Orleans.RateLimiting.Core/Services/DefaultRateLimitRequestKeyResolver.cs
@@ -34,7 +34,7 @@ public sealed class DefaultRateLimitRequestKeyResolver : IRateLimitRequestKeyRes
         if (string.IsNullOrWhiteSpace(rule.KeyPrefix))
             return ValueTask.FromResult<string?>(key);
 
-        return ValueTask.FromResult<string?>($"{rule.KeyPrefix}:{key}");
+        return ValueTask.FromResult<string?>(RateLimitPartitionKeyFormatter.Join(rule.KeyPrefix, key));
     }
 
     private static string? ResolveCustomKey(RateLimitRequestContext context, RateLimitRequestRule rule)
diff --git a/ManagedCode.Orleans.RateLimiting.Server/Grains/ConcurrencyLimiterGrain.cs b/ManagedCode.Orleans.RateLimiting.Server/Grains/ConcurrencyLimiterGrain.cs
@@ -10,7 +10,7 @@
 namespace ManagedCode.Orleans.RateLimiting.Server.Grains;
 
 [Reentrant]
-[GrainType($"ManagedCode.${nameof(ConcurrencyLimiterGrain)}")]
+[GrainType(RateLimiterGrainTypeNames.ConcurrencyLimiter)]
 public class ConcurrencyLimiterGrain : RateLimiterGrain<ConcurrencyLimiter, ConcurrencyLimiterOptions>, IConcurrencyLimiterGrain
 {
     public ConcurrencyLimiterGrain(ILogger<ConcurrencyLimiterGrain> logger, IOptions<ConcurrencyLimiterOptions> options) : base(logger, options.Value)
@@ -42,4 +42,4 @@ private bool CheckOptions(ConcurrencyLimiterOptions options)
     {
         return Options.PermitLimit != options.PermitLimit || Options.QueueLimit != options.QueueLimit || Options.QueueProcessingOrder != options.QueueProcessingOrder;
     }
-}
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Server/Grains/FixedWindowRateLimiterGrain.cs b/ManagedCode.Orleans.RateLimiting.Server/Grains/FixedWindowRateLimiterGrain.cs
@@ -10,7 +10,7 @@
 namespace ManagedCode.Orleans.RateLimiting.Server.Grains;
 
 [Reentrant]
-[GrainType($"ManagedCode.${nameof(FixedWindowRateLimiterGrain)}")]
+[GrainType(RateLimiterGrainTypeNames.FixedWindowRateLimiter)]
 public class FixedWindowRateLimiterGrain : RateLimiterGrain<FixedWindowRateLimiter, FixedWindowRateLimiterOptions>, IFixedWindowRateLimiterGrain
 {
     public FixedWindowRateLimiterGrain(ILogger<FixedWindowRateLimiterGrain> logger, IOptions<FixedWindowRateLimiterOptions> options) : base(logger, options.Value)
@@ -48,4 +48,4 @@ private bool CheckOptions(FixedWindowRateLimiterOptions options)
         return Options.PermitLimit != options.PermitLimit || Options.QueueLimit != options.QueueLimit || Options.QueueProcessingOrder != options.QueueProcessingOrder ||
                Options.Window != options.Window || Options.AutoReplenishment != options.AutoReplenishment;
     }
-}
+}
diff --git a/ManagedCode.Orleans.RateLimiting.Server/Grains/RateLimiterGrain.cs b/ManagedCode.Orleans.RateLimiting.Server/Grains/RateLimiterGrain.cs
diff --git a/ManagedCode.Orleans.RateLimiting.Server/Grains/RateLimiterGrainTypeNames.cs b/ManagedCode.Orleans.RateLimiting.Server/Grains/RateLimiterGrainTypeNames.cs
diff --git a/ManagedCode.Orleans.RateLimiting.Server/Grains/SlidingWindowRateLimiterGrain.cs b/ManagedCode.Orleans.RateLimiting.Server/Grains/SlidingWindowRateLimiterGrain.cs
diff --git a/ManagedCode.Orleans.RateLimiting.Server/Grains/TokenBucketRateLimiterGrain.cs b/ManagedCode.Orleans.RateLimiting.Server/Grains/TokenBucketRateLimiterGrain.cs
diff --git a/ManagedCode.Orleans.RateLimiting.Tests/CoreCoverageTests.cs b/ManagedCode.Orleans.RateLimiting.Tests/CoreCoverageTests.cs
diff --git a/docs/ProjectReview.md b/docs/ProjectReview.md

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,16 @@ namespace ManagedCode.Orleans.RateLimiting.Client.Extensions;`
`7`	`7`
`8`	`8`	`public static class HttpRequestExtensions`
`9`	`9`	`{`
	`10`	`+ private const char CsvSeparator = ',';`
	`11`	`+ private const string RealIpHeaderName = "X-Real-IP";`
	`12`	`+ private const string ForwardedForHeaderName = "X-Forwarded-For";`
	`13`	`+ private const string RemoteAddressHeaderName = "REMOTE_ADDR";`
	`14`	`+`
`10`	`15`	`private static readonly string[] DefaultIpHeaders =`
`11`	`16`	`[`
`12`		`- "X-Real-IP",`
`13`		`- "X-Forwarded-For",`
`14`		`- "REMOTE_ADDR"`
	`17`	`+ RealIpHeaderName,`
	`18`	`+ ForwardedForHeaderName,`
	`19`	`+ RemoteAddressHeaderName`
`15`	`20`	`];`
`16`	`21`
`17`	`22`	`public static string GetClientIpAddress(this HttpRequest request)`
`@@ -59,6 +64,6 @@ private static IEnumerable<string> SplitCsv(string? csvList)`
`59`	`64`	`if (string.IsNullOrWhiteSpace(csvList))`
`60`	`65`	`return Enumerable.Empty<string>();`
`61`	`66`
`62`		`- return csvList.TrimEnd(',').Split(',').Select(s => s.Trim());`
	`67`	`+ return csvList.TrimEnd(CsvSeparator).Split(CsvSeparator).Select(s => s.Trim());`
`63`	`68`	`}`
`64`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using ManagedCode.Orleans.RateLimiting.Core.Extensions;`
`7`	`7`	`using ManagedCode.Orleans.RateLimiting.Core.Models;`
`8`	`8`	`using ManagedCode.Orleans.RateLimiting.Core.Models.Holders;`
	`9`	`+using ManagedCode.Orleans.RateLimiting.Core.Models.Orchestration;`
`9`	`10`	`using Microsoft.AspNetCore.Http;`
`10`	`11`	`using Microsoft.AspNetCore.Mvc.Controllers;`
`11`	`12`	`using Microsoft.Extensions.DependencyInjection;`
`@@ -89,6 +90,6 @@ protected static (T attribute, string? postfix)? TryGetAttribute<T>(HttpContext`
`89`	`90`
`90`	`91`	`protected static string CreateKey(params string[] parts)`
`91`	`92`	`{`
`92`		`- return string.Join(RateLimitMiddlewareConstants.KeySeparator, parts);`
	`93`	`+ return RateLimitPartitionKeyFormatter.Join(parts);`
`93`	`94`	`}`
`94`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace ManagedCode.Orleans.RateLimiting.Client.Middlewares;`
`3`	`3`	`internal static class RateLimitMiddlewareConstants`
`4`	`4`	`{`
`5`	`5`	`public const string DefaultPath = "/";`
`6`		`- public const string KeySeparator = ":";`
	`6`	`+ public const string UnknownAuthenticatedUserKey = "rate-user-name";`
`7`	`7`	`public const string OperationNameSeparator = " ";`
`8`	`8`	`public const string ResourceSeparator = ".";`
`9`	`9`	`public const string TooManyRequestsError = "Too many requests";`
`@@ -17,4 +17,5 @@ internal static class RateLimitMiddlewareConstants`
`17`	`17`	`public const string ConfigurationMetadataKey = "configuration";`
`18`	`18`	`public const string PartitionMetadataKey = "partition";`
`19`	`19`	`public const string PathMetadataKey = "path";`
	`20`	`+ public const string SignalRRateLimitedLogMessage = "SignalR invocation {HubMethodName} was rate limited: {Reason}";`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public RateLimitingHubFilter(`
`34`	`34`	`var lease = await holder.AcquireAsync();`
`35`	`35`	`if (lease is not null)`
`36`	`36`	`{`
`37`		`- _logger.LogInformation("SignalR invocation {HubMethodName} was rate limited: {Reason}", invocationContext.HubMethodName, lease.Reason);`
	`37`	`+ _logger.LogInformation(RateLimitMiddlewareConstants.SignalRRateLimitedLogMessage, invocationContext.HubMethodName, lease.Reason);`
`38`	`38`	`throw new RateLimitExceededException(lease.Reason, lease.RetryAfter);`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public RateLimitConfigurationNotFoundException()`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public RateLimitConfigurationNotFoundException(string configurationName)`
`12`		`- : base($"Rate limiter configuration '{configurationName}' was not found.")`
	`12`	`+ : base(RateLimiterExceptionMessages.ConfigurationNotFound(configurationName))`
`13`	`13`	`{`
`14`	`14`	`ConfigurationName = configurationName;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public RateLimitPartitionKeyNotFoundException()`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public RateLimitPartitionKeyNotFoundException(RateLimitPartitionKind kind)`
`13`		`- : base($"Rate limit partition key for '{kind}' was not found.")`
	`13`	`+ : base(RateLimiterExceptionMessages.PartitionKeyNotFound(kind))`
`14`	`14`	`{`
`15`	`15`	`Kind = kind;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static ILimiterHolder GetRateLimiter<T>(this IGrainFactory factory, strin`
`19`	`19`	`var type when type == typeof(ISlidingWindowRateLimiterGrain) => factory.GetSlidingWindowRateLimiter(key),`
`20`	`20`	`var type when type == typeof(ITokenBucketRateLimiterGrain) => factory.GetTokenBucketRateLimiter(key),`
`21`	`21`
`22`		`- _ => throw new System.NotSupportedException($"Rate limiter grain type '{typeof(T).FullName}' is not supported.")`
	`22`	`+ _ => throw new System.NotSupportedException(RateLimiterLogMessages.UnsupportedGrainType(typeof(T).FullName))`
`23`	`23`	`};`
`24`	`24`	`}`
`25`	`25`