Revert "#13 Use Untyped for some defaults metrics"

This reverts commit 779d94d.

# Conflicts:
#	src/Prometheus.Client/Collectors/DotNetStatsCollector.cs

Author: phnx47

appveyor.yml

@@ -34,5 +34,5 @@ deploy:
   symbol_server: https://www.myget.org/F/phnx47-beta/symbols/api/v2/package
   artifact: MyGet
   on:
-    branch: master
-    appveyor_repo_tag: false
+    branch: 2.2
+    appveyor_repo_tag: false

src/Prometheus.Client/Collectors/DotNetStatsCollector.cs

@@ -11,8 +11,10 @@ namespace Prometheus.Client.Collectors
     public class DotNetStatsCollector : IOnDemandCollector
     {
         private readonly MetricFactory _metricFactory;
+        
         private readonly List<Counter.LabelledCounter> _collectionCounts = new List<Counter.LabelledCounter>();
-        private Untyped _totalMemory;
+        private Gauge _totalMemory;
+
         private Counter _errorCounter;
 
         /// <inheritdoc />
@@ -39,7 +41,7 @@ public void RegisterMetrics()
 
             var collectionCountsParent = _metricFactory.CreateCounter("dotnet_collection_count_total", "GC collection count", "generation");
 
-            _totalMemory = _metricFactory.CreateUntyped("dotnet_totalmemory", "Total known allocated memory");
+            _totalMemory = _metricFactory.CreateGauge("dotnet_totalmemory", "Total known allocated memory");
 
             for (var gen = 0; gen <= GC.MaxGeneration; gen++)
                 _collectionCounts.Add(collectionCountsParent.Labels(gen.ToString()));

src/Prometheus.Client/Collectors/ProcessCollector.cs

@@ -14,11 +14,11 @@ public class ProcessCollector : IOnDemandCollector
         private readonly Process _process;
         private Counter _cpuTotal;
         private Counter _errorCounter;
-
-        private Untyped _numThreads;
-        private Untyped _privateMemorySize;
-        private Untyped _virtualMemorySize;
-        private Untyped _workingSet;
+        
+        private Gauge _numThreads;
+        private Gauge _privateMemorySize;
+        private Gauge _virtualMemorySize;
+        private Gauge _workingSet;
 
 
         /// <inheritdoc />
@@ -47,16 +47,16 @@ public void RegisterMetrics()
             _cpuTotal = _metricFactory.CreateCounter("process_cpu_seconds_total", "Total user and system CPU time spent in seconds");
 
             var epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-
+            
             _metricFactory.CreateGauge("process_start_time_seconds", "Start time of the process since unix epoch in seconds")
                 .Set((_process.StartTime.ToUniversalTime() - epoch).TotalSeconds);
-
-            _virtualMemorySize = _metricFactory.CreateUntyped("process_virtual_bytes", "Process virtual memory size");
-            _workingSet = _metricFactory.CreateUntyped("process_working_set", "Process working set");
-            _privateMemorySize = _metricFactory.CreateUntyped("process_private_bytes", "Process private memory size");
-            _numThreads = _metricFactory.CreateUntyped("process_num_threads", "Total number of threads");
-
-            _metricFactory.CreateUntyped("process_processid", "Process ID").Set(_process.Id);
+            
+                        _virtualMemorySize = _metricFactory.CreateGauge("process_virtual_bytes", "Process virtual memory size");
+            _workingSet = _metricFactory.CreateGauge("process_working_set", "Process working set");
+            _privateMemorySize = _metricFactory.CreateGauge("process_private_bytes", "Process private memory size");
+            _numThreads = _metricFactory.CreateGauge("process_num_threads", "Total number of threads");
+            
+            _metricFactory.CreateGauge("process_processid", "Process ID").Set(_process.Id); // todo: Untyped           
         }
 
         public void UpdateMetrics()
@@ -66,7 +66,7 @@ public void UpdateMetrics()
                 _process.Refresh();
 
                 _cpuTotal.Inc(_process.TotalProcessorTime.TotalSeconds - _cpuTotal.Value);
-
+                
                 _virtualMemorySize.Set(_process.VirtualMemorySize64);
                 _workingSet.Set(_process.WorkingSet64);
                 _privateMemorySize.Set(_process.PrivateMemorySize64);
@@ -78,4 +78,4 @@ public void UpdateMetrics()
             }
         }
     }
-}
+}

src/Prometheus.Client/Prometheus.Client.csproj

@@ -3,7 +3,7 @@
     <Description>.NET client for Prometheus</Description>
     <Copyright>2019 © Sergey Kuznetsov</Copyright>
     <AssemblyTitle>Prometheus.Client</AssemblyTitle>
-    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionPrefix>2.2.1</VersionPrefix>
     <Authors>Sergey Kuznetsov</Authors>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.3;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.3;netstandard2.0</TargetFrameworks>