Reset HostNameProvider on specialization

Author: mathewc

src/WebJobs.Script.WebHost/HostNameProvider.cs

@@ -63,7 +63,6 @@ public virtual void Synchronize(HttpRequest request)
             }
         }
 
-        // for testing only
         internal void Reset()
         {
             _hostName = null;

src/WebJobs.Script.WebHost/Standby/StandbyManager.cs

@@ -29,6 +29,7 @@ public class StandbyManager : IStandbyManager
         private readonly ILanguageWorkerChannelManager _languageWorkerChannelManager;
         private readonly IConfigurationRoot _configuration;
         private readonly ILogger _logger;
+        private readonly HostNameProvider _hostNameProvider;
         private readonly TimeSpan _specializationTimerInterval = TimeSpan.FromMilliseconds(500);
 
         private Timer _specializationTimer;
@@ -37,7 +38,7 @@ public class StandbyManager : IStandbyManager
         private static SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
 
         public StandbyManager(IScriptHostManager scriptHostManager, ILanguageWorkerChannelManager languageWorkerChannelManager, IConfiguration configuration, IScriptWebHostEnvironment webHostEnvironment,
-            IEnvironment environment, IOptionsMonitor<ScriptApplicationHostOptions> options, ILogger<StandbyManager> logger)
+            IEnvironment environment, IOptionsMonitor<ScriptApplicationHostOptions> options, ILogger<StandbyManager> logger, HostNameProvider hostNameProvider)
         {
             _scriptHostManager = scriptHostManager ?? throw new ArgumentNullException(nameof(scriptHostManager));
             _options = options ?? throw new ArgumentNullException(nameof(options));
@@ -47,6 +48,7 @@ public StandbyManager(IScriptHostManager scriptHostManager, ILanguageWorkerChann
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
             _configuration = configuration as IConfigurationRoot ?? throw new ArgumentNullException(nameof(configuration));
             _languageWorkerChannelManager = languageWorkerChannelManager ?? throw new ArgumentNullException(nameof(languageWorkerChannelManager));
+            _hostNameProvider = hostNameProvider ?? throw new ArgumentNullException(nameof(hostNameProvider));
         }
 
         public static IChangeToken ChangeToken => _standbyChangeToken;
@@ -68,6 +70,8 @@ public async Task SpecializeHostCoreAsync()
             // Trigger a configuration reload to pick up all current settings
             _configuration?.Reload();
 
+            _hostNameProvider.Reset();
+
             await _languageWorkerChannelManager.SpecializeAsync();
             NotifyChange();
             await _scriptHostManager.RestartHostAsync();

test/WebJobs.Script.Tests/StandbyManagerTests.cs

@@ -8,8 +8,10 @@
 using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.Azure.WebJobs.Script.WebHost;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using Microsoft.WebJobs.Script.Tests;
 using Moq;
 using Xunit;
 
@@ -25,6 +27,8 @@ public class StandbyManagerTests
         private TestEnvironment _testEnvironment;
         private string _testSettingName = "TestSetting";
         private string _testSettingValue = "TestSettingValue";
+        private ILoggerProvider _testLoggerProvider;
+        private ILoggerFactory _testLoggerFactory;
 
         public StandbyManagerTests()
         {
@@ -35,18 +39,41 @@ public StandbyManagerTests()
             _mockWebHostEnvironment = new Mock<IScriptWebHostEnvironment>();
             _mockLanguageWorkerChannelManager = new Mock<ILanguageWorkerChannelManager>();
             _testEnvironment = new TestEnvironment();
+
+            _testLoggerProvider = new TestLoggerProvider();
+            _testLoggerFactory = new LoggerFactory();
+            _testLoggerFactory.AddProvider(_testLoggerProvider);
         }
 
         [Fact]
         public async Task Specialize_ResetsConfiguration()
         {
-            var manager = new StandbyManager(_mockHostManager.Object, _mockLanguageWorkerChannelManager.Object, _mockConfiguration.Object, _mockWebHostEnvironment.Object, _testEnvironment, _mockOptionsMonitor.Object, NullLogger<StandbyManager>.Instance);
+            var hostNameProvider = new HostNameProvider(_testEnvironment, _testLoggerFactory.CreateLogger<HostNameProvider>());
+            var manager = new StandbyManager(_mockHostManager.Object, _mockLanguageWorkerChannelManager.Object, _mockConfiguration.Object, _mockWebHostEnvironment.Object, _testEnvironment, _mockOptionsMonitor.Object, NullLogger<StandbyManager>.Instance, hostNameProvider);
 
             await manager.SpecializeHostAsync();
 
             _mockConfiguration.Verify(c => c.Reload());
         }
 
+        [Fact]
+        public async Task Specialize_ResetsHostNameProvider()
+        {
+            _testEnvironment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHostName, "placeholder.azurewebsites.net");
+
+            var hostNameProvider = new HostNameProvider(_testEnvironment, _testLoggerFactory.CreateLogger<HostNameProvider>());
+            var manager = new StandbyManager(_mockHostManager.Object, _mockLanguageWorkerChannelManager.Object, _mockConfiguration.Object, _mockWebHostEnvironment.Object, _testEnvironment, _mockOptionsMonitor.Object, NullLogger<StandbyManager>.Instance, hostNameProvider);
+
+            Assert.Equal("placeholder.azurewebsites.net", hostNameProvider.Value);
+
+            await manager.SpecializeHostAsync();
+
+            _testEnvironment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHostName, "testapp.azurewebsites.net");
+            Assert.Equal("testapp.azurewebsites.net", hostNameProvider.Value);
+
+            _mockConfiguration.Verify(c => c.Reload());
+        }
+
         [Fact]
         public async Task Specialize_ReloadsEnvironmentVariables()
         {
@@ -57,7 +84,9 @@ public async Task Specialize_ReloadsEnvironmentVariables()
                 await Task.Yield();
             });
             _testEnvironment.SetEnvironmentVariable(LanguageWorkerConstants.FunctionWorkerRuntimeSettingName, LanguageWorkerConstants.JavaLanguageWorkerName);
