Skip to content

deps: bump grpc to 1.85.1, opentelemetry to 1.67.0, and guava to 33.7.2-jre - #14957

Open
mutianf wants to merge 5 commits into
googleapis:mainfrom
mutianf:b583925791-update-grpc-otel-guava
Open

mutianf wants to merge 5 commits into
googleapis:mainfrom
mutianf:b583925791-update-grpc-otel-guava

Conversation

@mutianf

@mutianf mutianf commented Nov 10, 2026

Copy link
Copy Markdown
Contributor

Upgrades gRPC to 1.85.1 (bundling Netty 4.2.17.Final to address CVE-2026-75595), OpenTelemetry to 1.67.0 (for CVE-2026-45292 and CVE-2026-118259), and Guava to 33.7.2-jre (for CVE-2026-102554) across shared dependencies and parent POMs.

….2-jre

Upgrades gRPC to 1.85.1 (bundling Netty 4.2.17.Final for CVE-2026-75595), OpenTelemetry to 1.67.0 (for CVE-2026-45292 and CVE-2026-118259), and Guava to 33.7.2-jre (for CVE-2026-102554) across shared dependencies and parent POMs.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates several dependency versions across multiple Maven POM files, configuration files, and dependency declarations. Specifically, it upgrades Guava to 33.7.2-jre, gRPC to 1.85.1, and OpenTelemetry to 1.67.0 to maintain consistency across modules. I have no feedback to provide.

…bator to 1.67.0-alpha

Bumps conscrypt-openjdk-uber to 2.8.0 so Airlock resolves the trusted version over grpc-alts 1.85.1's transitive 2.6.1, and aligns spanner-jdbc's test-scoped opentelemetry-api-incubator with opentelemetry 1.67.0.
@mutianf
mutianf marked this pull request as ready for review November 10, 2026 15:38
@mutianf
mutianf requested review from a team as code owners November 10, 2026 15:38
<awaitility.version>4.3.0</awaitility.version>
<slf4j.version>2.0.16</slf4j.version>
<conscrypt.version>2.6.2</conscrypt.version>
<conscrypt.version>2.8.0</conscrypt.version>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qq, is conscrypt bump to resolve some deps/ CI issue? I don't think I saw a CVE report for this

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's for presubmit

@lqiu96 lqiu96 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. This does bump guava + grpc. @blakeli0 any concerns with this?

Comment thread librarian.yaml
packaging: jar
- name: protoc-gen-java_grpc
version: 1.83.0
version: 1.85.1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any generated code change due to this grpc upgrade? If yes, can we include them in the same PR? Here is the latest generation guide via Librarian.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified by running librarian install && librarian generate with protoc-gen-java_grpc: 1.85.1 — it produces zero diff across generated *Grpc.java files (comparing grpc/grpc-java v1.83.0...v1.85.1 also confirms no template changes in java_generator.cpp). Also pushed a commit updating GapicSpannerRpcTest to register a SpanProcessor for OpenTelemetry 1.67.0.

@blakeli0

Copy link
Copy Markdown
Contributor

LGTM. This does bump guava + grpc. @blakeli0 any concerns with this?

No concerns since they are for CVEs. The Spanner test failures seem to be legit, we may need code changes in Spanner.

@whowes

whowes commented Nov 10, 2026

Copy link
Copy Markdown
Contributor

The Spanner test failures seem to be legit, we may need code changes in Spanner.

The failures seem related to a change discussed in OpenTelemetry #8740 that affects SdkTracerProviders without a SpanProcessor. It seems reasonable to switch the failing tests to include a SpanProcessor (e.g. precedent in OpenTelemetrySpanTest), but it seems like we should be cautious here since this is a behavioral change.

…ntext tests

OpenTelemetry 1.67.0 returns a noop tracer when no SpanProcessor is registered on SdkTracerProvider. Attach an InMemorySpanExporter processor so trace context propagation headers are emitted.
@mutianf
mutianf requested a review from a team as a code owner November 11, 2026 02:58
@mutianf

mutianf commented Nov 11, 2026

Copy link
Copy Markdown
Contributor Author

Updated spanner test, maybe someone from spanner team can take a look?

@mutianf
mutianf requested a review from a team as a code owner November 11, 2026 14:48
@mutianf mutianf added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Nov 11, 2026
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Nov 11, 2026
this.openTelemetry = openTelemetry;
Package pkg = this.getClass().getPackage();
if (pkg != null) {
if (pkg != null && pkg.getImplementationVersion() != null) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change required by a behavioral change from the opentelemetry upgrade?

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants