Merge branch 'master' into remove-blacklist

allegro · Feb 5, 2025 · 960ce32 · 960ce32
2 parents 1e96c78 + 1a912ce
commit 960ce32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...s-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java b/...s-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java
@@ -35,7 +35,13 @@ public ConsumerHttpServer(
         "/status/subscriptionsCount",
         (exchange) -> respondWithObject(exchange, mapper, monitor.check(SUBSCRIPTIONS_COUNT)));
     server.createContext(
-        "/status/prometheus", (exchange) -> respondWithString(exchange, meterRegistry.scrape()));
+        "/status/prometheus",
+        (exchange) -> {
+          exchange
+              .getResponseHeaders()
+              .add("Content-Type", "text/plain;version=0.0.4;charset=utf-8");
+          respondWithString(exchange, meterRegistry.scrape());
+        });
   }
 
   private HttpServer createServer(int port) throws IOException {

diff --git a/...ontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java b/...ontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java
@@ -5,17 +5,20 @@
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
+import io.undertow.util.HttpString;
 
 public class PrometheusMetricsHandler implements HttpHandler {
 
   private final PrometheusMeterRegistry meterRegistry;
+  private static final HttpString httpString = new HttpString("Content-Type");
 
   public PrometheusMetricsHandler(PrometheusMeterRegistry meterRegistry) {
     this.meterRegistry = meterRegistry;
   }
 
   @Override
   public void handleRequest(HttpServerExchange exchange) {
+    exchange.getResponseHeaders().add(httpString, "text/plain;version=0.0.4;charset=utf-8");
     response(exchange, OK, meterRegistry.scrape());
   }