use DefaultCollectors from Prometheus.Client

phnx47 · phnx47 · commit 398ece720041 · 2018-09-11T00:24:49.000+03:00
diff --git a/src/Prometheus.Client.AspNetCore/DefaultCollectors.cs b/src/Prometheus.Client.AspNetCore/DefaultCollectors.cs
diff --git a/src/Prometheus.Client.AspNetCore/Prometheus.Client.AspNetCore.csproj b/src/Prometheus.Client.AspNetCore/Prometheus.Client.AspNetCore.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <!-- for debug -->
     <!--<PackageReference Include="Prometheus.Client" Version="1.6.0" />-->
-    <PackageReference Include="Prometheus.Client" Version="1.6.0-build44" /> 
+    <PackageReference Include="Prometheus.Client" Version="1.6.0-build45" /> 
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
diff --git a/src/Prometheus.Client.AspNetCore/PrometheusExtensions.cs b/src/Prometheus.Client.AspNetCore/PrometheusExtensions.cs
@@ -25,7 +25,7 @@ public static IApplicationBuilder UsePrometheusServer(this IApplicationBuilder a
         {
             var options = new PrometheusOptions();
             setupOptions?.Invoke(options);
-            
+
             if (app == null)
                 throw new ArgumentNullException(nameof(app));
 
@@ -60,9 +60,9 @@ private static void RegisterCollectors(PrometheusOptions options)
         {
             if (options.UseDefaultCollectors)
             {
-                var metricFactory = Metrics.DefaultFactory;
-                if (options.CollectorRegistryInstance != CollectorRegistry.Instance)
-                    metricFactory = new MetricFactory(options.CollectorRegistryInstance);
+                var metricFactory = options.CollectorRegistryInstance == CollectorRegistry.Instance 
+                    ? Metrics.DefaultFactory 
+                    : new MetricFactory(options.CollectorRegistryInstance);
 
                 options.Collectors.AddRange(DefaultCollectors.Get(metricFactory));
             }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static IApplicationBuilder UsePrometheusServer(this IApplicationBuilder a`
`25`	`25`	`{`
`26`	`26`	`var options = new PrometheusOptions();`
`27`	`27`	`setupOptions?.Invoke(options);`
`28`		`-`
	`28`	`+`
`29`	`29`	`if (app == null)`
`30`	`30`	`throw new ArgumentNullException(nameof(app));`
`31`	`31`
`@@ -60,9 +60,9 @@ private static void RegisterCollectors(PrometheusOptions options)`
`60`	`60`	`{`
`61`	`61`	`if (options.UseDefaultCollectors)`
`62`	`62`	`{`
`63`		`- var metricFactory = Metrics.DefaultFactory;`
`64`		`- if (options.CollectorRegistryInstance != CollectorRegistry.Instance)`
`65`		`- metricFactory = new MetricFactory(options.CollectorRegistryInstance);`
	`63`	`+ var metricFactory = options.CollectorRegistryInstance == CollectorRegistry.Instance`
	`64`	`+ ? Metrics.DefaultFactory`
	`65`	`+ : new MetricFactory(options.CollectorRegistryInstance);`
`66`	`66`
`67`	`67`	`options.Collectors.AddRange(DefaultCollectors.Get(metricFactory));`
`68`	`68`	`}`