Scaler apis

src/WebJobs.Script.WebHost/Controllers/HostController.cs

@@ -317,8 +317,8 @@ public async Task<IActionResult> GetScaleStatus([FromBody] ScaleStatusContext co
             }
 
             // TEMP: Once https://github.com/Azure/azure-functions-host/issues/5161 is fixed, we should take
-            // FunctionsScaleManager as a parameter.
-            if (Utility.TryGetHostService(scriptHostManager, out FunctionsScaleManager scaleManager))
+            // IScaleStatusProvider as a parameter.
+            if (Utility.TryGetHostService(scriptHostManager, out IScaleStatusProvider scaleManager))
             {
                 var scaleStatus = await scaleManager.GetScaleStatusAsync(context);
                 return new ObjectResult(scaleStatus);
@@ -327,7 +327,7 @@ public async Task<IActionResult> GetScaleStatus([FromBody] ScaleStatusContext co
             {
                 // This case should never happen. Because this action is marked RequiresRunningHost,
                 // it's only invoked when the host is running, and if it's running, we'll have access
-                // to the FunctionsScaleManager.
+                // to the IScriptHostManager.
                 return StatusCode(StatusCodes.Status503ServiceUnavailable);
             }
         }

src/WebJobs.Script.WebHost/DependencyInjection/DependencyValidator/DependencyValidator.cs

@@ -48,15 +48,15 @@ private static ExpectedDependencyBuilder CreateExpectedDependencies()
                 .Expect<WorkerConsoleLogService>()
                 .Expect<FunctionInvocationDispatcherShutdownManager>()
                 .Expect<WorkerConcurrencyManager>()
-                .Optional<FunctionsScaleMonitorService>()
                 .Optional<FuncAppFileProvisioningService>() // Used by powershell.
                 .Optional<JobHostService>() // Missing when host is offline.
                 .Optional<FunctionsSyncService>() // Conditionally registered.
                 .OptionalExternal("Microsoft.AspNetCore.DataProtection.Internal.DataProtectionHostedService", "Microsoft.AspNetCore.DataProtection", "adb9793829ddae60") // Popularly-registered by DataProtection.
                 .OptionalExternal("Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckPublisherHostedService", "Microsoft.Extensions.Diagnostics.HealthChecks", "adb9793829ddae60") // Popularly-registered by Health Check Monitor.
                 .OptionalExternal("OpenTelemetry.Extensions.Hosting.Implementation.TelemetryHostedService", "OpenTelemetry.Extensions.Hosting", "7bd6737fe5b67e3c") // Enable OpenTelemetry.Net instrumentation library
                 .OptionalExternal("Microsoft.Azure.WebJobs.Hosting.PrimaryHostCoordinator", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35")
-                .OptionalExternal("Microsoft.Azure.WebJobs.Host.Scale.ConcurrencyManagerService", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35");
+                .OptionalExternal("Microsoft.Azure.WebJobs.Host.Scale.ConcurrencyManagerService", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35")
+                .OptionalExternal("Microsoft.Azure.WebJobs.Host.Scale.ScaleMonitorService", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35");
 
             expected.ExpectSubcollection<ILoggerProvider>()
                 .Expect<FunctionFileLoggerProvider>()

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

@@ -77,7 +77,7 @@
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
 
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.36" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.37-11123" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.0-beta.2-11957" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="$(IdentityDependencyVersion)" />

src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs

@@ -131,7 +131,7 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                         // EasyAuth must go after CORS, as CORS preflight requests can happen before authentication
                         services.TryAddEnumerable(ServiceDescriptor.Singleton<IJobHostHttpMiddleware, JobHostEasyAuthMiddleware>());
                     }
-                    services.TryAddSingleton<IScaleMetricsRepository, TableStorageScaleMetricsRepository>();
+                    services.AddSingleton<IScaleMetricsRepository, TableStorageScaleMetricsRepository>();
 
                     services.TryAddEnumerable(ServiceDescriptor.Singleton<IConcurrencyThrottleProvider, WorkerChannelThrottleProvider>());
 

src/WebJobs.Script/Config/ScaleOptionsSetup.cs

@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Azure.WebJobs.Host.Scale;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Azure.WebJobs.Script.Configuration
+{
+    internal class ScaleOptionsSetup : IConfigureOptions<ScaleOptions>
+    {
+        private readonly IEnvironment _environment;
+
+        public ScaleOptionsSetup(IEnvironment environment)
+        {
+            _environment = environment;
+        }
+
+        public void Configure(ScaleOptions options)
+        {
+            options.IsRuntimeScalingEnabled = _environment.IsRuntimeScaleMonitoringEnabled();
+            options.IsTargetScalingEnabled = _environment.IsTargetBasedScalingEnabled();
+        }
+    }
+}