Adding the right MediaTypes for Prometheus

This seems like a hack and Producible seems weird. fixes spring-projectsgh-28130
jonatan-ivanov · Sep 25, 2021 · b16f10f · b16f10f
1 parent 8c8f278
commit b16f10f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.../org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java b/.../org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java
@@ -56,7 +56,7 @@ public WebEndpointResponse<String> scrape(TextOutputFormat format, @Nullable Set
 					? this.collectorRegistry.filteredMetricFamilySamples(includedNames)
 					: this.collectorRegistry.metricFamilySamples();
 			format.write(writer, samples);
-			return new WebEndpointResponse<>(writer.toString(), format);
+			return new WebEndpointResponse<>(writer.toString(), format.getContentType());
 		}
 		catch (IOException ex) {
 			// This actually never happens since StringWriter doesn't throw an IOException

diff --git a/...ain/java/org/springframework/boot/actuate/metrics/export/prometheus/TextOutputFormat.java b/...ain/java/org/springframework/boot/actuate/metrics/export/prometheus/TextOutputFormat.java
@@ -24,6 +24,7 @@
 import io.prometheus.client.exporter.common.TextFormat;
 
 import org.springframework.boot.actuate.endpoint.Producible;
+import org.springframework.http.MediaType;
 import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 
@@ -38,7 +39,7 @@ public enum TextOutputFormat implements Producible<TextOutputFormat> {
 	/**
 	 * OpenMetrics text version 1.0.0.
 	 */
-	CONTENT_TYPE_OPENMETRICS_100(TextFormat.CONTENT_TYPE_OPENMETRICS_100) {
+	CONTENT_TYPE_OPENMETRICS_100("application/openmetrics-text") {
 
 		@Override
 		void write(Writer writer, Enumeration<MetricFamilySamples> samples) throws IOException {
@@ -50,7 +51,7 @@ void write(Writer writer, Enumeration<MetricFamilySamples> samples) throws IOExc
 	/**
 	 * Prometheus text version 0.0.4.
 	 */
-	CONTENT_TYPE_004(TextFormat.CONTENT_TYPE_004) {
+	CONTENT_TYPE_004(MediaType.TEXT_PLAIN_VALUE) {
 
 		@Override
 		void write(Writer writer, Enumeration<MetricFamilySamples> samples) throws IOException {
@@ -61,15 +62,22 @@ void write(Writer writer, Enumeration<MetricFamilySamples> samples) throws IOExc
 
 	private final MimeType mimeType;
 
+	private final MimeType contentType;
+
 	TextOutputFormat(String mimeType) {
 		this.mimeType = MimeTypeUtils.parseMimeType(mimeType);
+		this.contentType = MimeTypeUtils.parseMimeType(TextFormat.chooseContentType(mimeType));
 	}
 
 	@Override
 	public MimeType getProducedMimeType() {
 		return this.mimeType;
 	}
 
+	MimeType getContentType() {
+		return this.contentType;
+	}
+
 	abstract void write(Writer writer, Enumeration<MetricFamilySamples> samples) throws IOException;
 
 }