prepare for new version

Author: phnx47

README.md

@@ -31,9 +31,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IApplicationLifetime appLifetime)
 {
     app.UsePrometheusServer(q =>
-                {
-                    q.MapPath = "/metrics1";
-                });
+    {
+        q.MapPath = "/metrics1";
+    });
 }
 
 ```

src/Prometheus.Client.AspNetCore/DefaultCollectors.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Prometheus.Client.Collectors;
-using System.Runtime.InteropServices;
+using Prometheus.Client.Collectors.Abstractions;
 
 namespace Prometheus.Client.AspNetCore
 {
@@ -14,12 +14,11 @@ public static class DefaultCollectors
         /// </summary>
         public static IEnumerable<IOnDemandCollector> Get(MetricFactory metricFactory)
         {
-            yield return new DotNetStatsCollector(metricFactory);
-            
-            var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            if (isWindows)
-                yield return new WindowsDotNetStatsCollector(metricFactory);
-
+            return new IOnDemandCollector[]
+            {
+                new DotNetStatsCollector(metricFactory),
+                new ProcessCollector(metricFactory) 
+            };
         }
     }
 }

src/Prometheus.Client.AspNetCore/Prometheus.Client.AspNetCore.csproj

@@ -3,7 +3,7 @@
     <Description>Middleware for the Prometheus.Client</Description>
     <Copyright>2018 © Sergey Kuznetsov</Copyright>
     <AssemblyTitle>Prometheus.Client.AspNetCore</AssemblyTitle>
-    <VersionPrefix>1.5.1</VersionPrefix>
+    <VersionPrefix>1.6.0</VersionPrefix>
     <Authors>Sergey Kuznetsov</Authors>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>Prometheus.Client.AspNetCore</AssemblyName>
@@ -18,7 +18,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Prometheus.Client" Version="[1.5.0,1.6.0)" />
+    <!--<PackageReference Include="Prometheus.Client" Version="1.6.0" />-->
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
@@ -30,4 +30,7 @@
       <Version>2.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Prometheus.Client" Version="1.6.0-build44" />
+  </ItemGroup>
 </Project>

src/Prometheus.Client.AspNetCore/PrometheusExtensions.cs

@@ -41,18 +41,11 @@ public static IApplicationBuilder UsePrometheusServer(this IApplicationBuilder a
             {
                 coreapp.Run(async context =>
                 {
-                    var req = context.Request;
                     var response = context.Response;
 
-                    req.Headers.TryGetValue("Accept", out var acceptHeaders);
-                    var contentType = ScrapeHandler.GetContentType(acceptHeaders);
-
-                    response.ContentType = contentType;
-
                     using (var outputStream = response.Body)
                     {
-                        var collected = options.CollectorRegistryInstance.CollectAll();
-                        ScrapeHandler.ProcessScrapeRequest(collected, contentType, outputStream);
+                        ScrapeHandler.Process(options.CollectorRegistryInstance, outputStream);
                     }
 
                     await Task.FromResult(0).ConfigureAwait(false);

src/Prometheus.Client.AspNetCore/PrometheusOptions.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Prometheus.Client.Collectors;
+using Prometheus.Client.Collectors.Abstractions;
 
 namespace Prometheus.Client.AspNetCore
 {