Merge pull request #4 from PandaTechAM/development

Assembly name fix in rate limit

Author: HaikAsatryan

src/DistributedCache/DistributedCache.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.2.1</Version>
+        <Version>1.2.2</Version>
         <PackageId>Pandatech.DistributedCache</PackageId>
         <Title>Pandatech Distributed Cache</Title>
         <PackageTags>Pandatech, library, redis, distributed locks, cache</PackageTags>

src/DistributedCache/Services/Implementations/RedisRateLimitService.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Diagnostics;
+using System.Reflection;
 using DistributedCache.Dtos;
 using DistributedCache.Enums;
 using DistributedCache.Helpers;
@@ -17,15 +18,14 @@ public class RedisRateLimitService(
    private readonly IRedisDatabase _redisDatabase = redisClient.GetDefaultDatabase();
    private readonly CacheConfigurationOptions _config = options.Value;
 
-   private readonly string _moduleName = Assembly.GetCallingAssembly()
-                                                 .GetName().Name!;
-
    public async ValueTask<RateLimitState> RateLimitAsync(RateLimitConfiguration rateLimitConfiguration,
       CancellationToken cancellationToken = default)
    {
+      var assemblyName = GetCallingAssemblyName();
+      
       var key = _config.KeyPrefixForIsolation == KeyPrefix.None
          ? KeyFormatHelper.GetPrefixedKey(rateLimitConfiguration.GetKey())
-         : KeyFormatHelper.GetPrefixedKey(rateLimitConfiguration.GetKey(), _moduleName);
+         : KeyFormatHelper.GetPrefixedKey(rateLimitConfiguration.GetKey(), assemblyName);
 
 
       var lockValue = Guid.NewGuid()
@@ -94,4 +94,18 @@ public async ValueTask<RateLimitState> RateLimitAsync(RateLimitConfiguration rat
          await lockService.ReleaseLockAsync(key, lockValue);
       }
    }
+   
+   private static string GetCallingAssemblyName()
+   {
+      var stackTrace = new StackTrace();
+      foreach (var frame in stackTrace.GetFrames())
+      {
+         var method = frame.GetMethod();
+         if (method != null && method.DeclaringType != typeof(RedisRateLimitService))
+         {
+            return method.DeclaringType!.Assembly.GetName().Name!;
+         }
+      }
+      return Assembly.GetExecutingAssembly().GetName().Name!;
+   }
 }