Skip to content

Commit 3a7b461

Browse files
committed
fix: compatibility with extensions
1 parent 675ae9a commit 3a7b461

File tree

7 files changed

+38
-17
lines changed

7 files changed

+38
-17
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<LangVersion>9.0</LangVersion>
44
<Authors>prom-client-net contributors</Authors>
55
<Copyright>Copyright © prom-client-net</Copyright>
6-
<VersionPrefix>4.5.0</VersionPrefix>
6+
<VersionPrefix>4.5.1</VersionPrefix>
77
<Description>.NET client for Prometheus</Description>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99
<RepositoryType>git</RepositoryType>

src/Prometheus.Client/Collectors/DefaultCollectors.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ namespace Prometheus.Client.Collectors
55
{
66
public static class DefaultCollectors
77
{
8-
public static ICollectorRegistry UseDefaultCollectors(this ICollectorRegistry registry, string prefixName = "")
8+
public static ICollectorRegistry UseDefaultCollectors(this ICollectorRegistry registry)
9+
{
10+
return UseDefaultCollectors(registry, "");
11+
}
12+
13+
public static ICollectorRegistry UseDefaultCollectors(this ICollectorRegistry registry, string prefixName)
914
{
1015
registry.UseDotNetStats(prefixName);
1116
registry.UseProcessStats(prefixName);

src/Prometheus.Client/Collectors/DotNetStats/CollectorRegistryExtensions.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ namespace Prometheus.Client.Collectors.DotNetStats
22
{
33
public static class CollectorRegistryExtensions
44
{
5-
public static ICollectorRegistry UseDotNetStats(this ICollectorRegistry registry, string prefixName = "")
5+
public static ICollectorRegistry UseDotNetStats(this ICollectorRegistry registry)
6+
{
7+
return UseDotNetStats(registry, "");
8+
}
9+
10+
public static ICollectorRegistry UseDotNetStats(this ICollectorRegistry registry, string prefixName)
611
{
712
registry.Add(new GCCollectionCountCollector(prefixName));
813
registry.Add(new GCTotalMemoryCollector(prefixName));

src/Prometheus.Client/Collectors/DotNetStats/GCCollectionCountCollector.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ public class GCCollectionCountCollector : ICollector
1010
private readonly string _name;
1111
private readonly string[] _genNames;
1212

13-
public GCCollectionCountCollector(string prefixName = "")
13+
public GCCollectionCountCollector()
14+
: this("")
15+
{
16+
}
17+
18+
public GCCollectionCountCollector(string prefixName)
1419
{
1520
_name = prefixName + "dotnet_collection_count_total";
1621
Configuration = new CollectorConfiguration(nameof(GCCollectionCountCollector));

src/Prometheus.Client/Collectors/DotNetStats/GCTotalMemoryCollector.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ public class GCTotalMemoryCollector : ICollector
99
private const string _help = "Total known allocated memory";
1010
private readonly string _name;
1111

12-
public GCTotalMemoryCollector(string prefixName = "")
12+
public GCTotalMemoryCollector()
13+
: this("")
14+
{
15+
}
16+
17+
public GCTotalMemoryCollector(string prefixName)
1318
{
1419
_name = prefixName + "dotnet_totalmemory";
1520
Configuration = new CollectorConfiguration(nameof(GCTotalMemoryCollector));

src/Prometheus.Client/Collectors/ProcessStats/CollectorRegistryExtensions.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ namespace Prometheus.Client.Collectors.ProcessStats
44
{
55
public static class CollectorRegistryExtensions
66
{
7-
public static ICollectorRegistry UseProcessStats(this ICollectorRegistry registry, string prefixName = "")
7+
public static ICollectorRegistry UseProcessStats(this ICollectorRegistry registry)
8+
{
9+
return UseProcessStats(registry, "");
10+
}
11+
12+
public static ICollectorRegistry UseProcessStats(this ICollectorRegistry registry, string prefixName)
813
{
914
registry.Add(new ProcessCollector(Process.GetCurrentProcess(), prefixName));
1015

src/Prometheus.Client/Collectors/ProcessStats/ProcessCollector.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ public class ProcessCollector : ICollector
2222
private readonly Process _process;
2323
private readonly double _processStartTime;
2424

25-
public ProcessCollector(Process process, string prefixName = "")
25+
public ProcessCollector(Process process)
26+
: this(process, "")
27+
{
28+
}
29+
30+
public ProcessCollector(Process process, string prefixName)
2631
{
2732
_cpuSecondsTotalName = prefixName + "process_cpu_seconds_total";
2833
_virtualBytesName = prefixName + "process_virtual_bytes";
@@ -36,16 +41,7 @@ public ProcessCollector(Process process, string prefixName = "")
3641
Configuration = new CollectorConfiguration(nameof(ProcessCollector));
3742

3843
_processStartTime = ((DateTimeOffset)_process.StartTime.ToUniversalTime()).ToUnixTimeSeconds();
39-
MetricNames = new[]
40-
{
41-
_cpuSecondsTotalName,
42-
_virtualBytesName,
43-
_workingSetName,
44-
_privateBytesName,
45-
_numThreadsName,
46-
_processIdName,
47-
_startTimeSecondsName
48-
};
44+
MetricNames = new[] { _cpuSecondsTotalName, _virtualBytesName, _workingSetName, _privateBytesName, _numThreadsName, _processIdName, _startTimeSecondsName };
4945
}
5046

5147
public CollectorConfiguration Configuration { get; }

0 commit comments

Comments
 (0)