diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2022-09-13 17:50:13 +0200 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2022-09-13 17:50:13 +0200 |
commit | 5fa962c6ebc91dfb9e8a90073de7882b6e686a19 (patch) | |
tree | a959f462a5f364b460930f76d45a0c6e3e13d010 /container-core/src/main/java | |
parent | 2f325645ed04b978b84d2949ec860f2c0d722c58 (diff) |
Use correct content-type header. Add whitespace
Diffstat (limited to 'container-core/src/main/java')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java | 9 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java index 480ee96393a..df4f4bcb9ea 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java @@ -83,7 +83,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { @Override protected Response newResponse() { Response response = new Response(Response.Status.OK); - response.headers().add(HttpHeaders.Names.CONTENT_TYPE, "application/json"); + response.headers().add(HttpHeaders.Names.CONTENT_TYPE, getContentType(request.getUri().getQuery())); return response; } @@ -225,4 +225,11 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { } } + private String getContentType(String query) { + if ("format=prometheus".equals(query)) { + return "text/plain;charset=utf-8"; + } + return "application/json"; + } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java index ca12e8161a9..43aaba555ab 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java @@ -13,7 +13,7 @@ import static com.yahoo.container.jdisc.state.JsonUtil.sanitizeDouble; */ public class PrometheusHelper { - private static final String HELP_LINE = "# HELP %s\n# TYPE %s untyped\n"; + private static final String HELP_LINE = "# HELP %s \n# TYPE %s untyped\n"; private static final String METRIC_LINE = "%s{%s} %s %d\n"; protected static byte[] buildPrometheusOutput(MetricSnapshot metricSnapshot, String application, long timestamp) throws IOException { |