adjust tests

open-telemetry · Sep 30, 2022 · f0f85e1 · f0f85e1
1 parent 5c5ae84
commit f0f85e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/....Exporter.Prometheus.HttpListener/PrometheusHttpListenerMeterProviderBuilderExtensions.cs b/....Exporter.Prometheus.HttpListener/PrometheusHttpListenerMeterProviderBuilderExtensions.cs
@@ -80,7 +80,7 @@ private static MeterProviderBuilder AddPrometheusHttpListener(
             MeterProviderBuilder builder,
             PrometheusHttpListenerOptions options)
         {
-            var exporter = new PrometheusExporter();
+            var exporter = new PrometheusExporter(new PrometheusExporterOptions { ScrapeResponseCacheDurationMilliseconds = 0 });
 
             var reader = new BaseExportingMetricReader(exporter)
             {

diff --git a/...rter.Prometheus.AspNetCore.Tests/PrometheusExporterMeterProviderBuilderExtensionsTests.cs b/...rter.Prometheus.AspNetCore.Tests/PrometheusExporterMeterProviderBuilderExtensionsTests.cs
@@ -31,9 +31,9 @@ public void TestAddPrometheusExporter_NamedOptions()
         using var meterProvider = Sdk.CreateMeterProviderBuilder()
             .ConfigureServices(services =>
             {
-                services.Configure<PrometheusExporterOptions>(o => defaultExporterOptionsConfigureOptionsInvocations++);
+                services.Configure<PrometheusAspNetCoreOptions>(o => defaultExporterOptionsConfigureOptionsInvocations++);
 
-                services.Configure<PrometheusExporterOptions>("Exporter2", o => namedExporterOptionsConfigureOptionsInvocations++);
+                services.Configure<PrometheusAspNetCoreOptions>("Exporter2", o => namedExporterOptionsConfigureOptionsInvocations++);
             })
             .AddPrometheusExporter()
             .AddPrometheusExporter("Exporter2", o => { })

diff --git a/test/OpenTelemetry.Exporter.Prometheus.AspNetCore.Tests/PrometheusExporterMiddlewareTests.cs b/test/OpenTelemetry.Exporter.Prometheus.AspNetCore.Tests/PrometheusExporterMiddlewareTests.cs
@@ -52,7 +52,7 @@ public Task PrometheusExporterMiddlewareIntegration_Options()
             return RunPrometheusExporterMiddlewareIntegrationTest(
                 "/metrics_options",
                 app => app.UseOpenTelemetryPrometheusScrapingEndpoint(),
-                services => services.Configure<PrometheusExporterOptions>(o => o.ScrapeEndpointPath = "metrics_options"));
+                services => services.Configure<PrometheusAspNetCoreOptions>(o => o.ScrapeEndpointPath = "metrics_options"));
         }
 
         [Fact]
@@ -61,7 +61,7 @@ public Task PrometheusExporterMiddlewareIntegration_OptionsFallback()
             return RunPrometheusExporterMiddlewareIntegrationTest(
                 "/metrics",
                 app => app.UseOpenTelemetryPrometheusScrapingEndpoint(),
-                services => services.Configure<PrometheusExporterOptions>(o => o.ScrapeEndpointPath = null));
+                services => services.Configure<PrometheusAspNetCoreOptions>(o => o.ScrapeEndpointPath = null));
         }
 
         [Fact]
@@ -103,7 +103,7 @@ public Task PrometheusExporterMiddlewareIntegration_MixedPredicateAndPath()
                         context.Response.Headers.Add("X-MiddlewareExecuted", "true");
                         return next();
                     })),
-                services => services.Configure<PrometheusExporterOptions>(o => o.ScrapeEndpointPath = "/metrics_options"),
+                services => services.Configure<PrometheusAspNetCoreOptions>(o => o.ScrapeEndpointPath = "/metrics_options"),
                 validateResponse: rsp =>
                 {
                     if (!rsp.Headers.TryGetValues("X-MiddlewareExecuted", out IEnumerable<string> headers))
@@ -129,7 +129,7 @@ public Task PrometheusExporterMiddlewareIntegration_MixedPath()
                         context.Response.Headers.Add("X-MiddlewareExecuted", "true");
                         return next();
                     })),
-                services => services.Configure<PrometheusExporterOptions>(o => o.ScrapeEndpointPath = "/metrics_options"),
+                services => services.Configure<PrometheusAspNetCoreOptions>(o => o.ScrapeEndpointPath = "/metrics_options"),
                 validateResponse: rsp =>
                 {
                     if (!rsp.Headers.TryGetValues("X-MiddlewareExecuted", out IEnumerable<string> headers))
@@ -210,7 +210,7 @@ private static async Task RunPrometheusExporterMiddlewareIntegrationTest(
             Action<IServiceCollection> configureServices = null,
             Action<HttpResponseMessage> validateResponse = null,
             bool registerMeterProvider = true,
-            Action<PrometheusExporterOptions> configureOptions = null,
+            Action<PrometheusAspNetCoreOptions> configureOptions = null,
             bool skipMetrics = false)
         {
             using var host = await new HostBuilder()