udpate by comments

Author: nytian

.github/workflows/validate-build-scale.yml

@@ -1,4 +1,6 @@
 name: Functions Scale Tests Azure Storage 
+permissions:
+  contents: read
 
 on:
   push:
@@ -35,7 +37,7 @@ jobs:
       run: dotnet restore $solution
 
     - name: Build
-      run: dotnet build $solution
+      run: dotnet build $solution -c $config
 
     - name: Set up Node.js (needed for Azurite)
       uses: actions/setup-node@v3
@@ -46,4 +48,18 @@ jobs:
       run: npm install -g azurite
 
     - name: Run Scale tests
-      run: azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002 & dotnet test ./test/ScaleTests/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale.Tests.csproj --no-build --verbosity normal
+      run : |
+        azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002
+
+        # Wait for Azurite to be ready
+        for i in {1..30}; do
+          if nc -z 127.0.0.1 10000; then
+            echo "Azurite is ready"
+            break
+          fi
+          echo "Azurite is not ready, waiting ($1/30)"
+          sleep 1
+        done
+
+        # Run tests
+        dotnet test ./test/ScaleTests/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale.Tests.csproj -c $config --no-build --verbosity normal

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/AzureStorage/AzureStorageScalabilityProviderFactory.cs

@@ -4,8 +4,8 @@
 
 using System;
 using System.Linq;
+using System.Reflection;
 using Microsoft.Azure.WebJobs.Host.Scale;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale.AzureStorage
@@ -19,28 +19,20 @@ public class AzureStorageScalabilityProviderFactory : IScalabilityProviderFactor
         private const string LoggerName = "Triggers.DurableTask.AzureStorage";
 
         private readonly IStorageServiceClientProviderFactory clientProviderFactory;
-        private readonly IConfiguration configuration;
-        private readonly INameResolver nameResolver;
         private readonly ILoggerFactory loggerFactory;
         private readonly ILogger logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AzureStorageScalabilityProviderFactory"/> class.
         /// </summary>
         /// <param name="clientProviderFactory">The storage client provider factory.</param>
