Make static and remove redundant set

open-telemetry · Dec 6, 2023 · 8dd0cbf · 8dd0cbf
1 parent 5ec4852
commit 8dd0cbf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/PrometheusExporterMiddleware.cs b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/PrometheusExporterMiddleware.cs
@@ -29,7 +29,6 @@ namespace OpenTelemetry.Exporter;
 internal sealed class PrometheusExporterMiddleware
 {
     private readonly PrometheusExporter exporter;
-    private readonly PrometheusHeadersParser headersParser = new();
 
     /// <summary>
     /// Initializes a new instance of the <see cref="PrometheusExporterMiddleware"/> class.
@@ -66,7 +65,7 @@ public async Task InvokeAsync(HttpContext httpContext)
 
         try
         {
-            var openMetricsRequested = this.AcceptsOpenMetrics(httpContext.Request);
+            var openMetricsRequested = AcceptsOpenMetrics(httpContext.Request);
             var collectionResponse = await this.exporter.CollectionManager.EnterCollect(openMetricsRequested).ConfigureAwait(false);
 
             try
@@ -109,7 +108,7 @@ public async Task InvokeAsync(HttpContext httpContext)
         this.exporter.OnExport = null;
     }
 
-    private bool AcceptsOpenMetrics(HttpRequest request)
+    private static bool AcceptsOpenMetrics(HttpRequest request)
     {
         var acceptHeader = request.Headers.Accept;
 
@@ -118,6 +117,6 @@ private bool AcceptsOpenMetrics(HttpRequest request)
             return false;
         }
 
-        return acceptHeader.Any(x => this.headersParser.AcceptsOpenMetrics(x));
+        return acceptHeader.Any(PrometheusHeadersParser.AcceptsOpenMetrics);
     }
 }
diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusCollectionManager.cs b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusCollectionManager.cs
@@ -174,7 +174,6 @@ private bool ExecuteCollect(bool openMetricsRequested)
         this.exporter.OpenMetricsRequested = openMetricsRequested;
         var result = this.exporter.Collect(Timeout.Infinite);
         this.exporter.OnExport = null;
-        this.exporter.OpenMetricsRequested = false;
         return result;
     }
 

diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusHeadersParser.cs b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusHeadersParser.cs
@@ -16,11 +16,11 @@
 
 namespace OpenTelemetry.Exporter.Prometheus;
 
-internal class PrometheusHeadersParser
+internal static class PrometheusHeadersParser
 {
     private const string OpenMetricsMediaType = "application/openmetrics-text";
 
-    internal bool AcceptsOpenMetrics(string contentType)
+    internal static bool AcceptsOpenMetrics(string contentType)
     {
         var value = contentType.AsSpan();
 

diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/PrometheusHttpListener.cs b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/PrometheusHttpListener.cs
@@ -23,7 +23,6 @@ namespace OpenTelemetry.Exporter;
 internal sealed class PrometheusHttpListener : IDisposable
 {
     private readonly PrometheusExporter exporter;
-    private readonly PrometheusHeadersParser headersParser = new();
     private readonly HttpListener httpListener = new();
     private readonly object syncObject = new();
 
@@ -111,6 +110,18 @@ public void Dispose()
         }
     }
 
+    private static bool AcceptsOpenMetrics(HttpListenerRequest request)
+    {
+        var acceptHeader = request.Headers["Accept"];
+
+        if (string.IsNullOrEmpty(acceptHeader))
+        {
+            return false;
+        }
+
+        return PrometheusHeadersParser.AcceptsOpenMetrics(acceptHeader);
+    }
+
     private void WorkerProc()
     {
         this.httpListener.Start();
@@ -149,7 +160,7 @@ private async Task ProcessRequestAsync(HttpListenerContext context)
     {
         try
         {
-            var openMetricsRequested = this.AcceptsOpenMetrics(context.Request);
+            var openMetricsRequested = AcceptsOpenMetrics(context.Request);
             var collectionResponse = await this.exporter.CollectionManager.EnterCollect(openMetricsRequested).ConfigureAwait(false);
 
             try
@@ -192,16 +203,4 @@ private async Task ProcessRequestAsync(HttpListenerContext context)
         {
         }
     }
-
-    private bool AcceptsOpenMetrics(HttpListenerRequest request)
-    {
-        var acceptHeader = request.Headers["Accept"];
-
-        if (string.IsNullOrEmpty(acceptHeader))
-        {
-            return false;
-        }
-
-        return this.headersParser.AcceptsOpenMetrics(acceptHeader);
-    }
 }