[Storage] Replacing scaling logs to WebJobs extension methods

alrod · alrod · commit 8f5e15d1f849 · 2025-11-13T15:26:05.000-08:00
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,6 +4,7 @@
     <clear />
     <!-- Do not add any additional feeds if new packages are needed they need to come from our azure-sdk-for-net DevOps feed which has an upstream set to nuget.org -->
     <add key="azure-sdk-for-net" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
+    <add key="local" value="Q:\nuget" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -249,8 +249,8 @@
     <PackageReference Update="Microsoft.Azure.SignalR.Management" Version="1.29.0" />
     <PackageReference Update="Microsoft.Azure.SignalR.Protocols" Version="1.29.0" />
     <PackageReference Update="Microsoft.Azure.SignalR.Serverless.Protocols" Version="1.10.0" />
-    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.41" />
-    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.41" PrivateAssets="All"/>
+    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.42-dev" />
+    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.42-dev" PrivateAssets="All"/>
     <PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Rpc" Version="3.0.41" />
     <PackageReference Update="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
     <PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueMetricsProvider.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueMetricsProvider.cs
@@ -6,6 +6,7 @@
 using Azure;
 using Azure.Storage.Queues;
 using Azure.Storage.Queues.Models;
+using Microsoft.Azure.WebJobs.Host.Scale;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Azure.WebJobs.Extensions.Storage.Common.Listeners
@@ -49,12 +50,12 @@ public async Task<int> GetQueueLengthAsync()
                     // ignore transient errors, and return default metrics
                     // E.g. if the queue doesn't exist, we'll return a zero queue length
                     // and scale in
-                    _logger.LogWarning($"Error querying for queue scale status: {ex.ToString()}");
+                    _logger.LogFunctionScaleError("Error querying for queue scale status", string.Empty, ex);
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogWarning($"Fatal error querying for queue scale status: {ex.ToString()}");
+                _logger.LogFunctionScaleError("Fatal error querying for queue scale status", string.Empty, ex);
             }
 
             return 0;
@@ -101,12 +102,13 @@ public async Task<QueueTriggerMetrics> GetMetricsAsync()
                     // ignore transient errors, and return default metrics
                     // E.g. if the queue doesn't exist, we'll return a zero queue length
                     // and scale in
-                    _logger.LogWarning($"Error querying for queue scale status: {ex.ToString()}");
+
+                    _logger.LogFunctionScaleError("Error querying for queue scale status", string.Empty, ex);
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogWarning($"Fatal error querying for queue scale status: {ex.ToString()}");
+                _logger.LogFunctionScaleError("Fatal error querying for queue scale status", string.Empty, ex);
             }
 
             return new QueueTriggerMetrics
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueTargetScaler.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueTargetScaler.cs
@@ -64,7 +64,8 @@ internal TargetScalerResult GetScaleResultInternal(TargetScalerContext context,
 
             int targetWorkerCount = (int)Math.Ceiling(queueLength / (decimal)concurrency);
 
-            _logger.LogInformation($"Target worker count for function '{_functionId}' is '{targetWorkerCount}' (QueueName='{_queueName}', QueueLength ='{queueLength}', Concurrency='{concurrency}').");
+            string details = $"Target worker count for function '{_functionId}' is '{targetWorkerCount}' (QueueName='{_queueName}', QueueLength ='{queueLength}', Concurrency='{concurrency}').";
+            _logger.LogFunctionScaleVote(_functionId, targetWorkerCount, queueLength, concurrency, details);
             return new TargetScalerResult
             {
                 TargetWorkerCount = targetWorkerCount

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using Azure;`
`7`	`7`	`using Azure.Storage.Queues;`
`8`	`8`	`using Azure.Storage.Queues.Models;`
	`9`	`+using Microsoft.Azure.WebJobs.Host.Scale;`
`9`	`10`	`using Microsoft.Extensions.Logging;`
`10`	`11`
`11`	`12`	`namespace Microsoft.Azure.WebJobs.Extensions.Storage.Common.Listeners`
`@@ -49,12 +50,12 @@ public async Task<int> GetQueueLengthAsync()`
`49`	`50`	`// ignore transient errors, and return default metrics`
`50`	`51`	`// E.g. if the queue doesn't exist, we'll return a zero queue length`
`51`	`52`	`// and scale in`
`52`		`- _logger.LogWarning($"Error querying for queue scale status: {ex.ToString()}");`
	`53`	`+ _logger.LogFunctionScaleError("Error querying for queue scale status", string.Empty, ex);`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`catch (Exception ex)`
`56`	`57`	`{`
`57`		`- _logger.LogWarning($"Fatal error querying for queue scale status: {ex.ToString()}");`
	`58`	`+ _logger.LogFunctionScaleError("Fatal error querying for queue scale status", string.Empty, ex);`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`return 0;`
`@@ -101,12 +102,13 @@ public async Task<QueueTriggerMetrics> GetMetricsAsync()`
`101`	`102`	`// ignore transient errors, and return default metrics`
`102`	`103`	`// E.g. if the queue doesn't exist, we'll return a zero queue length`
`103`	`104`	`// and scale in`
`104`		`- _logger.LogWarning($"Error querying for queue scale status: {ex.ToString()}");`
	`105`	`+`
	`106`	`+ _logger.LogFunctionScaleError("Error querying for queue scale status", string.Empty, ex);`
`105`	`107`	`}`
`106`	`108`	`}`
`107`	`109`	`catch (Exception ex)`
`108`	`110`	`{`
`109`		`- _logger.LogWarning($"Fatal error querying for queue scale status: {ex.ToString()}");`
	`111`	`+ _logger.LogFunctionScaleError("Fatal error querying for queue scale status", string.Empty, ex);`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`return new QueueTriggerMetrics`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ internal TargetScalerResult GetScaleResultInternal(TargetScalerContext context,`
`64`	`64`
`65`	`65`	`int targetWorkerCount = (int)Math.Ceiling(queueLength / (decimal)concurrency);`
`66`	`66`
`67`		`- _logger.LogInformation($"Target worker count for function '{_functionId}' is '{targetWorkerCount}' (QueueName='{_queueName}', QueueLength ='{queueLength}', Concurrency='{concurrency}').");`
	`67`	`+ string details = $"Target worker count for function '{_functionId}' is '{targetWorkerCount}' (QueueName='{_queueName}', QueueLength ='{queueLength}', Concurrency='{concurrency}').";`
	`68`	`+ _logger.LogFunctionScaleVote(_functionId, targetWorkerCount, queueLength, concurrency, details);`
`68`	`69`	`return new TargetScalerResult`
`69`	`70`	`{`
`70`	`71`	`TargetWorkerCount = targetWorkerCount`