Skip to content

Commit 6121922

Browse files
fix(deps): update protobuf monorepo (#1566)
This PR contains the following updates: | Package | Type | Update | Change | Age | Confidence | |---|---|---|---|---|---| | [protoc](https://redirect.github.com/protocolbuffers/protobuf) | | minor | `32.0` -> `32.1` | [![age](https://developer.mend.io/api/mc/badges/age/github-releases/protocolbuffers%2fprotobuf/32.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/github-releases/protocolbuffers%2fprotobuf/32.0/32.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.32.0` -> `4.32.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.protobuf:protobuf-java/4.32.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.32.0/4.32.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> ### [`v32.1`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v32.1): Protocol Buffers v32.1 [Compare Source](https://redirect.github.com/protocolbuffers/protobuf/compare/v32.0...v32.1) ### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ### Compiler - Ship all option dependencies to plugins along with regular ones. ([`34d6c85`](https://redirect.github.com/protocolbuffers/protobuf/commit/34d6c85206e33cb9620fcc9fe882111864020d72)) - Unify plugin and built-in generators to use request/response interface ([`b98f6ee`](https://redirect.github.com/protocolbuffers/protobuf/commit/b98f6ee02113550c1bc7bacbde9909724532723e)) - Disable symbol visibility enforcement by default in C++ runtime ([`aad0daa`](https://redirect.github.com/protocolbuffers/protobuf/commit/aad0daacdf3dbaf3bdd0381115231975c28b789d)) ### C++ - Disable symbol visibility enforcement by default in C++ runtime ([`aad0daa`](https://redirect.github.com/protocolbuffers/protobuf/commit/aad0daacdf3dbaf3bdd0381115231975c28b789d)) ### Java - Fix handling of optional dependencies in java generator. ([`892e0d5`](https://redirect.github.com/protocolbuffers/protobuf/commit/892e0d526e9478814fdedbc576d65ea55c5f71dd)) - Restore Protobuf Java extension modifiers in gencode that were previously removed in [`7bff169`](https://redirect.github.com/protocolbuffers/protobuf/commit/7bff169d32710b143951ec6ce2c4ea9a56e2ad24) ([`4a18be6`](https://redirect.github.com/protocolbuffers/protobuf/commit/4a18be6f448dd5b29026864f4642ef63fe90d83a)) - Restore ABI compatibility for extension methods which was previously (knowingly) broken with 4.x: [`94a2a44`](https://redirect.github.com/protocolbuffers/protobuf/commit/94a2a448518403341b8aa71335ab1123fbdcccd8) ([`501f4a5`](https://redirect.github.com/protocolbuffers/protobuf/commit/501f4a52207aebd9642c9f005d27fa6d1011e89f)) - Cherrypick test improvements ([`d365736`](https://redirect.github.com/protocolbuffers/protobuf/commit/d365736f4f6e4e496deca7051b5fa574c52cc45f)) - Fix handling of optional dependencies in java generator. ([`9325480`](https://redirect.github.com/protocolbuffers/protobuf/commit/9325480155d79a31985ba54a7f07864dc80389c3)) - Ship all option dependencies to plugins along with regular ones. ([`34d6c85`](https://redirect.github.com/protocolbuffers/protobuf/commit/34d6c85206e33cb9620fcc9fe882111864020d72)) - Unify plugin and built-in generators to use request/response interface ([`b98f6ee`](https://redirect.github.com/protocolbuffers/protobuf/commit/b98f6ee02113550c1bc7bacbde9909724532723e)) ### Csharp - Regenerate stale files ([`299774c`](https://redirect.github.com/protocolbuffers/protobuf/commit/299774c2c31bb9bdfd1304489a366f358f394ba8)) ### PHP - Fix: remove provide from composer.json ([`bc5f303`](https://redirect.github.com/protocolbuffers/protobuf/commit/bc5f3034da72f8703c1b81eab7b994d94d5faa59)) </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. --- - [ ] <!-- rebase-check -->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). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> --------- Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
1 parent 5ee9d5d commit 6121922

File tree

12 files changed

+919
-919
lines changed

12 files changed

+919
-919
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_0.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.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_0.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.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_0.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
77
import java.io.IOException;
88
import java.net.URL;
99
import java.util.List;

mise.toml

Lines changed: 2 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-21.0.8+9.0.LTS"
55
lychee = "0.20.1"
6-
protoc = "32.0"
6+
protoc = "32.1"
77

88
[tasks.ci]
99
description = "CI Build"
@@ -25,7 +25,7 @@ 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 install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
28+
run = "./mvnw clean install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
2929
env.PROTO_GENERATION = "true"
3030

3131
[tasks.test]

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<properties>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2525
<automatic.module.name>--module-name-need-to-be-overridden--</automatic.module.name>
26-
<protobuf-java.version>4.32.0</protobuf-java.version>
26+
<protobuf-java.version>4.32.1</protobuf-java.version>
2727
<guava.version>33.4.8-jre</guava.version>
2828
<junit-jupiter.version>5.13.4</junit-jupiter.version>
2929
<otel.instrumentation.version>2.16.0-alpha</otel.instrumentation.version>

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_0.Metrics;
12+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.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_0.Metrics;
14+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.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_0.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.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/generate-protobuf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACK
3838
if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
3939
echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
4040
echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
41-
echo "Generated protobuf sources are not up-to-date. Please run 'mise self-update && mise up && mise run generate' and commit the changes."
41+
echo "Generated protobuf sources are not up-to-date. Please run 'mise run generate' and commit the changes."
4242
exit 1
4343
fi
4444

4545
STATUS=$(git status --porcelain)
4646
if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then
4747
echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
48-
echo "Generated protobuf sources are not up-to-date. Please run 'mise self-update && mise up && mise run generate' and commit the changes."
48+
echo "Generated protobuf sources are not up-to-date. Please run 'mise run generate' and commit the changes."
4949
echo "Local changes:"
5050
echo "$STATUS"
5151
exit 1

0 commit comments

Comments
 (0)