CollectorRegistryInstance → CollectorRegistry

Author: phnx47

src/MetricServer.cs

@@ -39,15 +39,15 @@ public MetricServer(MetricServerOptions options)
 
         _options = options;
 
-        _options.CollectorRegistryInstance ??= Metrics.DefaultCollectorRegistry;
+        _options.CollectorRegistry ??= Metrics.DefaultCollectorRegistry;
 
         if (_options.UseDefaultCollectors)
         {
 #pragma warning disable CS0618
             if (options.AddLegacyMetrics)
-                options.CollectorRegistryInstance.UseDefaultCollectors(options.MetricPrefixName, options.AddLegacyMetrics);
+                options.CollectorRegistry.UseDefaultCollectors(options.MetricPrefixName, options.AddLegacyMetrics);
             else
-                options.CollectorRegistryInstance.UseDefaultCollectors(options.MetricPrefixName);
+                options.CollectorRegistry.UseDefaultCollectors(options.MetricPrefixName);
 #pragma warning restore CS0618
         }
     }
@@ -118,7 +118,7 @@ public void Configure(IApplicationBuilder app)
                     response.ContentType = contentType;
 
                     await using var outputStream = response.Body;
-                    await ScrapeHandler.ProcessAsync(_options.CollectorRegistryInstance, outputStream);
+                    await ScrapeHandler.ProcessAsync(_options.CollectorRegistry, outputStream);
                 });
             });
         }

src/MetricServerOptions.cs

@@ -33,7 +33,7 @@ public class MetricServerOptions
     /// <summary>
     ///     Collector Registry instance
     /// </summary>
-    public ICollectorRegistry CollectorRegistryInstance { get; set; }
+    public ICollectorRegistry CollectorRegistry { get; set; }
 
     /// <summary>
     ///     Use default collectors(dotnet and process stats)

tests/MetricServerTests.cs

@@ -13,7 +13,7 @@ public class MetricServerTests(PortFixture fixture, ITestOutputHelper testOutput
     private MetricServer _metricServer = new(new MetricServerOptions
     {
         Port = fixture.Port,
-        CollectorRegistryInstance = new CollectorRegistry()
+        CollectorRegistry = new CollectorRegistry()
     });
 
     [Fact]
@@ -56,7 +56,7 @@ public void DoubleStart_Stop_IsRunning()
     [Fact]
     public void Start_Stop_WithDefaultPort_IsRunning()
     {
-        _metricServer = new MetricServer(new MetricServerOptions { CollectorRegistryInstance = new CollectorRegistry() });
+        _metricServer = new MetricServer(new MetricServerOptions { CollectorRegistry = new CollectorRegistry() });
         _metricServer.Start();
         Assert.True(_metricServer.IsRunning);
         _metricServer.Stop();
@@ -102,7 +102,7 @@ public async Task BaseMapPath_FindMetrics()
     public async Task SetMapPath_FindMetricsWithEndSlash()
     {
         _metricServer = new MetricServer(
-            new MetricServerOptions { Port = fixture.Port, CollectorRegistryInstance = new CollectorRegistry(), MapPath = "/test" });
+            new MetricServerOptions { Port = fixture.Port, CollectorRegistry = new CollectorRegistry(), MapPath = "/test" });
         try
         {
             _metricServer.Start();
@@ -133,7 +133,7 @@ public async Task SetMapPath_FindMetricsWithEndSlash()
     public async Task SetMapPath_FindMetrics(string mapPath)
     {
         _metricServer = new MetricServer(
-            new MetricServerOptions { Port = fixture.Port, CollectorRegistryInstance = new CollectorRegistry(), MapPath = mapPath });
+            new MetricServerOptions { Port = fixture.Port, CollectorRegistry = new CollectorRegistry(), MapPath = mapPath });
         try
         {
             _metricServer.Start();
@@ -161,7 +161,7 @@ public async Task CustomCounter_FindMetric()
     {
         var registry = new CollectorRegistry();
         var factory = new MetricFactory(registry);
-        _metricServer = new MetricServer(new MetricServerOptions { Port = fixture.Port, CollectorRegistryInstance = registry });
+        _metricServer = new MetricServer(new MetricServerOptions { Port = fixture.Port, CollectorRegistry = registry });
 
         try
         {
@@ -214,7 +214,7 @@ public async Task AddLegacyMetrics_False_FindMetrics()
     public async Task AddLegacyMetrics_True_FindMetrics()
     {
         _metricServer = new MetricServer(new MetricServerOptions
-            { Port = fixture.Port, CollectorRegistryInstance = new CollectorRegistry(), AddLegacyMetrics = true });
+            { Port = fixture.Port, CollectorRegistry = new CollectorRegistry(), AddLegacyMetrics = true });
 
         try
         {
@@ -267,7 +267,7 @@ public async Task CustormEncoding_FindHelp()
         var registry = new CollectorRegistry();
         var factory = new MetricFactory(registry);
         _metricServer = new MetricServer(
-            new MetricServerOptions { Port = fixture.Port, CollectorRegistryInstance = registry, ResponseEncoding = Encoding.UTF8 });
+            new MetricServerOptions { Port = fixture.Port, CollectorRegistry = registry, ResponseEncoding = Encoding.UTF8 });
 
         try
         {