Update new test method

Author: jviau

src/WebJobs.Script/Diagnostics/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs

@@ -68,18 +68,19 @@ private static IOpenTelemetryBuilder ConfigureMetrics(this IOpenTelemetryBuilder
             return builder.WithMetrics(builder =>
             {
                 builder.AddAspNetCoreInstrumentation()
-                .AddRuntimeInstrumentation()
-                .AddProcessInstrumentation()
-                .AddMeter(HostMetrics.FaasMeterName)
-                .AddView(HostMetrics.FaasInvokeDuration, new ExplicitBucketHistogramConfiguration
-                {
-                    Boundaries = new double[] { 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10 }
-                });
+                    .AddRuntimeInstrumentation()
+                    .AddProcessInstrumentation()
+                    .AddMeter(HostMetrics.FaasMeterName)
+                    .AddView(HostMetrics.FaasInvokeDuration, new ExplicitBucketHistogramConfiguration
+                    {
+                        Boundaries = new double[] { 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10 }
+                    });
 
                 if (enableOtlp)
                 {
                     builder.AddOtlpExporter();
                 }
+
                 if (enableAzureMonitor)
                 {
                     builder.AddAzureMonitorMetricExporter(opt => ConfigureAzureMonitorOptions(opt, azMonConnectionString, credential));

test/WebJobs.Script.Tests/ScriptStartupTypeDiscovererTests.cs

@@ -492,57 +492,23 @@ public async Task GetExtensionsStartupTypes_BundlesNotConfiguredBindingsConfigur
         [Fact]
         public async Task GetExtensionsStartupTypes_NoBindings_In_ExtensionJson()
         {
-            TestMetricsLogger testMetricsLogger = new TestMetricsLogger();
-
-            using var directory = new TempDirectory();
-            var binPath = Path.Combine(directory.Path, "bin");
-            Directory.CreateDirectory(binPath);
-
-            void CopyToBin(string path)
+            ExtensionInstall storage1 = new("AzureStorageBlobs", typeof(AzureStorageWebJobsStartup));
+            ExtensionInstall storage2 = new("Storage", typeof(AzureStorageWebJobsStartup))
             {
-                File.Copy(path, Path.Combine(binPath, Path.GetFileName(path)));
-            }
+                HintPath = "Microsoft.Azure.WebJobs.Extensions.Storage.dll"
+            };
 
-            CopyToBin(typeof(AzureStorageWebJobsStartup).Assembly.Location);
-
-            string extensionJson = $$"""
-                                      {
-                                        "extensions": [
-                                          {
-                                            "name": "Storage",
-                                            "typeName": "{{typeof(AzureStorageWebJobsStartup).AssemblyQualifiedName}}",
-                                            "hintPath": "Microsoft.Azure.WebJobs.Extensions.Storage.dll"  
-                                          },
-                                          {
-                                            "Name": "AzureStorageBlobs",
-                                            "TypeName": "{{typeof(AzureStorageWebJobsStartup).AssemblyQualifiedName}}"
-                                          }
-                                        ]
-                                      }
-                                      """;
-
-            File.WriteAllText(Path.Combine(binPath, "extensions.json"), extensionJson);
-
-            TestLoggerProvider testLoggerProvider = new TestLoggerProvider();
-            LoggerFactory factory = new LoggerFactory();
-            factory.AddProvider(testLoggerProvider);
-            var testLogger = factory.CreateLogger<ScriptStartupTypeLocator>();
-
-            var mockExtensionBundleManager = new Mock<IExtensionBundleManager>();
-            mockExtensionBundleManager.Setup(e => e.IsExtensionBundleConfigured()).Returns(true);
-            mockExtensionBundleManager.Setup(e => e.GetExtensionBundleDetails()).Returns(Task.FromResult(new ExtensionBundleDetails() { Id = "bundleID", Version = "1.0.0" }));
-            mockExtensionBundleManager.Setup(e => e.GetExtensionBundleBinPathAsync()).Returns(Task.FromResult(binPath));
-
-            var languageWorkerOptions = new TestOptionsMonitor<LanguageWorkerOptions>(new LanguageWorkerOptions());
-            var mockFunctionMetadataManager = GetTestFunctionMetadataManager(languageWorkerOptions);
-            OptionsWrapper<ExtensionRequirementOptions> optionsWrapper = new(new ExtensionRequirementOptions());
-            var discoverer = new ScriptStartupTypeLocator(directory.Path, testLogger, mockExtensionBundleManager.Object, mockFunctionMetadataManager, testMetricsLogger, optionsWrapper);
+            string binPath = InstallExtensions(storage1, storage2);
+            _bundleManager.Setup(e => e.IsExtensionBundleConfigured()).Returns(true);
+            _bundleManager.Setup(e => e.GetExtensionBundleDetails()).ReturnsAsync(new ExtensionBundleDetails() { Id = "bundleID", Version = "1.0.0" });
+            _bundleManager.Setup(e => e.GetExtensionBundleBinPathAsync()).ReturnsAsync(binPath);
+            ScriptStartupTypeLocator discoverer = CreateSystemUnderTest();
 
             // Act
             var types = await discoverer.GetExtensionsStartupTypesAsync();
 
             // Assert
-            AreExpectedMetricsGenerated(testMetricsLogger);
+            AreExpectedMetricsGenerated();
             Assert.Equal(types.Count(), 2);
             Assert.Equal(typeof(AzureStorageWebJobsStartup).FullName, types.FirstOrDefault().FullName);
         }
@@ -703,6 +669,8 @@ private bool AreExpectedMetricsGenerated()
 
         private class ExtensionInstall(string name, Type startupType, params string[] bindings)
         {
+            public string HintPath { get; init; }
+
             public static ExtensionInstall Storage(bool includeBinding = false)
             {
                 string[] bindings = includeBinding ? ["blob"] : [];
@@ -727,7 +695,12 @@ public static ExtensionInstall Http()
 
             public ExtensionReference GetReference()
             {
-                ExtensionReference reference = new() { Name = name, TypeName = startupType.AssemblyQualifiedName };
+                ExtensionReference reference = new()
+                {
+                    Name = name,
+                    TypeName = startupType.AssemblyQualifiedName,
+                    HintPath = HintPath,
+                };
                 foreach (string binding in bindings ?? Enumerable.Empty<string>())
                 {
                     reference.Bindings.Add(binding);