Updating FunctionsNetHost (dotnet isolated worker) to 1.0.9 (#10262)

* Updating FunctionsNetHost (dotnet isolated worker) to 1.0.9. Updated a test to reflect this change.

* Updated release notes

* Adjusting tests to reflect the dotnet isolated worker config changes (loads only in placeholder mode)

* Update release notes with the right fix

* Fixing HostLogs assertion

* Revert "Fixing HostLogs assertion"

This reverts commit 1d8ee86.

* nit fixes from PR feedback.

* Fix ValidateLogs test

* nit cleanup (removed unused var, linebreak)

Author: kshyju

release_notes.md

@@ -17,5 +17,6 @@
 - Ordered invocations are now the default (#10201)
 - Skip worker description if none of the profile conditions are met (#9932)
 - Fixed incorrect function count in the log message.(#10220)
+- Updated dotnet-isolated worker to [1.0.9](https://github.com/Azure/azure-functions-dotnet-worker/pull/2552) (#10262)
 - Fix race condition on startup with extension RPC endpoints not being available. (#10255)
-- Adding a timeout when retrieving function metadata from metadata providers (#10219)
+- Adding a timeout when retrieving function metadata from metadata providers (#10219)

src/WebJobs.Script/WebJobs.Script.csproj

@@ -49,7 +49,7 @@
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.22.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" NoWarn="NU1701" />
-    <PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" Version="1.0.8" />
+    <PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" Version="1.0.9" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.41-11331" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.0-beta.2-11957" />
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.0" />

test/WebJobs.Script.Tests.Integration/ApplicationInsights/ApplicationInsightsEndToEndTestsBase.cs

@@ -271,7 +271,7 @@ await TestHelpers.Await(() =>
             // in class LanguageWorkerOptionsSetup.cs -> Configure()
             // which is giving extra log lines for node worker
             traces = traces.Where(t =>
-                !t.Message.Contains("Skipping WorkerConfig for language")
+                !t.Message.Contains("Skipping WorkerConfig for language") && !t.Message.Contains("Skipping WorkerConfig for stack")
             ).ToArray();
 
             int expectedCount = 16;

test/WebJobs.Script.Tests/Configuration/LanguageWorkerOptionsSetupTests.cs

@@ -31,6 +31,26 @@ public void LanguageWorkerOptions_Expected_ListOfConfigs(string workerRuntime)
             {
                 testEnvironment.SetEnvironmentVariable(RpcWorkerConstants.FunctionWorkerRuntimeSettingName, workerRuntime);
             }
+            else
+            {
+                // The dotnet-isolated worker only runs in placeholder mode. Setting the placeholder environment to 1 for the test.
+                testEnvironment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "1");
+            }
+
+            testProfileManager.Setup(pm => pm.LoadWorkerDescriptionFromProfiles(It.IsAny<RpcWorkerDescription>(), out It.Ref<RpcWorkerDescription>.IsAny))
+                .Callback((RpcWorkerDescription defaultDescription, out RpcWorkerDescription outDescription) =>
+                {
+                    // dotnet-isolated worker config does not have "DefaultExecutablePath" in the parent level.So, we should set it from a profile.
+                    if (defaultDescription.Language == "dotnet-isolated")
+                    {
+                        outDescription = new RpcWorkerDescription() { DefaultExecutablePath = "testPath", Language = "dotnet-isolated" };
+                    }
+                    else
+                    {
+                        // for other workers, we should return the default description as they have the "DefaultExecutablePath" in the parent level.
+                        outDescription = defaultDescription;
+                    }
+                });
 
             LanguageWorkerOptionsSetup setup = new LanguageWorkerOptionsSetup(configuration, NullLoggerFactory.Instance, testEnvironment, testMetricLogger, testProfileManager.Object);
             LanguageWorkerOptions options = new LanguageWorkerOptions();

test/WebJobs.Script.Tests/ScriptHostTests.cs

@@ -1600,7 +1600,6 @@ public async Task Initialize_LogsWarningForExplicitlySetHostId()
 
         [Theory]
         [InlineData("python", "main.py", "python", "python")]
-        [InlineData("dotnet-isolated", "app.dll", "dotnet-isolated", "dotnet-isolated")]
         [InlineData("dotnet", "app.dll", "dotnet", DotNetScriptTypes.DotNetAssembly)]
         [InlineData(null, "app.dll", "dotnet", DotNetScriptTypes.DotNetAssembly)] // if FUNCTIONS_WORKER_RUNTIME is missing, assume dotnet
         public async Task Initialize_MissingWorkerRuntime_SetsCorrectRuntimeFromFunctionMetadata(string functionsWorkerRuntime, string scriptFile, string expectedMetricLanguage, string expectedMetadataLanguage)

test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs

@@ -153,6 +153,7 @@ public void DefaultWorkerConfigs_Overrides_DefaultWorkerRuntimeVersion_AppSettin
             var config = configBuilder.Build();
             var scriptSettingsManager = new ScriptSettingsManager(config);
             var testLogger = new TestLogger("test");
+            _testEnvironment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "1");
             using (var variables = new TestScopedSettings(scriptSettingsManager, testEnvVariables))
             {
                 var configFactory = new RpcWorkerConfigFactory(config, testLogger, _testSysRuntimeInfo, _testEnvironment, new TestMetricsLogger(), _testWorkerProfileManager);