Restructure project

Author: phnx47

examples/WebApiApplication/Controllers/MetricsController.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Web.Http;
 using Prometheus.Client;
-using Prometheus.Client.Advanced;
+using Prometheus.Client.Collectors;
 
 namespace WebApiApplication.Controllers
 {

examples/WebApiApplication/Global.asax.cs

@@ -1,13 +1,14 @@
 using System.Web.Http;
-using Prometheus.Client.Advanced;
+
+using Prometheus.Client.Collectors;
 
 namespace WebApiApplication
 {
     public class WebApiApplication : System.Web.HttpApplication
     {
         protected void Application_Start()
         {
-            CollectorRegistry.Instance.RegisterOnDemandCollectors(new[] { new DotNetStatsCollector() });
+            CollectorRegistry.Instance.RegisterOnDemandCollectors(new IOnDemandCollector[] { new DotNetStatsCollector(), new WindowsDotNetStatsCollector(), new PerfCounterCollector()   });
             GlobalConfiguration.Configure(WebApiConfig.Register);
         }
     }

examples/WebCoreApplication/Controllers/MetricsController.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using Microsoft.AspNetCore.Mvc;
 using Prometheus.Client;
-using Prometheus.Client.Advanced;
+using Prometheus.Client.Collectors;
 
 
 namespace WebCoreApplication.Controllers

examples/WebCoreApplication/Startup.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Prometheus.Client.Advanced;
+using Prometheus.Client.Collectors;
 
 namespace WebCoreApplication
 {
@@ -18,7 +18,7 @@ public Startup(IHostingEnvironment env)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();
 
-            CollectorRegistry.Instance.RegisterOnDemandCollectors(new[] { new DotNetStatsCollector() });
+            CollectorRegistry.Instance.RegisterOnDemandCollectors(new IOnDemandCollector[] { new DotNetStatsCollector(), new WindowsDotNetStatsCollector() });
         }
 
         public IConfigurationRoot Configuration { get; }

src/Prometheus.Client/Advanced/IOnDemandCollector.cs

@@ -1,8 +1,8 @@
-using Prometheus.Advanced;
-using Prometheus.Advanced.DataContracts;
+using Prometheus.Client.Collectors;
 using Prometheus.Client.Internal;
+using Prometheus.Contracts;
 
-namespace Prometheus.Client.Advanced
+namespace Prometheus.Client
 {
     public abstract class Child
     {

src/Prometheus.Client/Advanced/Child.cs renamed to src/Prometheus.Client/Child.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
-using Prometheus.Advanced;
-using Prometheus.Advanced.DataContracts;
 using Prometheus.Client.Internal;
+using Prometheus.Contracts;
 
-namespace Prometheus.Client.Advanced
+namespace Prometheus.Client.Collectors
 {
     public abstract class Collector<T> : ICollector where T : Child, new()
     {

src/Prometheus.Client/Advanced/Collector.cs renamed to src/Prometheus.Client/Collectors/Collector.cs

@@ -2,9 +2,10 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using Prometheus.Advanced.DataContracts;
+using Prometheus.Contracts;
 
-namespace Prometheus.Client.Advanced
+
+namespace Prometheus.Client.Collectors
 {
     public class CollectorRegistry : ICollectorRegistry
     {

src/Prometheus.Client/Advanced/CollectorRegistry.cs renamed to src/Prometheus.Client/Collectors/CollectorRegistry.cs

@@ -2,57 +2,51 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace Prometheus.Client.Advanced
+namespace Prometheus.Client.Collectors
 {
     /// <summary>
-    /// Collects metrics on .net without performance counters
+    ///     Collects metrics on .net without performance counters
     /// </summary>
     public class DotNetStatsCollector : IOnDemandCollector
     {
+        private readonly List<Counter.ThisChild> _collectionCounts = new List<Counter.ThisChild>();
         private readonly Process _process;
-        private Counter _perfErrors;
-        private readonly List<Counter.Child> _collectionCounts = new List<Counter.Child>();
-        private Gauge _totalMemory;
-        private Gauge _virtualMemorySize;
-        private Gauge _workingSet;
-        private Gauge _privateMemorySize;
         private Counter _cpuTotal;
+        private Counter _perfErrors;
+
         private Gauge _startTime;
-        private Gauge _numThreads;
-        private Gauge _pid;
+        private Gauge _totalMemory;
+
 
+        /// <summary>
+        /// Constructors
+        /// </summary>
         public DotNetStatsCollector()
         {
             _process = Process.GetCurrentProcess();
         }
 
+        /// <inheritdoc />
+       
         public void RegisterMetrics()
         {
+            _perfErrors = Metrics.CreateCounter("dotnet_collection_errors_total", "Total number of errors that occured during collections");
+
             var collectionCountsParent = Metrics.CreateCounter("dotnet_collection_count_total", "GC collection count", "generation");
 
             for (var gen = 0; gen <= GC.MaxGeneration; gen++)
-            {
                 _collectionCounts.Add(collectionCountsParent.Labels(gen.ToString()));
-            }
 
             // Metrics that make sense to compare between all operating systems
             _startTime = Metrics.CreateGauge("process_start_time_seconds", "Start time of the process since unix epoch in seconds");
             _cpuTotal = Metrics.CreateCounter("process_cpu_seconds_total", "Total user and system CPU time spent in seconds");
 
-            // Windows specific metrics
-            _virtualMemorySize = Metrics.CreateGauge("process_windows_virtual_bytes", "Process virtual memory size");
-            _workingSet = Metrics.CreateGauge("process_windows_working_set", "Process working set");
-            _privateMemorySize = Metrics.CreateGauge("process_windows_private_bytes", "Process private memory size");
-            _numThreads = Metrics.CreateGauge("process_windows_num_threads", "Total number of threads");
-            _pid = Metrics.CreateGauge("process_windows_processid", "Process ID");
-
             // .net specific metrics
             _totalMemory = Metrics.CreateGauge("dotnet_totalmemory", "Total known allocated memory");
-            _perfErrors = Metrics.CreateCounter("dotnet_collection_errors_total", "Total number of errors that occured during collections");
+            
 
             var epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
             _startTime.Set((_process.StartTime.ToUniversalTime() - epoch).TotalSeconds);
-            _pid.Set(_process.Id);
         }
 
         public void UpdateMetrics()
@@ -68,11 +62,8 @@ public void UpdateMetrics()
                 }
 
                 _totalMemory.Set(GC.GetTotalMemory(false));
-                _virtualMemorySize.Set(_process.VirtualMemorySize64);
-                _workingSet.Set(_process.WorkingSet64);
-                _privateMemorySize.Set(_process.PrivateMemorySize64);
+
                 _cpuTotal.Inc(_process.TotalProcessorTime.TotalSeconds - _cpuTotal.Value);
-                _numThreads.Set(_process.Threads.Count);
             }
             catch (Exception)
             {

src/Prometheus.Client/Advanced/DotNetStatsCollector.cs renamed to src/Prometheus.Client/Collectors/DotNetStatsCollector.cs

@@ -1,6 +1,6 @@
-using Prometheus.Advanced.DataContracts;
+using Prometheus.Contracts;
 
-namespace Prometheus.Client.Advanced
+namespace Prometheus.Client.Collectors
 {
     public interface ICollector
     {