-        /// <param name="configuration">The configuration for reading connection strings.</param>
-        /// <param name="nameResolver">The name resolver for connection strings.</param>
         /// <param name="loggerFactory">The logger factory.</param>
         /// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
         public AzureStorageScalabilityProviderFactory(
             IStorageServiceClientProviderFactory clientProviderFactory,
-            IConfiguration configuration,
-            INameResolver nameResolver,
             ILoggerFactory loggerFactory)
         {
             this.clientProviderFactory = clientProviderFactory ?? throw new ArgumentNullException(nameof(clientProviderFactory));
-            this.configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
-            this.nameResolver = nameResolver ?? throw new ArgumentNullException(nameof(nameResolver));
             this.loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
             this.logger = this.loggerFactory.CreateLogger(LoggerName);
 
@@ -59,13 +51,13 @@ public AzureStorageScalabilityProviderFactory(
         public string DefaultConnectionName { get; }
 
         /// <summary>
-        /// Creates and caches a default <see cref="ScalabilityProvider"/> instance using Azure Storage as the backend using
-        /// the provided pre-deserialized metadata and trigger metadata for accessing Properties.
+        /// Creates and caches a default <see cref="ScalabilityProvider"/> instance using Azure Storage as the backend,
+        /// using the provided pre-deserialized metadata and trigger metadata for accessing properties.
         /// </summary>
         /// <param name="metadata">The pre-deserialized Durable Task metadata.</param>
-        /// <param name="triggerMetadata">Trigger metadata used to access Properties like token credentials.</param>
+        /// <param name="triggerMetadata">Trigger metadata used to access properties like token credentials.</param>
         /// <returns>
-        /// A singleton instance of <see cref="AzureStorageScalabilityProvider"/>.
+        /// An singleton instance of <see cref="AzureStorageScalabilityProvider"/>.
         /// </returns>
         public ScalabilityProvider GetScalabilityProvider(DurableTaskMetadata metadata, TriggerMetadata? triggerMetadata)
         {
@@ -114,23 +106,34 @@ public ScalabilityProvider GetScalabilityProvider(DurableTaskMetadata metadata,
                 // Call it using reflection to get the TokenCredential
                 var factoryType = componentFactoryObj.GetType();
                 var method = factoryType.GetMethod("CreateTokenCredential");
-                if (method != null)
+
+                if (method == null)
                 {
-                    try
-                    {
-                        // Call CreateTokenCredential(null) to get the TokenCredential from the wrapper
-                        var credential = method.Invoke(componentFactoryObj, new object?[] { null });
-                        if (credential is global::Azure.Core.TokenCredential tokenCredential)
-                        {
-                            return tokenCredential;
-                        }
-                    }
-                    catch (Exception ex)
+                    logger?.LogWarning(
+                        "CreateTokenCredential method not found on the AzureComponentFactory instance provided by the scale controller. " +
+                        "Identity-based authentication cannot be used in this case.");
+                    return null;
+                }
+
+                try
+                {
+                    // Call CreateTokenCredential(null) to get the TokenCredential from the wrapper
+                    var credential = method.Invoke(componentFactoryObj, new object?[] { null });
+                    if (credential is global::Azure.Core.TokenCredential tokenCredential)
                     {
-                        logger?.LogWarning(ex, "Failed to extract TokenCredential from AzureComponentFactory. Using null credential instead.");
-                        return null;
+                         return tokenCredential;
                     }
                 }
+                catch (TargetInvocationException ex)
+                {
+                    logger?.LogWarning(ex, "Failed to extract TokenCredential from AzureComponentFactory. Using null credential instead.");
+                    return null;
+                }
+                catch (TargetException ex)
+                {
+                    logger?.LogWarning(ex, "Failed to extract TokenCredential from AzureComponentFactory. Using null credential instead.");
+                    return null;
+                }
             }
 
             return null;

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/AzureStorage/DurableTaskTargetScaler.cs

@@ -19,7 +19,6 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale.AzureSto
     public class DurableTaskTargetScaler : ITargetScaler
     {
         private readonly DurableTaskMetricsProvider metricsProvider;
-        private readonly TargetScalerResult scaleResult;
         private readonly ScalabilityProvider scalabilityProvider;
         private readonly ILogger logger;
         private readonly string scaler;
@@ -47,7 +46,6 @@ public DurableTaskTargetScaler(
         {
             this.scaler = scalerId;
             this.metricsProvider = metricsProvider;
-            this.scaleResult = new TargetScalerResult();
             this.TargetScalerDescriptor = new TargetScalerDescriptor(this.scaler);
             this.scalabilityProvider = scalabilityProvider;
             this.logger = logger;
@@ -103,7 +101,6 @@ public async Task<TargetScalerResult> GetScaleResultAsync(TargetScalerContext co
                 var orchestratorWorkers = Math.Min(activeControlQueues, upperBoundControlWorkers);
 
                 int numWorkersToRequest = (int)Math.Max(activityWorkers, orchestratorWorkers);
-                this.scaleResult.TargetWorkerCount = numWorkersToRequest;
 
                 // When running on ScaleController V3, ILogger logs are forwarded to the ScaleController's Kusto table.
                 // This works because this code does not execute in the Functions Host process, but in the ScaleController process,
@@ -120,7 +117,7 @@ public async Task<TargetScalerResult> GetScaleResultAsync(TargetScalerContext co
                 }
 
                 this.logger.LogInformation(scaleControllerLog);
-                return this.scaleResult;
+                return new TargetScalerResult { TargetWorkerCount = numWorkersToRequest };
             }
             catch (Exception ex)
             {

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/DurableTaskMetadata.cs

@@ -13,6 +13,9 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale
     /// </summary>
     public class DurableTaskMetadata
     {
+        private const string DefaultConnectionName = "connectionName";
+        private const string ConnectionNameOverride = "connectionStringName";
+
         /// <summary>
         /// Gets or sets the name of the Durable Task Hub. This identifies the taskhub being monitored or scaled.
         /// </summary>
@@ -47,11 +50,21 @@ public class DurableTaskMetadata
         /// <param name="nameResolver">The name resolver used to resolve app setting placeholders.</param>
         public static void ResolveAppSettingOptions(DurableTaskMetadata metadata, INameResolver nameResolver)
         {
-            if (metadata.StorageProvider != null &&
-                metadata.StorageProvider.TryGetValue("connectionName", out object? connectionNameObj) &&
-                connectionNameObj is string connectionName)
+            if (metadata.StorageProvider == null)
+            {
+                return;
+            }
+
+            // Resolve both "connectionName" and "connectionStringName" keys for compatibility.
+            ResolveStorageProviderSetting(metadata.StorageProvider, DefaultConnectionName, nameResolver);
+            ResolveStorageProviderSetting(metadata.StorageProvider, ConnectionNameOverride, nameResolver);
+        }
+
+        private static void ResolveStorageProviderSetting(IDictionary<string, object> storageProvider, string key, INameResolver nameResolver)
+        {
+            if (storageProvider.TryGetValue(key, out object? value) && value is string name && !string.IsNullOrWhiteSpace(name))
             {
-                metadata.StorageProvider["connectionName"] = nameResolver.Resolve(connectionName) ?? string.Empty;
+                storageProvider[key] = nameResolver.Resolve(name) ?? string.Empty;
             }
         }
     }

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/DurableTaskScaleConfigurationExtensions.cs

@@ -39,23 +39,9 @@ public static IWebJobsBuilder AddDurableTask(this IWebJobsBuilder builder)
 
             IServiceCollection serviceCollection = builder.Services;
 
-            // Register StorageServiceClientProviderFactory using factory function to ensure proper construction
-            serviceCollection.TryAddSingleton<IStorageServiceClientProviderFactory>(serviceProvider =>
-            {
-                return new StorageServiceClientProviderFactory(
-                    serviceProvider.GetRequiredService<IConfiguration>(),
-                    serviceProvider.GetRequiredService<ILoggerFactory>());
-            });
+            serviceCollection.TryAddSingleton<IStorageServiceClientProviderFactory, StorageServiceClientProviderFactory>();
 
-            // Register all scalability provider factories
-            serviceCollection.AddSingleton<IScalabilityProviderFactory>(serviceProvider =>
-            {
-                return new AzureStorageScalabilityProviderFactory(
-                    serviceProvider.GetRequiredService<IStorageServiceClientProviderFactory>(),
-                    serviceProvider.GetRequiredService<IConfiguration>(),
-                    serviceProvider.GetRequiredService<INameResolver>(),
-                    serviceProvider.GetRequiredService<ILoggerFactory>());
-            });
+            serviceCollection.AddSingleton<IScalabilityProviderFactory, AzureStorageScalabilityProviderFactory>();
 
             return builder;
         }
@@ -119,7 +105,7 @@ internal static IWebJobsBuilder AddDurableScaleForTrigger(this IWebJobsBuilder b
                 }
             });
 
-            // builder.Services.AddSingleton<IScaleMonitorProvider>(serviceProvider => serviceProvider.GetServices<DurableTaskTriggersScaleProvider>().Single(x => x == provider));
+            builder.Services.AddSingleton<IScaleMonitorProvider>(serviceProvider => serviceProvider.GetServices<DurableTaskTriggersScaleProvider>().Single(x => x == provider));
             builder.Services.AddSingleton<ITargetScalerProvider>(serviceProvider =>
             {
                 // Get the DurableTaskTriggersScaleProvider instance - it should have been created by now

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/DurableTaskTriggersScaleProvider.cs

@@ -15,9 +15,6 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale
     /// </summary>
     public class DurableTaskTriggersScaleProvider : IScaleMonitorProvider, ITargetScalerProvider
     {
-        private const string DefaultConnectionName = "connectionName";
-        private const string ConnectionNameOverride = "connectionStringName";
-
         private readonly IScaleMonitor monitor;
         private readonly ITargetScaler targetScaler;
 
@@ -59,7 +56,6 @@ public DurableTaskTriggersScaleProvider(
                 throw new InvalidOperationException($"Expected `taskHubName` property in SyncTriggers payload but found none.");
             }
 
-            // Resolve app settings (e.g., %MyConnectionString% -> actual value)
             DurableTaskMetadata.ResolveAppSettingOptions(metadata, nameResolver);
 
             var logger = loggerFactory.CreateLogger<DurableTaskTriggersScaleProvider>();

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/StorageServiceClientProviderFactory.cs

@@ -16,7 +16,6 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale
     public class StorageServiceClientProviderFactory : IStorageServiceClientProviderFactory
     {
         private readonly IConfiguration configuration;
-        private readonly ILoggerFactory loggerFactory;
         private readonly ILogger logger;
 
         /// <summary>
@@ -33,7 +32,6 @@ public StorageServiceClientProviderFactory(
             ILoggerFactory loggerFactory)
         {
             this.configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
-            this.loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
             this.logger = loggerFactory.CreateLogger<StorageServiceClientProviderFactory>();
         }
 

src/Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale/TriggerMetadataExtensions.cs

@@ -12,6 +12,9 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.FunctionsScale
     /// </summary>
     internal static class TriggerMetadataExtensions
     {
+        private const string DefaultConnectionName = "connectionName";
+        private const string ConnectionNameOverride = "connectionStringName";
+
         /// <summary>
         /// For testing. Extracts DurableTaskMetadata from trigger metadata sent by the Scale Controller.
         /// </summary>
@@ -40,12 +43,12 @@ internal static class TriggerMetadataExtensions
                 return null;
             }
 
-            if (storageProvider.TryGetValue("connectionName", out object? v1) && v1 is string s1 && !string.IsNullOrWhiteSpace(s1))
+            if (storageProvider.TryGetValue(DefaultConnectionName, out object? v1) && v1 is string s1 && !string.IsNullOrWhiteSpace(s1))
             {
                 return s1;
             }
 
-            if (storageProvider.TryGetValue("connectionStringName", out object? v2) && v2 is string s2 && !string.IsNullOrWhiteSpace(s2))
+            if (storageProvider.TryGetValue(ConnectionNameOverride, out object? v2) && v2 is string s2 && !string.IsNullOrWhiteSpace(s2))
             {
                 return s2;
             }

test/ScaleTests/AzureStorage/AzureStorageScalabilityProviderFactoryTests.cs

@@ -54,8 +54,6 @@ public void Constructor_ValidParameters_CreatesInstance()
             // Act
             var factory = new AzureStorageScalabilityProviderFactory(
                 this.clientProviderFactory,
-                this.configuration,
-                this.nameResolver,
                 this.loggerFactory);
 
             // Assert
@@ -77,8 +75,6 @@ public void Constructor_NullClientProviderFactory_ThrowsArgumentNullException()
             Assert.Throws<ArgumentNullException>(() =>
                 new AzureStorageScalabilityProviderFactory(
                     null,
-                    this.configuration,
-                    this.nameResolver,
                     this.loggerFactory));
         }
 
@@ -96,8 +92,6 @@ public void GetScalabilityProvider_WithTriggerMetadata_ReturnsValidProvider()
             // Options no longer used - removed CreateOptions call
             var factory = new AzureStorageScalabilityProviderFactory(
                 this.clientProviderFactory,
-                this.configuration,
-                this.nameResolver,
                 this.loggerFactory);
 
             var triggerMetadata = CreateTriggerMetadata("testHub", 15, 25, "TestConnection");
@@ -128,8 +122,6 @@ public void ValidateAzureStorageOptions_InvalidMaxConcurrent_ThrowsInvalidOperat
             // Arrange - MaxConcurrentOrchestratorFunctions is 0 (invalid)
             var factory = new AzureStorageScalabilityProviderFactory(
                 this.clientProviderFactory,
-                this.configuration,
-                this.nameResolver,
                 this.loggerFactory);
 
             var triggerMetadata = CreateTriggerMetadata("testHub", 0, 20, "TestConnection"); // 0 is invalid
@@ -164,8 +156,6 @@ public void GetScalabilityProvider_WithMultipleConnections_CreatesProvidersSucce
                 // Options no longer used - removed CreateOptions call
                 var factory = new AzureStorageScalabilityProviderFactory(
                     clientFactory,
-                    config,
-                    this.nameResolver,
                     this.loggerFactory);
 
                 // Pass connection name via trigger metadata (Scale Controller behavior)