PR feedback and minor cleanup

microsoft · Oct 10, 2024 · 830934f · 830934f
1 parent b9d6891
commit 830934f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/DurableTask.SqlServer.AzureFunctions/SqlMetricsProvider.cs b/src/DurableTask.SqlServer.AzureFunctions/SqlMetricsProvider.cs
@@ -10,7 +10,7 @@ public class SqlMetricsProvider
     {
         readonly SqlOrchestrationService service;
 
-        public SqlMetricsProvider(SqlOrchestrationService service, int? previousWorkerCount = null)
+        public SqlMetricsProvider(SqlOrchestrationService service)
         {
             this.service = service;
         }

diff --git a/src/DurableTask.SqlServer.AzureFunctions/SqlTargetScaler.cs b/src/DurableTask.SqlServer.AzureFunctions/SqlTargetScaler.cs
@@ -4,6 +4,7 @@
 #if FUNCTIONS_V4
 namespace DurableTask.SqlServer.AzureFunctions
 {
+    using System;
     using System.Threading.Tasks;
     using Microsoft.Azure.WebJobs.Host.Scale;
 
@@ -28,7 +29,7 @@ public async Task<TargetScalerResult> GetScaleResultAsync(TargetScalerContext co
             SqlScaleMetric sqlScaleMetric = await this.sqlMetricsProvider.GetMetricsAsync();
             return new TargetScalerResult
             {
-                TargetWorkerCount = sqlScaleMetric.RecommendedReplicaCount,
+                TargetWorkerCount = Math.Max(0, sqlScaleMetric.RecommendedReplicaCount),
             };
         }
     }

diff --git a/test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs b/test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs
@@ -3,14 +3,11 @@
 
 namespace DurableTask.SqlServer.AzureFunctions.Tests
 {
-    using System;
     using DurableTask.Core;
     using Microsoft.Azure.WebJobs.Extensions.DurableTask;
     using Microsoft.Azure.WebJobs.Host.Scale;
-    using Microsoft.Extensions.Logging;
     using Moq;
     using Xunit;
-    using Xunit.Abstractions;
 
     public class TargetBasedScalingTests
     {
@@ -21,10 +18,10 @@ public TargetBasedScalingTests()
         {
             this.orchestrationServiceMock = new Mock<IOrchestrationService>(MockBehavior.Strict);
 
+            SqlOrchestrationService? nullServiceArg = null; // not needed for this test
             this.metricsProviderMock = new Mock<SqlMetricsProvider>(
-                MockBehavior.Strict,
-                null,
-                null);
+                behavior: MockBehavior.Strict,
+                nullServiceArg);
         }
 
         [Theory]
@@ -40,14 +37,14 @@ public async void TargetBasedScalingTest(int expectedTargetWorkerCount)
                 new Mock<IOrchestrationServiceClient>().Object,
                 "connectionName");
 
-            SqlScaleMetric sqlScaleMetric = new SqlScaleMetric()
+            var sqlScaleMetric = new SqlScaleMetric()
             {
                 RecommendedReplicaCount = expectedTargetWorkerCount,
             };
 
             this.metricsProviderMock.Setup(m => m.GetMetricsAsync(null)).ReturnsAsync(sqlScaleMetric);
 
-            SqlTargetScaler targetScaler = new SqlTargetScaler(
+            var targetScaler = new SqlTargetScaler(
                 "functionId",
                 this.metricsProviderMock.Object);