Bump com.google.protobuf:protobuf-java from 4.30.0 to 4.30.1

.github/workflows/build.yml

@@ -11,8 +11,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - name: Setup ASDF
-        uses: equisoft-actions/with-asdf-vm@v2
+      - uses: jdx/mise-action@v2
       - name: Cache local Maven repository
         uses: actions/cache@v4
         with:
@@ -24,7 +23,5 @@ jobs:
         env:
           PROTO_GENERATION: true
           REQUIRE_PROTO_UP_TO_DATE: true
-        run: |
-          mvn -v
-          ./mvnw clean install
-          ./mvnw javadoc:javadoc -P javadoc # just to check if javadoc is generated
+        run: mise run ci
+

CONTRIBUTING.md

@@ -30,6 +30,8 @@ If you're getting errors when running tests:
 - Use `-Dcheckstyle.skip=true` to skip the checkstyle check during development.
 - Use `-Dwarnings=-nowarn` to skip the warnings during development.
 
+Combine all with `mvn test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn`.
+
 ## Updating the Protobuf Java Classes
 
 Use `PROTO_GENERATION=true mvn clean install` 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_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.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_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.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_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;

mise.toml

@@ -0,0 +1,15 @@
+[env]
+PROTO_GENERATION = "true"
+
+[tools]
+java = "temurin-17.0.13+11"
+protoc = "30.1"
+
+[tasks.ci]
+description = "CI Build"
+run = [
+    "./mvnw clean install",
+    # just to check if javadoc can be generated
+    "./mvnw javadoc:javadoc -P javadoc"
+]
+env = { PROTO_GENERATION = "true", REQUIRE_PROTO_UP_TO_DATE = "true" }

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_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.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_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.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_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.Labels;

prometheus-metrics-exposition-formats/generate-protobuf.sh

@@ -36,15 +36,15 @@ GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACK
 
 if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
   echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
-  echo "Please update the protoc version .tool-versions to the latest version of https://github.com/protocolbuffers/protobuf/releases"
-  echo "Please use https://github.com/asdf-vm/asdf - this will use the version specified in .tool-versions"
-  echo "Generated protobuf sources are not up-to-date. Please run 'PROTO_GENERATION=true mvn clean install' and commit the changes."
+  echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
+  echo "Generated protobuf sources are not up-to-date. Please run 'mise up && mvn clean install' and commit the changes."
   exit 1
 fi
 
 STATUS=$(git status --porcelain)
 if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then
-  echo "Generated protobuf sources are not up-to-date. Please run 'PROTO_GENERATION=true mvn clean install' and commit the changes."
+  echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
+  echo "Generated protobuf sources are not up-to-date. Please run 'mvn clean install' and commit the changes."
   echo "Local changes:"
   echo "$STATUS"
   exit 1

prometheus-metrics-exposition-formats/pom.xml

@@ -20,7 +20,7 @@
 
     <properties>
         <automatic.module.name>io.prometheus.metrics.expositionformats</automatic.module.name>
-        <protobuf-java.version>4.30.0</protobuf-java.version>
+        <protobuf-java.version>4.30.1</protobuf-java.version>
     </properties>
 
     <dependencies>