Skip to content

Commit aed3439

Browse files
fix(deps): update protobuf monorepo (#1724)
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.1` -> `33.2` | ![age](https://developer.mend.io/api/mc/badges/age/github-releases/protocolbuffers%2fprotobuf/33.2?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/github-releases/protocolbuffers%2fprotobuf/33.1/33.2?slim=true) | | [com.google.protobuf:protobuf-java](https://developers.google.com/protocol-buffers/) ([source](https://redirect.github.com/protocolbuffers/protobuf)) | compile | patch | `4.33.1` -> `4.33.2` | ![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.protobuf:protobuf-java/4.33.2?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.protobuf:protobuf-java/4.33.1/4.33.2?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.2`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v33.2): Protocol Buffers v33.2 [Compare Source](https://redirect.github.com/protocolbuffers/protobuf/compare/v33.1...v33.2) ### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ### Compiler - Add EDITION\_UNSTABLE for new edition development ([`9247790`](https://redirect.github.com/protocolbuffers/protobuf/commit/92477901aa6738251d8dc208f9ebfcc761f24bc6)) - Fix a bug with custom features outside of the `pb` package. ([`483173d`](https://redirect.github.com/protocolbuffers/protobuf/commit/483173ddc3d18d230c806f6c7a9d170375431c1b)) - Reserving a declaration for the Impress proto plugin. ([`8a0b438`](https://redirect.github.com/protocolbuffers/protobuf/commit/8a0b43826665857284432afa087637f3d2539a05)) ### C++ - Remove unnecessary uses of future changes to descriptor.proto ([`50c9e62`](https://redirect.github.com/protocolbuffers/protobuf/commit/50c9e62526b7050b94993b8547e6fbd1c8b55625)) - Fix a bug with custom features outside of the `pb` package. ([`483173d`](https://redirect.github.com/protocolbuffers/protobuf/commit/483173ddc3d18d230c806f6c7a9d170375431c1b)) ### Java - Fix a bug with custom features outside of the `pb` package. ([`483173d`](https://redirect.github.com/protocolbuffers/protobuf/commit/483173ddc3d18d230c806f6c7a9d170375431c1b)) ### Csharp - Add EDITION\_UNSTABLE for new edition development ([`9247790`](https://redirect.github.com/protocolbuffers/protobuf/commit/92477901aa6738251d8dc208f9ebfcc761f24bc6)) - Use generic Marshal.SizeOf when possible ([#&#8203;21964](https://redirect.github.com/protocolbuffers/protobuf/issues/21964)) ([#&#8203;24673](https://redirect.github.com/protocolbuffers/protobuf/issues/24673)) ([`9f263cd`](https://redirect.github.com/protocolbuffers/protobuf/commit/9f263cd5ef14160b17d15bc8b40c89e86d4f7a1f)) - Regenerate stale files ([`058bffa`](https://redirect.github.com/protocolbuffers/protobuf/commit/058bffaade42d61418d369c3baef1012c9794245)) ### PHP - Add EDITION\_UNSTABLE for new edition development ([`9247790`](https://redirect.github.com/protocolbuffers/protobuf/commit/92477901aa6738251d8dc208f9ebfcc761f24bc6)) ##### PHP C-Extension - Regenerate staleness tests ([`e9f62c6`](https://redirect.github.com/protocolbuffers/protobuf/commit/e9f62c68db781f55271f09a5ab21b023d0b2556c)) - Add EDITION\_UNSTABLE for new edition development ([`9247790`](https://redirect.github.com/protocolbuffers/protobuf/commit/92477901aa6738251d8dc208f9ebfcc761f24bc6)) - Regenerate stale files ([`058bffa`](https://redirect.github.com/protocolbuffers/protobuf/commit/058bffaade42d61418d369c3baef1012c9794245)) - *See also UPB changes below, which may affect PHP C-Extension.* ### Ruby ##### Ruby C-Extension - Regenerate staleness tests ([`e9f62c6`](https://redirect.github.com/protocolbuffers/protobuf/commit/e9f62c68db781f55271f09a5ab21b023d0b2556c)) - Regenerate stale files ([`058bffa`](https://redirect.github.com/protocolbuffers/protobuf/commit/058bffaade42d61418d369c3baef1012c9794245)) - *See also UPB changes below, which may affect Ruby C-Extension.* ### UPB (Python/PHP/Ruby C-Extension) - Regenerate staleness tests ([`e9f62c6`](https://redirect.github.com/protocolbuffers/protobuf/commit/e9f62c68db781f55271f09a5ab21b023d0b2556c)) - Add BTI to branch targets when branch protection is enabled. This resolves ([`72a48f9`](https://redirect.github.com/protocolbuffers/protobuf/commit/72a48f9e626a6217d1276e4be1455a296b1e158f)) - Extract arm64 asm check ([`13ee2ce`](https://redirect.github.com/protocolbuffers/protobuf/commit/13ee2ce2cb9dabc0bb058ac1a96ae9d117b9e109)) </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:eyJjcmVhdGVkSW5WZXIiOiI0Mi4zMi4yIiwidXBkYXRlZEluVmVyIjoiNDIuMzIuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19--> --------- 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 e11fbc5 commit aed3439

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_1.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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_1.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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_1.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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.1+8.0.LTS"
55
lychee = "0.22.0"
6-
protoc = "33.1"
6+
protoc = "33.2"
77

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

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.33.1</protobuf-java.version>
26+
<protobuf-java.version>4.33.2</protobuf-java.version>
2727
<guava.version>33.5.0-jre</guava.version>
2828
<junit-jupiter.version>6.0.1</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_33_1.Metrics;
12+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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_1.Metrics;
14+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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_1.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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;
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_1.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.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)