Skip to content

Commit 3133f66

Browse files
Update protobuf monorepo (#1402)
This PR contains the following updates: | Package | Type | Update | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---|---|---| | [protoc](https://redirect.github.com/protocolbuffers/protobuf) | | minor | `31.0` -> `31.1` | [![age](https://developer.mend.io/api/mc/badges/age/github-releases/protocolbuffers%2fprotobuf/31.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/github-releases/protocolbuffers%2fprotobuf/31.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/github-releases/protocolbuffers%2fprotobuf/31.0/31.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/github-releases/protocolbuffers%2fprotobuf/31.0/31.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.31.0` -> `4.31.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.protobuf:protobuf-java/4.31.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.protobuf:protobuf-java/4.31.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.protobuf:protobuf-java/4.31.0/4.31.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.31.0/4.31.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the warning logs for more information. --- ### Release Notes <details> <summary>protocolbuffers/protobuf (protoc)</summary> ### [`v31.1`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v31.1): Protocol Buffers v31.1 [Compare Source](https://redirect.github.com/protocolbuffers/protobuf/compare/v31.0...v31.1) ### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ### Compiler - Support allowing late injection of language feature set defaults from FeatureSet extensions while getting feature set extension values. (protocolbuffers/protobuf@3419598) ### C++ - Support allowing late injection of language feature set defaults from FeatureSet extensions while getting feature set extension values. (protocolbuffers/protobuf@3419598) ### Java - Add missing `copts` attribute ([#&#8203;21982](https://redirect.github.com/protocolbuffers/protobuf/issues/21982)) (protocolbuffers/protobuf@bec5b5a) - Support allowing late injection of language feature set defaults from FeatureSet extensions while getting feature set extension values. (protocolbuffers/protobuf@3419598) ### Python - Support allowing late injection of language feature set defaults from FeatureSet extensions while getting feature set extension values. (protocolbuffers/protobuf@3419598) - Python pyi print "import datetime" for Duration/Timestamp field ([#&#8203;21885](https://redirect.github.com/protocolbuffers/protobuf/issues/21885)) (protocolbuffers/protobuf@0fe099a) - Add recursion depth limits to pure python (protocolbuffers/protobuf@a3921fb) ### Other - Fix cmake staleness test (protocolbuffers/protobuf@96a9ef6) </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:eyJjcmVhdGVkSW5WZXIiOiI0MC4zMy42IiwidXBkYXRlZEluVmVyIjoiNDAuMzMuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- 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 c743d50 commit 3133f66

File tree

12 files changed

+922
-917
lines changed

12 files changed

+922
-917
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_31_0.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_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_31_0.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_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_31_0.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
77
import java.io.IOException;
88
import java.net.URL;
99
import java.util.List;

mise.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"go:github.com/grafana/oats" = "0.3.1"
55
java = "temurin-21.0.7+6.0.LTS"
66
lychee = "0.18.1"
7-
protoc = "31.0"
7+
protoc = "31.1"
88

99
[tasks.ci]
1010
description = "CI Build"
@@ -20,6 +20,11 @@ run = "./mvnw spotless:apply"
2020
description = "bare compile, ignoring formatting and linters"
2121
run = "./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
2222

23+
[tasks.generate]
24+
description = "bare compile, ignoring formatting and linters"
25+
run = "./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
26+
env.PROTO_GENERATION = "true"
27+
2328
[tasks.test]
2429
description = "run unit tests, ignoring formatting and linters"
2530
run = "./mvnw test -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"

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.31.0</protobuf-java.version>
26+
<protobuf-java.version>4.31.1</protobuf-java.version>
2727
<guava.version>33.4.8-jre</guava.version>
2828
<junit-jupiter.version>5.12.2</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
@@ -6,7 +6,7 @@
66
import static org.assertj.core.data.Offset.offset;
77

88
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
9-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
1010
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1111
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1212
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
@@ -8,7 +8,7 @@
88
import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
99
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
1010
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
11-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
11+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
1212
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1313
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1414
import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;

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
@@ -4,7 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
55

66
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
88
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
99
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1010
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 up && mise run test' and commit the changes."
41+
echo "Generated protobuf sources are not up-to-date. Please run 'mise up && mise run generater' 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 run test' 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)