Skip to content

Commit 1f52452

Browse files
committed
don't validate in escape
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 47554b2 commit 1f52452

File tree

18 files changed

+504
-381
lines changed

18 files changed

+504
-381
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package io.prometheus.metrics.expositionformats.internal;
22

3-
import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
43
import static io.prometheus.metrics.expositionformats.internal.ProtobufUtil.timestampFromMillis;
4+
import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
55

66
import com.google.protobuf.TextFormat;
77
import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
8-
import io.prometheus.metrics.expositionformats.SnapshotEscaper;
98
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
109
import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
1110
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -22,6 +21,7 @@
2221
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
2322
import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
2423
import io.prometheus.metrics.model.snapshots.Quantiles;
24+
import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
2525
import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
2626
import io.prometheus.metrics.model.snapshots.SummarySnapshot;
2727
import io.prometheus.metrics.model.snapshots.UnknownSnapshot;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package io.prometheus.metrics.expositionformats;
22

3-
import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getMetadataName;
4-
import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
53
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeDouble;
64
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeEscapedString;
75
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLabels;
86
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLong;
97
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
108
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeOpenMetricsTimestamp;
9+
import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getMetadataName;
10+
import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
1111

1212
import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
1313
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -25,6 +25,7 @@
2525
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
2626
import io.prometheus.metrics.model.snapshots.PrometheusNaming;
2727
import io.prometheus.metrics.model.snapshots.Quantile;
28+
import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
2829
import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
2930
import io.prometheus.metrics.model.snapshots.SummarySnapshot;
3031
import io.prometheus.metrics.model.snapshots.UnknownSnapshot;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.prometheus.metrics.expositionformats;
22

3-
import static io.prometheus.metrics.expositionformats.SnapshotEscaper.escapeMetricSnapshot;
4-
import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getMetadataName;
5-
import static io.prometheus.metrics.expositionformats.SnapshotEscaper.getSnapshotLabelName;
63
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeDouble;
74
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeEscapedString;
85
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLabels;
96
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLong;
107
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
118
import static io.prometheus.metrics.expositionformats.TextFormatUtil.writePrometheusTimestamp;
9+
import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.escapeMetricSnapshot;
10+
import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getMetadataName;
11+
import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
1212

1313
import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
1414
import io.prometheus.metrics.model.snapshots.CounterSnapshot;

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

Lines changed: 0 additions & 303 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.prometheus.metrics.model.snapshots.EscapingScheme;
44
import io.prometheus.metrics.model.snapshots.Labels;
55
import io.prometheus.metrics.model.snapshots.PrometheusNaming;
6+
import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
67
import java.io.IOException;
78
import java.io.Writer;
89

0 commit comments

Comments
 (0)