move snapshot escaper

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java

@@ -1,10 +1,11 @@
 package io.prometheus.metrics.expositionformats.internal;
 
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
 import static io.prometheus.metrics.expositionformats.internal.ProtobufUtil.timestampFromMillis;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
 
 import com.google.protobuf.TextFormat;
 import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
+import io.prometheus.metrics.expositionformats.SnapshotEscaper;
 import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -21,7 +22,6 @@
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.Quantiles;
-import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
 import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
 import io.prometheus.metrics.model.snapshots.SummarySnapshot;
 import io.prometheus.metrics.model.snapshots.UnknownSnapshot;

prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java

@@ -7,16 +7,14 @@
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
-import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
 
 class ProtobufExpositionFormatsTest extends ExpositionFormatsTest {
 
   @Override
   protected void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot) {
     PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
     Metrics.MetricFamily protobufData =
-        writer.convert(
-            snapshot, EscapingScheme.UNDERSCORE_ESCAPING);
+        writer.convert(snapshot, EscapingScheme.UNDERSCORE_ESCAPING);
     String actual = ProtobufUtil.shortDebugString(protobufData);
     assertThat(actual).isEqualTo(expected);
   }

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java

@@ -1,13 +1,13 @@
 package io.prometheus.metrics.expositionformats;
 
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getMetadataName;
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeDouble;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeEscapedString;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLabels;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLong;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeOpenMetricsTimestamp;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getMetadataName;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
 
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -25,7 +25,6 @@
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 import io.prometheus.metrics.model.snapshots.Quantile;
-import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
 import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
 import io.prometheus.metrics.model.snapshots.SummarySnapshot;
 import io.prometheus.metrics.model.snapshots.UnknownSnapshot;

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java

@@ -1,14 +1,14 @@
 package io.prometheus.metrics.expositionformats;
 
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.escapeMetricSnapshot;
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getMetadataName;
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeDouble;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeEscapedString;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLabels;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLong;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writePrometheusTimestamp;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.escapeMetricSnapshot;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getMetadataName;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
 
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;

…ics/model/snapshots/SnapshotEscaper.java …s/expositionformats/SnapshotEscaper.javaprometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SnapshotEscaper.java renamed to prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/SnapshotEscaper.java prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SnapshotEscaper.java renamed to prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/SnapshotEscaper.java

@@ -1,5 +1,21 @@
-package io.prometheus.metrics.model.snapshots;
+package io.prometheus.metrics.expositionformats;
 
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.EscapingScheme;
+import io.prometheus.metrics.model.snapshots.Exemplar;
+import io.prometheus.metrics.model.snapshots.Exemplars;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.InfoSnapshot;
+import io.prometheus.metrics.model.snapshots.Label;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.PrometheusNaming;
+import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
+import io.prometheus.metrics.model.snapshots.SummarySnapshot;
+import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -203,7 +219,6 @@ private static DataPointSnapshot createEscapedDataPointSnapshot(
           .nativeBucketsForNegativeValues(
               ((HistogramSnapshot.HistogramDataPointSnapshot) d)
                   .getNativeBucketsForNegativeValues())
-          .count(((HistogramSnapshot.HistogramDataPointSnapshot) d).getCount())
           .sum(((HistogramSnapshot.HistogramDataPointSnapshot) d).getSum())
           .exemplars(
               escapeExemplars(

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java

@@ -3,7 +3,6 @@
 import io.prometheus.metrics.model.snapshots.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.PrometheusNaming;
-import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
 import java.io.IOException;
 import java.io.Writer;
 

…model/snapshots/SnapshotEscaperTest.java …positionformats/SnapshotEscaperTest.javaprometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotEscaperTest.java renamed to prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/SnapshotEscaperTest.java prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotEscaperTest.java renamed to prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/SnapshotEscaperTest.java

@@ -1,9 +1,18 @@
-package io.prometheus.metrics.model.snapshots;
+package io.prometheus.metrics.expositionformats;
 
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.escapeMetricSnapshot;
-import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.escapeMetricSnapshot;
+import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.EscapingScheme;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.Label;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import java.util.Objects;
 import org.junit.jupiter.api.Test;
 
 class SnapshotEscaperTest {
@@ -12,7 +21,7 @@ class SnapshotEscaperTest {
   public void testEscapeMetricSnapshotEmpty() {
     MetricSnapshot original = CounterSnapshot.builder().name("empty").build();
     MetricSnapshot got = escapeMetricSnapshot(original, EscapingScheme.VALUE_ENCODING_ESCAPING);
-    assertThat(got.getMetadata().getName()).isEqualTo("empty");
+    assertThat(Objects.requireNonNull(got).getMetadata().getName()).isEqualTo("empty");
     assertThat(original.getMetadata().getName()).isEqualTo("empty");
   }