update protobuf

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

Author: zeitlinger

.github/workflows/build.yml

@@ -20,8 +20,5 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Run the Maven verify phase
-        env:
-          PROTO_GENERATION: true
-          REQUIRE_PROTO_UP_TO_DATE: true
         run: mise run ci
 

CONTRIBUTING.md

@@ -34,4 +34,4 @@ Combine all with `./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcove
 
 ## Updating the Protobuf Java Classes
 
-Use `PROTO_GENERATION=true mvn clean install` to generate protobuf classes.
+Use `mise up && mise run test` to generate protobuf classes.

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

@@ -4,7 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;

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

@@ -5,7 +5,7 @@
 
 import com.google.common.io.Resources;
 import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;

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

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;

mise.lock

@@ -0,0 +1,10 @@
+[tools.java]
+version = "temurin-17.0.13+11"
+backend = "core:java"
+
+[tools.protoc]
+version = "30.2"
+backend = "aqua:protocolbuffers/protobuf/protoc"
+
+[tools.protoc.checksums]
+"protoc-30.2-linux-x86_64.zip" = "sha256:327e9397c6fb3ea2a542513a3221334c6f76f7aa524a7d2561142b67b312a01f"

mise.toml

@@ -3,7 +3,7 @@ PROTO_GENERATION = "true"
 
 [tools]
 java = "temurin-17.0.13+11"
-protoc = "30.1"
+protoc = "latest"
 
 [tasks.ci]
 description = "CI Build"
@@ -12,7 +12,7 @@ run = [
     # just to check if javadoc can be generated
     "./mvnw javadoc:javadoc -P javadoc"
 ]
-env = { PROTO_GENERATION = "true", REQUIRE_PROTO_UP_TO_DATE = "true" }
+env = { REQUIRE_PROTO_UP_TO_DATE = "true" }
 
 [tasks.format]
 description = "format source code"
@@ -25,3 +25,4 @@ run = "./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=t
 [tasks.test-all]
 description = "run all tests"
 run = "./mvnw verify"
+

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

@@ -6,7 +6,7 @@
 import static org.assertj.core.data.Offset.offset;
 
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;

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

@@ -8,7 +8,7 @@
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;

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

@@ -4,7 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.Labels;