build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 #1989

mpeddada1 · 2023-09-13T17:56:43Z

Notable changes in this PR:

Upgrade of protobuf to 3.24.0.
Upgrade of grpc to 1.58.0.
Upgrade of errorprone to 2.20.0.
Re-generation of showcase golden files with new versions of protobuf and grpc.
Pinned GA job for BOM validation to commit sha of chore: ignore grpc-binder and grpc-cronet in bom validation java-cloud-bom#6191 (which ignores grpc-binder, grpc-cronet and grpc-android).
Modified the GA job for downstream testing to use HEAD of google-cloud-java to account for changes in chore: refactor ITKmsTest to avoid using deprecated method google-cloud-java#9854

mpeddada1 · 2023-09-13T18:02:39Z

Stacktrace:

Error:  +-com.google.api.grpc:grpc-google-common-protos:2.24.1-SNAPSHOT
Error:    +-com.google.protobuf:protobuf-java:3.23.2
Error:  and
Error:  +-com.google.api.grpc:grpc-google-common-protos:2.24.1-SNAPSHOT
Error:    +-io.grpc:grpc-protobuf:1.58.0
Error:      +-com.google.protobuf:protobuf-java:3.23.2 (managed) <-- com.google.protobuf:protobuf-java:3.24.0

The release notes of gRPC mention that protobuf was updated to 3.24.0.

suztomo · 2023-09-14T16:17:44Z

Error:  Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.3.0:enforce (enforce) on project gax-grpc: 
Error:  Rule 2: org.apache.maven.enforcer.rules.dependency.RequireUpperBoundDeps failed with message:
Error:  Failed while enforcing RequireUpperBoundDeps. The error(s) are [
Error:  Require upper bound dependencies error for com.google.errorprone:error_prone_annotations:2.18.0 paths to dependency are:
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-com.google.api:api-common:2.16.1-SNAPSHOT
Error:      +-com.google.errorprone:error_prone_annotations:2.18.0
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-io.grpc:grpc-api:1.58.0
Error:      +-com.google.errorprone:error_prone_annotations:2.20.0
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-io.grpc:grpc-stub:1.58.0
Error:      +-com.google.errorprone:error_prone_annotations:2.20.0 [runtime]
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-io.grpc:grpc-netty-shaded:1.58.0 [runtime]
Error:      +-com.google.errorprone:error_prone_annotations:2.20.0 [runtime]
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-com.google.auth:google-auth-library-oauth2-http:1.19.0
Error:      +-com.google.http-client:google-http-client:1.43.3 (managed) <-- com.google.http-client:google-http-client:1.42.3
Error:        +-com.google.errorprone:error_prone_annotations:2.18.0
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-io.grpc:grpc-alts:1.58.0
Error:      +-io.grpc:grpc-grpclb:1.58.0 (managed) <-- io.grpc:grpc-grpclb:1.58.0
Error:        +-com.google.errorprone:error_prone_annotations:2.20.0 [runtime]
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-io.grpc:grpc-alts:1.58.0
Error:      +-io.grpc:grpc-grpclb:1.58.0 (managed) <-- io.grpc:grpc-grpclb:1.58.0
Error:        +-com.google.protobuf:protobuf-java-util:3.24.0 [runtime] (managed) <-- com.google.protobuf:protobuf-java-util:3.24.0 [runtime]
Error:          +-com.google.errorprone:error_prone_annotations:2.18.0 [runtime]
Error:  and
Error:  +-com.google.api:gax-grpc:2.33.1-SNAPSHOT
Error:    +-io.grpc:grpc-googleapis:1.58.0 [runtime]
Error:      +-io.grpc:grpc-xds:1.58.0 [runtime] (managed) <-- io.grpc:grpc-xds:1.58.0 [runtime]
Error:        +-io.grpc:grpc-services:1.58.0 [runtime] (managed) <-- io.grpc:grpc-services:1.58.0 [runtime]
Error:          +-com.google.errorprone:error_prone_annotations:2.20.0 [runtime]
Error:  ]

