taking into account logic app configuration for bundles

Author: soninaren

src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs

@@ -103,18 +103,20 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
                 }
             }
 
-            bool isDotnetApp = isPrecompiledFunctionApp || IsDotnetIsolatedApp(workerConfigs);
+            bool isDotnetIsolatedApp = IsDotnetIsolatedApp(workerConfigs);
+            bool isDotnetApp = isPrecompiledFunctionApp || isDotnetIsolatedApp;
+            var isLogicApp = SystemEnvironment.Instance.IsLogicApp();
 
             if (SystemEnvironment.Instance.IsPlaceholderModeEnabled())
             {
                 // Do not move this.
                 // Calling this log statement in the placeholder mode to avoid jitting during specializtion
-                _logger.ScriptStartNotLoadingExtensionBundle("WARMUP_LOG_ONLY", bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle);
+                _logger.ScriptStartNotLoadingExtensionBundle("WARMUP_LOG_ONLY", bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle, isDotnetIsolatedApp, isLogicApp);
             }
 
             string baseProbingPath = null;
 
-            if (bundleConfigured && (!isDotnetApp || isLegacyExtensionBundle))
+            if (bundleConfigured && (!isDotnetApp || isLegacyExtensionBundle || isLogicApp))
             {
                 extensionsMetadataPath = await _extensionBundleManager.GetExtensionBundleBinPathAsync();
                 if (string.IsNullOrEmpty(extensionsMetadataPath))
@@ -130,9 +132,9 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
                 extensionsMetadataPath = Path.Combine(_rootScriptPath, "bin");
                 if (Utility.TryResolveExtensionsMetadataPath(_rootScriptPath, out string resolvedPath, out baseProbingPath))
                 {
-                      extensionsMetadataPath = resolvedPath;
+                    extensionsMetadataPath = resolvedPath;
                 }
-                _logger.ScriptStartNotLoadingExtensionBundle(extensionsMetadataPath, bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle);
+                _logger.ScriptStartNotLoadingExtensionBundle(extensionsMetadataPath, bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle, isDotnetIsolatedApp, isLogicApp);
             }
 
             baseProbingPath ??= extensionsMetadataPath;

src/WebJobs.Script/Diagnostics/Extensions/LoggerExtension.cs

@@ -161,10 +161,10 @@ internal static class LoggerExtension
                 new EventId(333, nameof(IncorrectAutorestGeneratedJsonFile)),
                 "autorest_generated.json file found is incorrect (https://aka.ms/stencil) | exception:\n{contents}");
 
-        private static readonly Action<ILogger, string, bool, bool, bool, Exception> _scriptStartUpNotLoadingExtensionBundle =
-            LoggerMessage.Define<string, bool, bool, bool>(LogLevel.Information,
+        private static readonly Action<ILogger, string, bool, bool, bool, bool, bool, Exception> _scriptStartUpNotLoadingExtensionBundle =
+            LoggerMessage.Define<string, bool, bool, bool, bool, bool>(LogLevel.Information,
                 new EventId(334, nameof(ScriptStartNotLoadingExtensionBundle)),
-                "Loading extensions from {path}. BundleConfigured: {bundleConfigured}, PrecompiledFunctionApp: {isPrecompiledFunctionApp}, LegacyBundle: {isLegacyExtensionBundle}");
+                "Loading extensions from {path}. BundleConfigured: {bundleConfigured}, PrecompiledFunctionApp: {isPrecompiledFunctionApp}, LegacyBundle: {isLegacyExtensionBundle}, DotnetIsolatedApp: {isDotnetIsolatedApp}, isLogicApp: {isLogicApp}");
 
         private static readonly Action<ILogger, string, Exception> _scriptStartupResettingLoadContextWithBasePath =
             LoggerMessage.Define<string>(LogLevel.Information,
@@ -208,9 +208,9 @@ public static void ScriptStartupResettingLoadContextWithBasePath(this ILogger lo
             _scriptStartupResettingLoadContextWithBasePath(logger, path, null);
         }
 
-        public static void ScriptStartNotLoadingExtensionBundle(this ILogger logger, string path, bool bundleConfigured, bool isPrecompiledFunctionApp, bool isLegacyExtensionBundle)
+        public static void ScriptStartNotLoadingExtensionBundle(this ILogger logger, string path, bool bundleConfigured, bool isPrecompiledFunctionApp, bool isLegacyExtensionBundle, bool isDotnetIsolatedApp, bool isLogicApp)
         {
-            _scriptStartUpNotLoadingExtensionBundle(logger, path, bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle, null);
+            _scriptStartUpNotLoadingExtensionBundle(logger, path, bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle, isDotnetIsolatedApp, isLogicApp, null);
         }
 
         public static void ScriptStartUpLoadingStartUpExtension(this ILogger logger, string startupExtensionName)

test/WebJobs.Script.Tests/ScriptStartupTypeDiscovererTests.cs

@@ -392,10 +392,20 @@ public async Task GetExtensionsStartupTypes_LegacyBundles_UsesExtensionBundleBin
             }
         }
 
-        [Fact]
-        public async Task GetExtensionsStartupTypes_DotnetIsolated_ExtensionBundleConfigured()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task GetExtensionsStartupTypes_DotnetIsolated_ExtensionBundleConfigured(bool isLogicApp)
         {
+            var vars = new Dictionary<string, string>();
+
+            if (isLogicApp)
+            {
+                vars.Add(EnvironmentSettingNames.AppKind, ScriptConstants.WorkFlowAppKind);
+            }
+
             using (var directory = GetTempDirectory())
+            using (var env = new TestScopedEnvironmentVariable(vars))
             {
                 var binPath = Path.Combine(directory.Path, "bin");
                 TestMetricsLogger testMetricsLogger = new TestMetricsLogger();
@@ -428,7 +438,15 @@ public async Task GetExtensionsStartupTypes_DotnetIsolated_ExtensionBundleConfig
                 //Assert
                 var traces = testLoggerProvider.GetAllLogMessages();
                 var expectedTrace = traces.FirstOrDefault(val => val.EventId.Name.Equals("ScriptStartNotLoadingExtensionBundle"));
-                Assert.NotNull(expectedTrace);
+
+                if (isLogicApp)
+                {
+                    Assert.Null(expectedTrace);
+                }
+                else
+                {
+                    Assert.NotNull(expectedTrace);
+                }
 
                 AreExpectedMetricsGenerated(testMetricsLogger);
                 Assert.Single(types);