4.7.1 hotfix (#8509)

shreyas-gopalakrishna · safihamid · web-flow · commit 049c1669cb39 · 2022-06-24T16:03:12.000-05:00
* Fix cold start regression (#8505) * Removing service registration for profiles (#8502) * Update patch version Co-authored-by: Henry Hamid Safi <hamids@microsoft.com>
diff --git a/build/common.props b/build/common.props
@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>7</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
     <PreviewVersion></PreviewVersion>        
     
diff --git a/src/WebJobs.Script/Host/DebugStateProvider.cs b/src/WebJobs.Script/Host/DebugStateProvider.cs
@@ -14,12 +14,14 @@ internal class DebugStateProvider : IDebugStateProvider, IDisposable
         internal const int DebugModeTimeoutMinutes = 15;
         internal const int DiagnosticModeTimeoutHours = 3;
         private readonly IOptionsMonitor<ScriptApplicationHostOptions> _scriptOptions;
+        private readonly IEnvironment _environment;
         private IDisposable _debugModeEvent;
         private IDisposable _diagnosticModeEvent;
         private bool _disposed;
 
-        public DebugStateProvider(IOptionsMonitor<ScriptApplicationHostOptions> scriptOptions, IScriptEventManager eventManager)
+        public DebugStateProvider(IEnvironment environment, IOptionsMonitor<ScriptApplicationHostOptions> scriptOptions, IScriptEventManager eventManager)
         {
+            _environment = environment;
             _debugModeEvent = eventManager.OfType<DebugNotification>()
                 .Subscribe(evt => LastDebugNotify = evt.NotificationTime);
             _diagnosticModeEvent = eventManager.OfType<DiagnosticNotification>()
@@ -41,8 +43,11 @@ public DebugStateProvider(IOptionsMonitor<ScriptApplicationHostOptions> scriptOp
 
         private void InitializeLastNotificationTimes()
         {
-            LastDebugNotify = GetLastWriteTime(ScriptConstants.DebugSentinelFileName);
-            LastDiagnosticNotify = GetLastWriteTime(ScriptConstants.DiagnosticSentinelFileName);
+            Utility.ExecuteAfterColdStartDelay(_environment, () =>
+            {
+                LastDebugNotify = GetLastWriteTime(ScriptConstants.DebugSentinelFileName);
+                LastDiagnosticNotify = GetLastWriteTime(ScriptConstants.DiagnosticSentinelFileName);
+            });
         }
 
         private DateTime GetLastWriteTime(string fileName)
diff --git a/src/WebJobs.Script/ScriptHostBuilderExtensions.cs b/src/WebJobs.Script/ScriptHostBuilderExtensions.cs
@@ -292,10 +292,6 @@ public static IHostBuilder AddScriptHostCore(this IHostBuilder builder, ScriptAp
 
                 services.AddSingleton<IFileLoggingStatusManager, FileLoggingStatusManager>();
 
-                services.AddSingleton<IWorkerProfileManager, WorkerProfileManager>();
-
-                services.AddSingleton<IWorkerProfileConditionProvider, WorkerProfileConditionProvider>();
-
                 if (!applicationHostOptions.HasParentScope)
                 {
                     AddCommonServices(services);
@@ -339,8 +335,6 @@ public static void AddCommonServices(IServiceCollection services)
             services.TryAddSingleton<IWorkerConsoleLogSource, WorkerConsoleLogSource>();
             services.AddSingleton<IWorkerProcessFactory, DefaultWorkerProcessFactory>();
             services.AddSingleton<IRpcWorkerProcessFactory, RpcWorkerProcessFactory>();
-            services.AddSingleton<IWorkerProfileManager, WorkerProfileManager>();
-            services.AddSingleton<IWorkerProfileConditionProvider, WorkerProfileConditionProvider>();
             services.TryAddSingleton<IWebHostRpcWorkerChannelManager, WebHostRpcWorkerChannelManager>();
             services.TryAddSingleton<IDebugManager, DebugManager>();
             services.TryAddSingleton<IDebugStateProvider, DebugStateProvider>();
diff --git a/src/WebJobs.Script/Workers/Profiles/EnvironmentCondition.cs b/src/WebJobs.Script/Workers/Profiles/EnvironmentCondition.cs
@@ -51,7 +51,7 @@ public bool Evaluate()
                 return false;
             }
 
-            _logger.LogDebug($"Evaluating EnvironmentCondition with value '{value}' and expression '{Expression}'");
+            _logger.LogDebug($"Evaluating EnvironmentCondition with name: '{Name}', value: '{value}' and expression: '{Expression}'");
 
             return _regex.IsMatch(value);
         }
diff --git a/src/WebJobs.Script/Workers/Profiles/HostPropertyCondition.cs b/src/WebJobs.Script/Workers/Profiles/HostPropertyCondition.cs
@@ -68,7 +68,7 @@ public bool Evaluate()
                 return false;
             }
 
-            _logger.LogDebug($"Evaluating HostPropertyCondition with value: {value} and expression {Expression}");
+            _logger.LogDebug($"Evaluating HostPropertyCondition with name: {Name}, value: {value} and expression {Expression}");
 
             return _regex.IsMatch(value);
         }
diff --git a/src/WebJobs.Script/Workers/Profiles/WorkerProfileConditionProvider.cs b/src/WebJobs.Script/Workers/Profiles/WorkerProfileConditionProvider.cs
@@ -9,10 +9,10 @@ namespace Microsoft.Azure.WebJobs.Script.Workers
 {
     internal sealed class WorkerProfileConditionProvider : IWorkerProfileConditionProvider
     {
-        private readonly ILogger<WorkerProfileConditionProvider> _logger;
+        private readonly ILogger _logger;
         private readonly IEnvironment _environment;
 
-        public WorkerProfileConditionProvider(ILogger<WorkerProfileConditionProvider> logger, IEnvironment environment)
+        public WorkerProfileConditionProvider(ILogger logger, IEnvironment environment)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
diff --git a/src/WebJobs.Script/Workers/Profiles/WorkerProfileManager.cs b/src/WebJobs.Script/Workers/Profiles/WorkerProfileManager.cs
@@ -19,7 +19,7 @@ internal class WorkerProfileManager : IWorkerProfileManager
         private Dictionary<string, List<WorkerDescriptionProfile>> _profiles;
         private string _activeProfile;
 
-        public WorkerProfileManager(ILogger<WorkerProfileManager> logger, IEnumerable<IWorkerProfileConditionProvider> conditionProviders)
+        public WorkerProfileManager(ILogger logger, IEnumerable<IWorkerProfileConditionProvider> conditionProviders)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _conditionProviders = conditionProviders ?? throw new ArgumentNullException(nameof(conditionProviders));
diff --git a/src/WebJobs.Script/Workers/Rpc/Configuration/LanguageWorkerOptionsSetup.cs b/src/WebJobs.Script/Workers/Rpc/Configuration/LanguageWorkerOptionsSetup.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Azure.WebJobs.Script.Workers.Rpc
 {
     internal class LanguageWorkerOptionsSetup : IConfigureOptions<LanguageWorkerOptions>
     {
-        private readonly IWorkerProfileManager _profileConditionManager;
         private readonly IConfiguration _configuration;
         private readonly ILogger _logger;
         private readonly IEnvironment _environment;
@@ -21,15 +20,13 @@ internal class LanguageWorkerOptionsSetup : IConfigureOptions<LanguageWorkerOpti
         public LanguageWorkerOptionsSetup(IConfiguration configuration,
                                           ILoggerFactory loggerFactory,
                                           IEnvironment environment,
-                                          IWorkerProfileManager profileConditionManager,
                                           IMetricsLogger metricsLogger)
         {
             if (loggerFactory is null)
             {
                 throw new ArgumentNullException(nameof(loggerFactory));
             }
 
-            _profileConditionManager = profileConditionManager ?? throw new System.ArgumentNullException(nameof(profileConditionManager));
             _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
             _metricsLogger = metricsLogger ?? throw new ArgumentNullException(nameof(metricsLogger));
@@ -47,9 +44,7 @@ public void Configure(LanguageWorkerOptions options)
                 return;
             }
 
-            var configFactory = new RpcWorkerConfigFactory(_configuration, _logger, SystemRuntimeInformation.Instance,
-                _profileConditionManager, _environment, _metricsLogger);
-
+            var configFactory = new RpcWorkerConfigFactory(_configuration, _logger, SystemRuntimeInformation.Instance, _environment, _metricsLogger);
             options.WorkerConfigs = configFactory.GetConfigs();
         }
     }
diff --git a/src/WebJobs.Script/Workers/Rpc/Configuration/RpcWorkerConfigFactory.cs b/src/WebJobs.Script/Workers/Rpc/Configuration/RpcWorkerConfigFactory.cs
@@ -31,14 +31,12 @@ internal class RpcWorkerConfigFactory
         public RpcWorkerConfigFactory(IConfiguration config,
                                       ILogger logger,
                                       ISystemRuntimeInformation systemRuntimeInfo,
-                                      IWorkerProfileManager profileManager,
                                       IEnvironment environment,
                                       IMetricsLogger metricsLogger)
         {
             _config = config ?? throw new ArgumentNullException(nameof(config));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _systemRuntimeInformation = systemRuntimeInfo ?? throw new ArgumentNullException(nameof(systemRuntimeInfo));
-            _profileManager = profileManager ?? throw new ArgumentNullException(nameof(profileManager));
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
             _metricsLogger = metricsLogger;
             _workerRuntime = _environment.GetEnvironmentVariable(RpcWorkerConstants.FunctionWorkerRuntimeSettingName);
@@ -49,6 +47,11 @@ public RpcWorkerConfigFactory(IConfiguration config,
             {
                 WorkersDirPath = workersDirectorySection.Value;
             }
+            var conditionProviders = new List<IWorkerProfileConditionProvider>
+            {
+                new WorkerProfileConditionProvider(_logger, _environment)
+            };
+            _profileManager = new WorkerProfileManager(_logger, conditionProviders);
         }
 
         public string WorkersDirPath { get; }
diff --git a/src/WebJobs.Script/Workers/Rpc/WebHostRpcWorkerChannelManager.cs b/src/WebJobs.Script/Workers/Rpc/WebHostRpcWorkerChannelManager.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.Eventing;
+using Microsoft.Azure.WebJobs.Script.Workers.Profiles;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -39,8 +40,7 @@ public WebHostRpcWorkerChannelManager(IScriptEventManager eventManager,
                                               IRpcWorkerChannelFactory rpcWorkerChannelFactory,
                                               IOptionsMonitor<ScriptApplicationHostOptions> applicationHostOptions,
                                               IMetricsLogger metricsLogger, IOptionsMonitor<LanguageWorkerOptions> languageWorkerOptions,
-                                              IConfiguration config,
-                                              IWorkerProfileManager profileManager)
+                                              IConfiguration config)
         {
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
             _eventManager = eventManager;
@@ -51,8 +51,11 @@ public WebHostRpcWorkerChannelManager(IScriptEventManager eventManager,
             _applicationHostOptions = applicationHostOptions;
             _lanuageworkerOptions = languageWorkerOptions;
             _config = config ?? throw new ArgumentNullException(nameof(config));
-            _profileManager = profileManager ?? throw new ArgumentNullException(nameof(profileManager));
-
+            var conditionProviders = new List<IWorkerProfileConditionProvider>
+            {
+                new WorkerProfileConditionProvider(_logger, _environment)
+            };
+            _profileManager = new WorkerProfileManager(_logger, conditionProviders);
             _shutdownStandbyWorkerChannels = ScheduleShutdownStandbyChannels;
             _shutdownStandbyWorkerChannels = _shutdownStandbyWorkerChannels.Debounce(milliseconds: 5000);
         }
diff --git a/test/WebJobs.Script.Tests/Configuration/LanguageWorkerOptionsSetupTests.cs b/test/WebJobs.Script.Tests/Configuration/LanguageWorkerOptionsSetupTests.cs
@@ -24,15 +24,12 @@ public void LanguageWorkerOptions_Expected_ListOfConfigs(string workerRuntime)
             var configurationBuilder = new ConfigurationBuilder()
                 .Add(new ScriptEnvironmentVariablesConfigurationSource());
 
-            var profileConditionProvider = new WorkerProfileConditionProvider(new TestLogger<WorkerProfileConditionProvider>(), testEnvironment);
-            var profileConditionManager = new WorkerProfileManager(new TestLogger<WorkerProfileManager>(), new[] { profileConditionProvider });
-
             var configuration = configurationBuilder.Build();
             if (!string.IsNullOrEmpty(workerRuntime))
             {
                 testEnvironment.SetEnvironmentVariable(RpcWorkerConstants.FunctionWorkerRuntimeSettingName, workerRuntime);
             }
-            LanguageWorkerOptionsSetup setup = new LanguageWorkerOptionsSetup(configuration, NullLoggerFactory.Instance, testEnvironment, profileConditionManager, new TestMetricsLogger());
+            LanguageWorkerOptionsSetup setup = new LanguageWorkerOptionsSetup(configuration, NullLoggerFactory.Instance, testEnvironment, new TestMetricsLogger());
             LanguageWorkerOptions options = new LanguageWorkerOptions();
             setup.Configure(options);
             if (string.IsNullOrEmpty(workerRuntime))
diff --git a/test/WebJobs.Script.Tests/Diagnostics/DebugStateProviderTests.cs b/test/WebJobs.Script.Tests/Diagnostics/DebugStateProviderTests.cs
@@ -17,6 +17,8 @@ public class DebugStateProviderTests
 
         public DebugStateProviderTests()
         {
+            var environment = new TestEnvironment();
+
             _options = new ScriptApplicationHostOptions
             {
                 LogPath = Path.Combine(Directory.GetCurrentDirectory(), "DebugPath1")
@@ -27,7 +29,7 @@ public DebugStateProviderTests()
             var changeTokens = new[] { _tokenSource };
             var optionsMonitor = new OptionsMonitor<ScriptApplicationHostOptions>(factory, changeTokens, factory);
 
-            _provider = new DebugStateProvider(optionsMonitor, new ScriptEventManager());
+            _provider = new DebugStateProvider(environment, optionsMonitor, new ScriptEventManager());
         }
 
         [Fact]
diff --git a/test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs b/test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs
diff --git a/test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigTests.cs b/test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigTests.cs
diff --git a/test/WebJobs.Script.Tests/Workers/Rpc/WebHostRpcWorkerChannelManagerTests.cs b/test/WebJobs.Script.Tests/Workers/Rpc/WebHostRpcWorkerChannelManagerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public bool Evaluate()`
`51`	`51`	`return false;`
`52`	`52`	`}`
`53`	`53`
`54`		`- _logger.LogDebug($"Evaluating EnvironmentCondition with value '{value}' and expression '{Expression}'");`
	`54`	`+ _logger.LogDebug($"Evaluating EnvironmentCondition with name: '{Name}', value: '{value}' and expression: '{Expression}'");`
`55`	`55`
`56`	`56`	`return _regex.IsMatch(value);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public bool Evaluate()`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- _logger.LogDebug($"Evaluating HostPropertyCondition with value: {value} and expression {Expression}");`
	`71`	`+ _logger.LogDebug($"Evaluating HostPropertyCondition with name: {Name}, value: {value} and expression {Expression}");`
`72`	`72`
`73`	`73`	`return _regex.IsMatch(value);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ namespace Microsoft.Azure.WebJobs.Script.Workers`
`9`	`9`	`{`
`10`	`10`	`internal sealed class WorkerProfileConditionProvider : IWorkerProfileConditionProvider`
`11`	`11`	`{`
`12`		`- private readonly ILogger<WorkerProfileConditionProvider> _logger;`
	`12`	`+ private readonly ILogger _logger;`
`13`	`13`	`private readonly IEnvironment _environment;`
`14`	`14`
`15`		`- public WorkerProfileConditionProvider(ILogger<WorkerProfileConditionProvider> logger, IEnvironment environment)`
	`15`	`+ public WorkerProfileConditionProvider(ILogger logger, IEnvironment environment)`
`16`	`16`	`{`
`17`	`17`	`_logger = logger ?? throw new ArgumentNullException(nameof(logger));`
`18`	`18`	`_environment = environment ?? throw new ArgumentNullException(nameof(environment));`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal class WorkerProfileManager : IWorkerProfileManager`
`19`	`19`	`private Dictionary<string, List<WorkerDescriptionProfile>> _profiles;`
`20`	`20`	`private string _activeProfile;`
`21`	`21`
`22`		`- public WorkerProfileManager(ILogger<WorkerProfileManager> logger, IEnumerable<IWorkerProfileConditionProvider> conditionProviders)`
	`22`	`+ public WorkerProfileManager(ILogger logger, IEnumerable<IWorkerProfileConditionProvider> conditionProviders)`
`23`	`23`	`{`
`24`	`24`	`_logger = logger ?? throw new ArgumentNullException(nameof(logger));`
`25`	`25`	`_conditionProviders = conditionProviders ?? throw new ArgumentNullException(nameof(conditionProviders));`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ namespace Microsoft.Azure.WebJobs.Script.Workers.Rpc`
`12`	`12`	`{`
`13`	`13`	`internal class LanguageWorkerOptionsSetup : IConfigureOptions<LanguageWorkerOptions>`
`14`	`14`	`{`
`15`		`- private readonly IWorkerProfileManager _profileConditionManager;`
`16`	`15`	`private readonly IConfiguration _configuration;`
`17`	`16`	`private readonly ILogger _logger;`
`18`	`17`	`private readonly IEnvironment _environment;`
`@@ -21,15 +20,13 @@ internal class LanguageWorkerOptionsSetup : IConfigureOptions<LanguageWorkerOpti`
`21`	`20`	`public LanguageWorkerOptionsSetup(IConfiguration configuration,`
`22`	`21`	`ILoggerFactory loggerFactory,`
`23`	`22`	`IEnvironment environment,`
`24`		`- IWorkerProfileManager profileConditionManager,`
`25`	`23`	`IMetricsLogger metricsLogger)`
`26`	`24`	`{`
`27`	`25`	`if (loggerFactory is null)`
`28`	`26`	`{`
`29`	`27`	`throw new ArgumentNullException(nameof(loggerFactory));`
`30`	`28`	`}`
`31`	`29`
`32`		`- _profileConditionManager = profileConditionManager ?? throw new System.ArgumentNullException(nameof(profileConditionManager));`
`33`	`30`	`_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));`
`34`	`31`	`_environment = environment ?? throw new ArgumentNullException(nameof(environment));`
`35`	`32`	`_metricsLogger = metricsLogger ?? throw new ArgumentNullException(nameof(metricsLogger));`
`@@ -47,9 +44,7 @@ public void Configure(LanguageWorkerOptions options)`
`47`	`44`	`return;`
`48`	`45`	`}`
`49`	`46`
`50`		`- var configFactory = new RpcWorkerConfigFactory(_configuration, _logger, SystemRuntimeInformation.Instance,`
`51`		`- _profileConditionManager, _environment, _metricsLogger);`
`52`		`-`
	`47`	`+ var configFactory = new RpcWorkerConfigFactory(_configuration, _logger, SystemRuntimeInformation.Instance, _environment, _metricsLogger);`
`53`	`48`	`options.WorkerConfigs = configFactory.GetConfigs();`
`54`	`49`	`}`
`55`	`50`	`}`