@mpeddada1 Try upgrading https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/third-party-dependencies/pom.xml#L31

…nsistency

mpeddada1 · 2023-09-14T17:50:29Z

Thanks Tomo! Making some progress. Running into a different error now:

Error:  Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.11.0:testCompile (default-testCompile) on project gax-grpc: Compilation failure: Compilation failure: 
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/InProcessServer.java:[40,25] package io.grpc.inprocess does not exist
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcDirectServerStreamingCallableTest.java:[54,25] package io.grpc.inprocess does not exist
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcDirectStreamingCallableTest.java:[52,25] package io.grpc.inprocess does not exist
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockServiceHelper.java:[36,25] package io.grpc.inprocess does not exist
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/LocalChannelProvider.java:[48,25] package io.grpc.inprocess does not exist
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcCallableFactoryTest.java:[53,25] package io.grpc.inprocess does not exist
Error:  /home/runner/work/sdk-platform-java/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcResponseMetadataTest.java:[50,25] package io.grpc.inprocess does not exist

mpeddada1 · 2023-09-14T21:18:51Z

From the GRPC Github Releases page; grpc-inprocess and grpc-util have been moved out of grpc-core to be their own artifacts.

core, inprocess, util: 2 new artifacts grpc-inprocess and grpc-util have been created by moving code from grpc-core to facilitate Java module support (https://github.com/grpc/grpc-java/pull/10362, https://github.com/grpc/grpc-java/pull/10390)

mpeddada1 · 2023-09-15T23:40:46Z

Showcase golden files were updated but we are still running into:

diff -ru /home/runner/work/sdk-platform-java/sdk-platform-java/showcase/scripts/../grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java /home/runner/work/sdk-platform-java/sdk-platform-java/showcase/scripts/output/showcase-output/grpc-showcase-output/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java
--- /home/runner/work/sdk-platform-java/sdk-platform-java/showcase/scripts/../grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java	2023-09-15 22:43:21.740534658 +0000
+++ /home/runner/work/sdk-platform-java/sdk-platform-java/showcase/scripts/output/showcase-output/grpc-showcase-output/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java	2023-09-15 22:45:08.711177045 +0000
@@ -17,7 +17,7 @@
 
   private ComplianceGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Compliance";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Compliance";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.RepeatRequest,
@@ -1124,9 +1124,9 @@
   private static final class ComplianceMethodDescriptorSupplier
       extends ComplianceBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    ComplianceMethodDescriptorSupplier(String methodName) {
+    ComplianceMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }

…rpc-1.58.0

mpeddada1 · 2023-09-18T17:20:22Z

ci/gapic-generator-java-bom failing with:

Error:  Failed to execute goal on project bom-validation-canary-project: Could not resolve dependencies for project com.google.cloud:bom-validation-canary-project:jar:0.0.1-SNAPSHOT: The following artifacts could not be resolved: io.grpc:grpc-android:jar:1.58.0, io.grpc:grpc-binder:jar:1.58.0, androidx.annotation:annotation:jar:1.6.0, androidx.core:core:jar:1.10.1, androidx.lifecycle:lifecycle-common:jar:2.6.1, io.grpc:grpc-cronet:jar:1.58.0, org.chromium.net:cronet-api:jar:108.5359.79: Could not find artifact io.grpc:grpc-android:jar:1.58.0 in central (https://repo.maven.apache.org/maven2) -> [Help 1]
Error:

suztomo · 2023-09-18T17:35:57Z

Can you remove unnecessary artifacts from the canary project?

…rpc-1.58.0

… into grpc-1.58.0

mpeddada1 · 2023-09-19T16:42:38Z

Can you remove unnecessary artifacts from the canary project?

Thanks for the suggestion, @suztomo. Done in googleapis/java-cloud-bom#6189

.github/workflows/ci.yaml

mpeddada1 · 2023-09-19T20:39:14Z

Removal of deprecated MetadataUtils#attachHeader in grpc-stub:1.58.0 is causing compilation errors in ITKmsTest.java.

mpeddada1 · 2023-09-20T18:52:46Z

.kokoro/presubmit/downstream-compatibility.sh

+  # Perform testing on HEAD for google-cloud-java
+  if [ $repo == "google-cloud-java" ]; then
+    git clone "https://github.com/googleapis/$repo.git" --depth=1
+  else
+    # Perform testing on last release, not HEAD
+    last_release=$(find_last_release_version "$repo")
+    git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
+  fi


The downstream checks for java-kms were failing with a compilation error due to a removal of a method in grpc-stub:1.58.0. Needed to make this update to verify the changes in the monorepo: googleapis/google-cloud-java#9854.

sonarqubecloud · 2023-09-20T18:54:35Z

[gapic-generator-java-root] SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
53 Code Smells

0.0% Coverage
48.3% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

mpeddada1 · 2023-09-20T18:58:13Z

.github/workflows/ci.yaml

@@ -282,7 +282,7 @@ jobs:
      run: |
        mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
    - name: Validate gapic-generator-java-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.13.0
+      uses: googleapis/java-cloud-bom/tests/validate-bom@2414e159ab8f882717ab7f6ae4c4a02c096b94fa


To test with changes included in googleapis/java-cloud-bom#6191

sonarqubecloud · 2023-09-20T19:00:37Z

[java_showcase_integration_tests] SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
53 Code Smells

0.0% Coverage
48.2% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

sonarqubecloud · 2023-09-20T19:06:39Z

[java_showcase_unit_tests] SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
53 Code Smells

0.0% Coverage
48.2% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

mpeddada1 · 2023-09-20T19:22:05Z

We've not counted golden file coverage as a blocker for merging this PR in the past (ex, #1755). However, in the future, it may be helpful to re-evaluate the use of our Sonarcloud coverage.
cc/ @burkedavison

build(deps): bump grpc version to 1.58.0

3edbe8c

mpeddada1 requested a review from a team as a code owner September 13, 2023 17:56

product-auto-label bot added the size: xs Pull request size is extra small. label Sep 13, 2023

upudate protobuf to 3.24.0

dda9e62

mpeddada1 changed the title ~~build(deps): bump grpc version to 1.58.0~~ build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 Sep 13, 2023

remove temporary j2objc exclusion

1cb8aa5

product-auto-label bot added size: s Pull request size is small. and removed size: xs Pull request size is extra small. labels Sep 13, 2023

mpeddada1 changed the title ~~build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0~~ build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 [WIP] Sep 14, 2023

mpeddada1 added 3 commits September 14, 2023 17:18

upgrade errorprone version to 2.20.0

977b725

update errorprone version to 2.20.0 in dependencies.properties for co…

347b80e

…nsistency

update errorprone version in api-common and gapic-generator

a1abf46

mpeddada1 added 2 commits September 14, 2023 21:24

add gax-inprocess

7b7d626

regenerate showcase

49d7be2

product-auto-label bot added size: l Pull request size is large. and removed size: s Pull request size is small. labels Sep 15, 2023

Merge branch 'main' of github.com:googleapis/sdk-platform-java into g…

e33a50f

…rpc-1.58.0

mpeddada1 and others added 4 commits September 18, 2023 18:06

Merge branch 'main' of github.com:googleapis/sdk-platform-java into g…

339391c

…rpc-1.58.0

Merge remote-tracking branch 'origin/main' into grpc-1.58.0

1857d25

regenerate showcase classes

f4c0029

Merge branch 'grpc-1.58.0' of github.com:googleapis/sdk-platform-java…

66f589f

… into grpc-1.58.0

mpeddada1 mentioned this pull request Sep 18, 2023

chore: skip grpc-android during bom validation GoogleCloudPlatform/cloud-opensource-java#2351

Closed

update integration test golden files

8017b80

mpeddada1 added 5 commits September 18, 2023 23:25

test ga run from sha

b8a15f6

revert change to ga settings

6740d5e

replace tag with latest

309093c

upgrade tag

56b4b77

remove tag

0f27b20

empty commit for builds

322c838

suztomo reviewed Sep 19, 2023

View reviewed changes

.github/workflows/ci.yaml Outdated Show resolved Hide resolved

mpeddada1 added 2 commits September 19, 2023 17:46

version with SHA

fcc497f

use commit with other grpc exclusions

45794d5

mpeddada1 mentioned this pull request Sep 19, 2023

chore: refactor ITKmsTest to avoid using deprecated method googleapis/google-cloud-java#9854

Merged

mpeddada1 added 4 commits September 19, 2023 22:32

use up-to-date sha

646d460

empty commit for build

b8c7b4d

modify script to test against monorepo HEAD

e693e01

remove unused variable assignment

af0aa38

mpeddada1 commented Sep 20, 2023

View reviewed changes

mpeddada1 changed the title ~~build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 [WIP]~~ build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 Sep 20, 2023

mpeddada1 requested a review from suztomo September 20, 2023 19:03

suztomo approved these changes Sep 20, 2023

View reviewed changes

mpeddada1 merged commit 7eec867 into main Sep 20, 2023

mpeddada1 deleted the grpc-1.58.0 branch September 20, 2023 19:30

mpeddada1 mentioned this pull request Sep 20, 2023

chore: restore monorepo check to be pinned at latest version #2019

Merged

mpeddada1 mentioned this pull request Oct 4, 2023

Refactor SonarCloud showcase test coverage to show meaningful results #2068

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 #1989

build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 #1989

mpeddada1 commented Sep 13, 2023 •

edited

Loading

mpeddada1 commented Sep 13, 2023 •

edited

Loading

suztomo commented Sep 14, 2023 •

edited

Loading

mpeddada1 commented Sep 14, 2023

mpeddada1 commented Sep 14, 2023

mpeddada1 commented Sep 15, 2023

mpeddada1 commented Sep 18, 2023

suztomo commented Sep 18, 2023

mpeddada1 commented Sep 19, 2023 •

edited

Loading

mpeddada1 commented Sep 19, 2023 •

edited

Loading

mpeddada1 Sep 20, 2023

sonarqubecloud bot commented Sep 20, 2023

mpeddada1 Sep 20, 2023

sonarqubecloud bot commented Sep 20, 2023

sonarqubecloud bot commented Sep 20, 2023

mpeddada1 commented Sep 20, 2023

build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 #1989

build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 #1989

Conversation

mpeddada1 commented Sep 13, 2023 • edited Loading

mpeddada1 commented Sep 13, 2023 • edited Loading

suztomo commented Sep 14, 2023 • edited Loading

mpeddada1 commented Sep 14, 2023

mpeddada1 commented Sep 14, 2023

mpeddada1 commented Sep 15, 2023

mpeddada1 commented Sep 18, 2023

suztomo commented Sep 18, 2023

mpeddada1 commented Sep 19, 2023 • edited Loading

mpeddada1 commented Sep 19, 2023 • edited Loading

mpeddada1 Sep 20, 2023

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 20, 2023

mpeddada1 Sep 20, 2023

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 20, 2023

sonarqubecloud bot commented Sep 20, 2023

mpeddada1 commented Sep 20, 2023

mpeddada1 commented Sep 13, 2023 •

edited

Loading

mpeddada1 commented Sep 13, 2023 •

edited

Loading

suztomo commented Sep 14, 2023 •

edited

Loading

mpeddada1 commented Sep 19, 2023 •

edited

Loading

mpeddada1 commented Sep 19, 2023 •

edited

Loading