Skip to content

Commit ba308cf

Browse files
fix(deps): update protobuf monorepo (#1835)
This PR contains the following updates: | Package | Type | Update | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---|---|---| | [protoc](https://redirect.github.com/protocolbuffers/protobuf) | | minor | `33.4` → `33.5` | ![age](https://developer.mend.io/api/mc/badges/age/github-releases/protocolbuffers%2fprotobuf/33.5?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/github-releases/protocolbuffers%2fprotobuf/33.4/33.5?slim=true) | | [com.google.protobuf:protobuf-java](https://developers.google.com/protocol-buffers/) ([source](https://redirect.github.com/protocolbuffers/protobuf)) | compile | patch | `4.33.4` → `4.33.5` | ![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.protobuf:protobuf-java/4.33.5?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.protobuf:protobuf-java/4.33.4/4.33.5?slim=true) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>protocolbuffers/protobuf (protoc)</summary> ### [`v33.5`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v33.5): Protocol Buffers v33.5 [Compare Source](https://redirect.github.com/protocolbuffers/protobuf/compare/v33.4...v33.5) ### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ### Python - Fix Any recursion depth bypass in Python json\_format.ParseDict ([#&#8203;25239](https://redirect.github.com/protocolbuffers/protobuf/issues/25239)) ([#&#8203;25586](https://redirect.github.com/protocolbuffers/protobuf/issues/25586)) ([`c4eda3e`](https://redirect.github.com/protocolbuffers/protobuf/commit/c4eda3e58680528147a4cc7e2b3c9044f795c9c9)) ### Other - Update release\_bazel\_module.yaml ([#&#8203;25509](https://redirect.github.com/protocolbuffers/protobuf/issues/25509)) ([`c3ca6a3`](https://redirect.github.com/protocolbuffers/protobuf/commit/c3ca6a37c9ba60d2b0275029f6afe809ab3124cc)) - Make BCR PRs non-draft by default. ([`9db25c1`](https://redirect.github.com/protocolbuffers/protobuf/commit/9db25c1fdfe737c00201873ef8afe4cd96d56661)) - Fix(publish-to-bcr): disable attestations ([#&#8203;24018](https://redirect.github.com/protocolbuffers/protobuf/issues/24018)) ([`c07bc2f`](https://redirect.github.com/protocolbuffers/protobuf/commit/c07bc2ff906464287c6ee140a57e5511adf901f6)) </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:eyJjcmVhdGVkSW5WZXIiOiI0Mi45Mi4xIiwidXBkYXRlZEluVmVyIjoiNDIuOTUuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19--> --------- 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>
1 parent 0852636 commit ba308cf

File tree

11 files changed

+915
-915
lines changed

11 files changed

+915
-915
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_33_4.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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_33_4.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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_33_4.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.Metrics;
77
import java.io.IOException;
88
import java.net.URI;
99
import java.util.List;

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"go:github.com/grafana/oats" = "0.6.0"
44
java = "temurin-25.0.2+10.0.LTS"
55
lychee = "0.22.0"
6-
protoc = "33.4"
6+
protoc = "33.5"
77

88
[tasks.ci]
99
description = "CI Build"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<automatic.module.name>--module-name-need-to-be-overridden--</automatic.module.name>
25-
<protobuf-java.version>4.33.4</protobuf-java.version>
25+
<protobuf-java.version>4.33.5</protobuf-java.version>
2626
<guava.version>33.5.0-jre</guava.version>
2727
<junit-jupiter.version>6.0.2</junit-jupiter.version>
2828
<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_33_4.Metrics;
12+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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_33_4.Metrics;
14+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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_33_4.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_4/Metrics.java renamed to prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_5/Metrics.java

Lines changed: 905 additions & 905 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.google.protobuf.TextFormat;
77
import io.prometheus.metrics.config.EscapingScheme;
88
import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
9-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_4.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.Metrics;
1010
import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
1111
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
1212
import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;

0 commit comments

Comments
 (0)