#1937 fix content type of prometheus endpoint to text/plain

ArcadeData · Jan 28, 2025 · 5b60af0 · 5b60af0
1 parent f1621b1
commit 5b60af0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/metrics/src/main/java/com/arcadedb/metrics/prometheus/GetPrometheusMetricsHandler.java b/metrics/src/main/java/com/arcadedb/metrics/prometheus/GetPrometheusMetricsHandler.java
@@ -6,6 +6,8 @@
 import com.arcadedb.server.security.ServerSecurityUser;
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.undertow.server.HttpServerExchange;
+import io.undertow.util.Headers;
+import io.undertow.util.MimeMappings;
 
 public class GetPrometheusMetricsHandler extends AbstractServerHttpHandler {
 
@@ -20,7 +22,12 @@ public GetPrometheusMetricsHandler(HttpServer httpServer, PrometheusMeterRegistr
 
   @Override
   public ExecutionResponse execute(HttpServerExchange exchange, ServerSecurityUser user) throws Exception {
+
     String response = registry.scrape();
+
+    exchange.getResponseHeaders()
+        .put(Headers.CONTENT_TYPE, MimeMappings.DEFAULT.getMimeType("txt"));
+
     return new ExecutionResponse(200, response);
   }
 

diff --git a/...c/test/java/com/arcadedb/metrics/prometheus/PrometheusMetricsPluginAuthenticatedTest.java b/...c/test/java/com/arcadedb/metrics/prometheus/PrometheusMetricsPluginAuthenticatedTest.java
@@ -10,6 +10,7 @@
 import java.net.PasswordAuthentication;
 import java.net.URI;
 import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 
@@ -50,6 +51,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
 
     HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
     assertThat(response.statusCode()).isEqualTo(200);
+    assertThat(response.headers().firstValue("Content-Type").get()).isEqualTo("text/plain");
     assertThat(response.body()).contains("system_cpu_usage");
   }
 }
diff --git a/...est/java/com/arcadedb/metrics/prometheus/PrometheusMetricsPluginNotAuthenticatedTest.java b/...est/java/com/arcadedb/metrics/prometheus/PrometheusMetricsPluginNotAuthenticatedTest.java
@@ -42,6 +42,7 @@ void testPrometheusEndpointWithoutAuth() throws IOException, InterruptedExceptio
 
     HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
     assertThat(response.statusCode()).isEqualTo(200);
+    assertThat(response.headers().firstValue("Content-Type").get()).isEqualTo("text/plain");
     assertThat(response.body()).contains("system_cpu_usage");
   }
 }
diff --git a/server/src/main/java/com/arcadedb/server/http/handler/ExecutionResponse.java b/server/src/main/java/com/arcadedb/server/http/handler/ExecutionResponse.java
@@ -21,11 +21,11 @@
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.Headers;
 
-import java.nio.*;
+import java.nio.ByteBuffer;
 
 public class ExecutionResponse {
-  public final  int    code;
-  public final  String response;
+  private final int    code;
+  private final String response;
   private final byte[] binary;
 
   public ExecutionResponse(final int code, final String response) {