From 818933007635590032a866929571fe4115e82d11 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 26 Aug 2025 06:51:44 +0000 Subject: [PATCH 1/2] Update dependency io.prometheus:prometheus-metrics-exposition-textformats to v1.4.1 --- prometheus-metrics-exposition-formats-no-protobuf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus-metrics-exposition-formats-no-protobuf/pom.xml b/prometheus-metrics-exposition-formats-no-protobuf/pom.xml index 37639fd..c021724 100644 --- a/prometheus-metrics-exposition-formats-no-protobuf/pom.xml +++ b/prometheus-metrics-exposition-formats-no-protobuf/pom.xml @@ -53,7 +53,7 @@ io.prometheus prometheus-metrics-exposition-textformats - 1.3.10 + 1.4.1 From 4477fc0d6dcfa88cbeb0a99bc766b21ae0f8d898 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 26 Aug 2025 08:56:56 +0200 Subject: [PATCH 2/2] Adopt upstream changes --- .../metrics/expositionformats/ExpositionFormats.java | 12 +++++++++--- .../expositionformats/PrometheusProtobufWriter.java | 7 +++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java b/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java index cb44731..438577a 100644 --- a/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java +++ b/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java @@ -46,13 +46,19 @@ public static ExpositionFormats init() return init(PrometheusProperties.get().getExporterProperties()); } + @SuppressWarnings("deprecation") public static ExpositionFormats init(final ExporterProperties properties) { return new ExpositionFormats( null, - new PrometheusTextFormatWriter(properties.getIncludeCreatedTimestamps()), - new OpenMetricsTextFormatWriter( - properties.getIncludeCreatedTimestamps(), properties.getExemplarsOnAllMetricTypes())); + PrometheusTextFormatWriter.builder() + .setIncludeCreatedTimestamps(properties.getIncludeCreatedTimestamps()) + .setTimestampsInMs(properties.getPrometheusTimestampsInMs()) + .build(), + OpenMetricsTextFormatWriter.builder() + .setCreatedTimestampsEnabled(properties.getIncludeCreatedTimestamps()) + .setExemplarsOnAllMetricTypesEnabled(properties.getExemplarsOnAllMetricTypes()) + .build()); } public ExpositionFormatWriter findWriter(final String acceptHeader) diff --git a/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java b/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java index fc09e37..e37b2bf 100644 --- a/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java +++ b/prometheus-metrics-exposition-formats-no-protobuf/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java @@ -15,9 +15,9 @@ */ package io.prometheus.metrics.expositionformats; -import java.io.IOException; import java.io.OutputStream; +import io.prometheus.metrics.config.EscapingScheme; import io.prometheus.metrics.model.snapshots.MetricSnapshots; @@ -40,7 +40,10 @@ public String getContentType() } @Override - public void write(final OutputStream out, final MetricSnapshots metricSnapshots) throws IOException + public void write( + final OutputStream out, + final MetricSnapshots metricSnapshots, + final EscapingScheme escapingScheme) { // Do nothing }