Merge pull request #81 from prom-client-net/feat/minor-impr

feat: minor improvements

Author: phnx47

src/Defaults.cs

@@ -0,0 +1,7 @@
+namespace Prometheus.Client.MetricServer;
+
+internal static class Defaults
+{
+    internal const string MapPath = "/metrics";
+    internal const string ContentType = "text/plain; version=0.0.4";
+}

src/MetricServer.cs

@@ -34,8 +34,8 @@ public MetricServer(MetricServerOptions options)
         if (options == null)
             throw new ArgumentNullException(nameof(options));
 
-        if (string.IsNullOrEmpty(options.MapPath) || !options.MapPath.StartsWith("/"))
-            throw new ArgumentException($"mapPath '{options.MapPath}' should start with '/'");
+        if (!options.MapPath.StartsWith("/"))
+            options.MapPath = "/" + options.MapPath;
 
         _options = options;
 
@@ -97,24 +97,18 @@ internal class Startup : IStartup
         public Startup(MetricServerOptions options)
         {
             _options = options;
-
-            var builder = new ConfigurationBuilder();
-            Configuration = builder.Build();
         }
 
-        public IConfigurationRoot Configuration { get; }
-
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             return services.BuildServiceProvider();
         }
 
         public void Configure(IApplicationBuilder app)
         {
-            var contentType = "text/plain; version=0.0.4";
-
-            if (_options.ResponseEncoding != null)
-                contentType += $"; charset={_options.ResponseEncoding.BodyName}";
+            var contentType = _options.ResponseEncoding != null
+                ? $"{Defaults.ContentType}; charset={_options.ResponseEncoding.BodyName}"
+                : Defaults.ContentType;
 
             app.Map(_options.MapPath, coreapp =>
             {

src/MetricServerOptions.cs

@@ -23,7 +23,7 @@ public class MetricServerOptions
     /// <summary>
     ///     Endpoint path
     /// </summary>
-    public string MapPath { get; set; } = "/metrics";
+    public string MapPath { get; set; } = Defaults.MapPath;
 
     /// <summary>
     ///     Https certificate
@@ -38,7 +38,7 @@ public class MetricServerOptions
     /// <summary>
     ///     Use default collectors(dotnet and process stats)
     /// </summary>
-    public bool UseDefaultCollectors { get; set; } = false;
+    public bool UseDefaultCollectors { get; set; } = true;
 
     /// <summary>
     ///     Charset of text response.
@@ -48,7 +48,7 @@ public class MetricServerOptions
     /// <summary>
     ///     Metric prefix for Default collectors
     /// </summary>
-    public string MetricPrefixName { get; set; } = "";
+    public string MetricPrefixName { get; set; } = string.Empty;
 
     /// <summary>
     ///     Add legacy metrics to Default collectors

src/Prometheus.Client.MetricServer.csproj

@@ -10,4 +10,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Prometheus.Client" Version="[5.2.0,6.0.0)" />
   </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="$(MSBuildProjectName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035b85a8ca7e3391c4ac9123c6e51491977a1229b85e572e70350884579334c7d44e3c00de913f684eaab330ceeaba6eb41bbb359b7157ff17542a4e112856c4a18ab521eb7acb4f5a03f3d0a7e849e5406bae28d6780bb2453122e60b52aa76ae10611a1d4a0ffba682558c05ae2b5a0709c260b8a0c3afb15cf2ca0eed949ee" />
+  </ItemGroup>
 </Project>