update protobuf

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

Author: zeitlinger

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_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_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_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_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_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_1.Metrics;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;

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

@@ -9,7 +9,7 @@
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_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

@@ -11,7 +11,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_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_1.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.*;

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

@@ -5,7 +5,7 @@
 
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_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

@@ -35,17 +35,24 @@ sed -i -e $'$a\\\n//CHECKSTYLE:ON: checkstyle' "$(find src/main/generated/io -ty
 
 GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACKAGE//\.//}"/Metrics.java)
 
-if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
-	echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
+function help() {
 	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 run generate' and commit the changes."
+	echo "NOTE:"
+	echo "1. You should only run 'mise run generate' in a PR from renovate"
+	echo "2. The PR should update both '<protobuf-java.version>' in pom.xml and protoc in mise.toml"
+	echo "   - but at least <protobuf-java.version>. If not, wait until renovate updates the PR."
+}
+
+if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
+	echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
+	help
 	exit 1
 fi
 
 STATUS=$(git status --porcelain)
 if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then
-	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 run generate' and commit the changes."
+	help
 	echo "Local changes:"
 	echo "$STATUS"
 	exit 1

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

@@ -6,7 +6,7 @@
 import com.google.protobuf.TextFormat;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_1.Metrics;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;

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

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.metrics.config.EscapingScheme;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_1.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;