Skip to content

Commit dcd82df

Browse files
committed
update
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 3feeda9 commit dcd82df

File tree

10 files changed

+958
-955
lines changed

10 files changed

+958
-955
lines changed

integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThat;
55
import static org.assertj.core.api.Assertions.fail;
66

7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
88
import java.io.ByteArrayInputStream;
99
import java.io.IOException;
1010
import java.io.InputStream;

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import com.google.common.io.Resources;
77
import io.prometheus.client.it.common.ExporterTest;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
99
import java.io.IOException;
1010
import java.net.URISyntaxException;
1111
import java.net.URLEncoder;

integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import io.prometheus.client.it.common.ExporterTest;
6-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
77
import java.io.IOException;
88
import java.net.URI;
99
import java.util.List;

mise.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"go:github.com/grafana/oats" = "0.4.1"
44
java = "temurin-25.0.1+8.0.LTS"
55
lychee = "0.21.0"
6-
protoc = "32.1"
6+
protoc = "33.0"
77

88
[tasks.ci]
99
description = "CI Build"
@@ -25,7 +25,10 @@ run = "./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=tru
2525

2626
[tasks.generate]
2727
description = "bare compile, ignoring formatting and linters"
28-
run = "./mvnw clean install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
28+
run = [
29+
"mise use --pin protoc@latest",
30+
"./mvnw clean install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
31+
]
2932
env.PROTO_GENERATION = "true"
3033

3134
[tasks.test]

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.prometheus.metrics.config.MetricsProperties;
1010
import io.prometheus.metrics.config.PrometheusProperties;
1111
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
12-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
12+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
1313
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1414
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1515
import io.prometheus.metrics.model.snapshots.CounterSnapshot;

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
1212
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
1313
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
14-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
14+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
1515
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1616
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1717
import io.prometheus.metrics.model.snapshots.*;

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import io.prometheus.metrics.config.EscapingScheme;
77
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
99
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1010
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1111
import io.prometheus.metrics.model.snapshots.Labels;

prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_32_1/Metrics.java renamed to prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_0/Metrics.java

Lines changed: 945 additions & 945 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.google.protobuf.TextFormat;
77
import io.prometheus.metrics.config.EscapingScheme;
88
import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
9-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
1010
import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
1111
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
1212
import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import io.prometheus.metrics.config.EscapingScheme;
6-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
77
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
88
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
99
import io.prometheus.metrics.model.snapshots.MetricSnapshot;

0 commit comments

Comments
 (0)