-            var manager = new StandbyManager(_mockHostManager.Object, _mockLanguageWorkerChannelManager.Object, _mockConfiguration.Object, _mockWebHostEnvironment.Object, _testEnvironment, _mockOptionsMonitor.Object, NullLogger<StandbyManager>.Instance);
+
+            var hostNameProvider = new HostNameProvider(_testEnvironment, _testLoggerFactory.CreateLogger<HostNameProvider>());
+            var manager = new StandbyManager(_mockHostManager.Object, _mockLanguageWorkerChannelManager.Object, _mockConfiguration.Object, _mockWebHostEnvironment.Object, _testEnvironment, _mockOptionsMonitor.Object, NullLogger<StandbyManager>.Instance, hostNameProvider);
             await manager.SpecializeHostAsync();
             Assert.Equal(_testSettingValue, _testEnvironment.GetEnvironmentVariable(_testSettingName));
         }

test/WebJobs.Script.Tests/WebJobsScriptHostServiceTests.cs

@@ -216,7 +216,11 @@ public void SpecializeHost()
             var mockEnvironment = new Mock<IEnvironment>();
             Mock<ILanguageWorkerChannelManager> mockLanguageWorkerChannelManager = new Mock<ILanguageWorkerChannelManager>();
             ILogger<StandbyManager> testLogger = new Logger<StandbyManager>(_loggerFactory);
-            var manager = new StandbyManager(_hostService, mockLanguageWorkerChannelManager.Object, mockConfiguration.Object, mockScriptWebHostEnvironment.Object, mockEnvironment.Object, _monitor, testLogger);
+            var loggerProvider = new TestLoggerProvider();
+            var loggerFactory = new LoggerFactory();
+            loggerFactory.AddProvider(loggerProvider);
+            var hostNameProvider = new HostNameProvider(mockEnvironment.Object, loggerFactory.CreateLogger<HostNameProvider>());
+            var manager = new StandbyManager(_hostService, mockLanguageWorkerChannelManager.Object, mockConfiguration.Object, mockScriptWebHostEnvironment.Object, mockEnvironment.Object, _monitor, testLogger, hostNameProvider);
             manager.SpecializeHostAsync().Wait();
         }
     }