Merge pull request #30959 from geoand/micrometer-metrics-html

geoand · web-flow · commit c44d6f4b2fc8 · 2023-02-08T07:56:45.000+02:00
Return text from /q/metrics when the Accept header contains html
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java
@@ -52,7 +52,7 @@ private String chooseContentType(String acceptHeader) {
         if (acceptHeader == null) {
             return TextFormat.CONTENT_TYPE_OPENMETRICS_100;
         }
-        if (acceptHeader.startsWith("text/plain")) {
+        if (acceptHeader.contains("text/plain") || acceptHeader.contains("text/html")) {
             return TextFormat.CONTENT_TYPE_004;
         }
         return TextFormat.CONTENT_TYPE_OPENMETRICS_100;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private String chooseContentType(String acceptHeader) {`
`52`	`52`	`if (acceptHeader == null) {`
`53`	`53`	`return TextFormat.CONTENT_TYPE_OPENMETRICS_100;`
`54`	`54`	`}`
`55`		`- if (acceptHeader.startsWith("text/plain")) {`
	`55`	`+ if (acceptHeader.contains("text/plain") \|\| acceptHeader.contains("text/html")) {`
`56`	`56`	`return TextFormat.CONTENT_TYPE_004;`
`57`	`57`	`}`
`58`	`58`	`return TextFormat.CONTENT_TYPE_OPENMETRICS_100;`