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 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 }