fix(deps): update protobuf monorepo (#1681)

renovate[bot] · zeitlinger · web-flow · commit bfbaa5f9864d · 2025-11-14T13:04:30.000Z
This PR contains the following updates: | Package | Type | Update | Change | Age | Confidence | |---|---|---|---|---|---| | [protoc](https://redirect.github.com/protocolbuffers/protobuf) | | minor | `33.0` -> `33.1` | [![age](https://developer.mend.io/api/mc/badges/age/github-releases/protocolbuffers%2fprotobuf/33.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/github-releases/protocolbuffers%2fprotobuf/33.0/33.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.protobuf:protobuf-java](https://developers.google.com/protocol-buffers/) ([source](https://redirect.github.com/protocolbuffers/protobuf)) | compile | patch | `4.33.0` -> `4.33.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.protobuf:protobuf-java/4.33.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.protobuf:protobuf-java/4.33.0/4.33.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>protocolbuffers/protobuf (protoc)</summary> ### [`v33.1`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v33.1): Protocol Buffers v33.1 [Compare Source](https://redirect.github.com/protocolbuffers/protobuf/compare/v33.0...v33.1) ### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ### C++ - Fix `Any` hasbit consistency issue in OSS. ([#&#8203;24400](https://redirect.github.com/protocolbuffers/protobuf/issues/24400)) ([`59db671`](https://redirect.github.com/protocolbuffers/protobuf/commit/59db671e945233f9acb556af43cdbb67d1d75d68)) ### Java - Expose NestedInFileClass naming helpers for Java immutable. ([#&#8203;24401](https://redirect.github.com/protocolbuffers/protobuf/issues/24401)) ([`5737cd2`](https://redirect.github.com/protocolbuffers/protobuf/commit/5737cd2bb3a4e220752b28282e70d758c0a7a95d)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/prometheus/client_java).  --------- Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml
@@ -18,4 +18,4 @@ jobs:
           version: v2025.11.3
           sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
       - name: Lint
-        run: mise run lint-rest
+        run: mise run lint:rest
diff --git a/.mise/tasks/lint/bom.py b/.mise/tasks/lint/bom.py
@@ -9,7 +9,7 @@
 from pathlib import Path
 from typing import List
 
-ROOT = Path(__file__).resolve().parents[2]  # repo root (.. from .mise/tasks)
+ROOT = Path(__file__).resolve().parents[3]  # repo root (.. from .mise/tasks/lint)
 IGNORE_DIRS = {"prometheus-metrics-parent"}
 MODULE_PREFIX = "prometheus-metrics"
 BOM_POM = ROOT / "prometheus-metrics-bom" / "pom.xml"
diff --git a/.mise/tasks/lint/super-linter.sh b/.mise/tasks/lint/super-linter.sh
diff --git a/integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java b/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;
diff --git a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java b/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;
diff --git a/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java b/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;
diff --git a/mise.toml b/mise.toml
@@ -3,7 +3,7 @@
 "go:github.com/grafana/oats" = "0.4.1"
 java = "temurin-25.0.1+8.0.LTS"
 lychee = "0.21.0"
-protoc = "33.0"
+protoc = "33.1"
 
 [tasks.ci]
 description = "CI Build"
@@ -43,13 +43,17 @@ run = "./mvnw verify"
 description = "build all modules without tests"
 run = "./mvnw install -DskipTests -Dcoverage.skip=true"
 
-[tasks.lint-links]
+[tasks."lint:links"]
 description = "Lint markdown links"
 run = "lychee --include-fragments ."
 
-[tasks.lint-rest]
+[tasks."lint:rest"]
 description = "All lints not covered by super linter"
-depends = ["lint-links", "lint-bom"]
+depends = ["lint:links", "lint:bom"]
+
+[tasks."lint:all"]
+description = "All lints"
+depends = ["lint:rest", "lint:super-linter"]
 
 [tasks.acceptance-test]
 description = "Run OATs acceptance tests"
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <automatic.module.name>--module-name-need-to-be-overridden--</automatic.module.name>
-    <protobuf-java.version>4.33.0</protobuf-java.version>
+    <protobuf-java.version>4.33.1</protobuf-java.version>
     <guava.version>33.5.0-jre</guava.version>
     <junit-jupiter.version>6.0.1</junit-jupiter.version>
     <otel.instrumentation.version>2.16.0-alpha</otel.instrumentation.version>
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java b/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;
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java b/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.*;
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java b/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;
diff --git a/prometheus-metrics-exposition-formats/generate-protobuf.sh b/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
diff --git a/prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_1/Metrics.java b/prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_1/Metrics.java
diff --git a/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java
diff --git a/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java
