Merge branch 'grpc:master' into master

Author: shivaspeaks

.gitignore

@@ -31,6 +31,9 @@ MODULE.bazel.lock
 .gitignore
 bin
 
+# VsCode
+.vscode
+
 # OS X
 .DS_Store
 

MODULE.bazel

@@ -2,7 +2,7 @@ module(
     name = "grpc-java",
     compatibility_level = 0,
     repo_name = "io_grpc_grpc_java",
-    version = "1.77.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
+    version = "1.78.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
 )
 
 # GRPC_DEPS_START
@@ -14,7 +14,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.auto.value:auto-value-annotations:1.11.0",
     "com.google.auto.value:auto-value:1.11.0",
     "com.google.code.findbugs:jsr305:3.0.2",
-    "com.google.code.gson:gson:2.11.0",
+    "com.google.code.gson:gson:2.12.1",
     "com.google.errorprone:error_prone_annotations:2.36.0",
     "com.google.guava:failureaccess:1.0.1",
     "com.google.guava:guava:33.4.8-android",

README.md

@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
 guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
 basics](https://grpc.io/docs/languages/java/basics).
 
-The [examples](https://github.com/grpc/grpc-java/tree/v1.76.0/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.76.0/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.77.0/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.77.0/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -56,42 +56,42 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-netty-shaded</artifactId>
-  <version>1.76.0</version>
+  <version>1.77.0</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.76.0</version>
+  <version>1.77.0</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.76.0</version>
+  <version>1.77.0</version>
 </dependency>
 ```
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-runtimeOnly 'io.grpc:grpc-netty-shaded:1.76.0'
-implementation 'io.grpc:grpc-protobuf:1.76.0'
-implementation 'io.grpc:grpc-stub:1.76.0'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.77.0'
+implementation 'io.grpc:grpc-protobuf:1.77.0'
+implementation 'io.grpc:grpc-stub:1.77.0'
 ```
 
 For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
 `grpc-protobuf-lite` instead of `grpc-protobuf`:
 ```gradle
-implementation 'io.grpc:grpc-okhttp:1.76.0'
-implementation 'io.grpc:grpc-protobuf-lite:1.76.0'
-implementation 'io.grpc:grpc-stub:1.76.0'
+implementation 'io.grpc:grpc-okhttp:1.77.0'
+implementation 'io.grpc:grpc-protobuf-lite:1.77.0'
+implementation 'io.grpc:grpc-stub:1.77.0'
 ```
 
 For [Bazel](https://bazel.build), you can either
 [use Maven](https://github.com/bazelbuild/rules_jvm_external)
 (with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
 
 [the JARs]:
-https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.76.0
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.77.0
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://central.sonatype.com/repository/maven-snapshots/).
@@ -123,7 +123,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <configuration>
         <protocArtifact>com.google.protobuf:protoc:3.25.8:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.76.0:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.77.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -153,7 +153,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.76.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.77.0'
     }
   }
   generateProtoTasks {
@@ -186,7 +186,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.76.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.77.0'
     }
   }
   generateProtoTasks {

alts/BUILD.bazel

@@ -13,7 +13,6 @@ java_library(
         ":handshaker_java_proto",
         "//api",
         "//core:internal",
-        "//grpclb",
         "//netty",
         "//stub",
         "@com_google_protobuf//:protobuf_java",

alts/build.gradle

@@ -14,12 +14,10 @@ dependencies {
     implementation project(':grpc-auth'),
             project(':grpc-core'),
             project(":grpc-context"), // Override google-auth dependency with our newer version
-            project(':grpc-grpclb'),
             project(':grpc-protobuf'),
             project(':grpc-stub'),
             libraries.protobuf.java,
             libraries.conscrypt,
-            libraries.guava.jre, // JRE required by protobuf-java-util from grpclb
             libraries.google.auth.oauth2Http
     def nettyDependency = implementation project(':grpc-netty')
 

alts/src/main/java/io/grpc/alts/HandshakerServiceChannel.java

@@ -37,10 +37,29 @@
  * application will have at most one connection to the handshaker service.
  */
 final class HandshakerServiceChannel {
+  // Port 8080 is necessary for ALTS handshake.
+  private static final int ALTS_PORT = 8080;
+  private static final String DEFAULT_TARGET = "metadata.google.internal.:8080";
 
   static final Resource<Channel> SHARED_HANDSHAKER_CHANNEL =
-      new ChannelResource("metadata.google.internal.:8080");
-
+      new ChannelResource(getHandshakerTarget(System.getenv("GCE_METADATA_HOST")));
+  
+  /**
+   * Returns handshaker target. When GCE_METADATA_HOST is provided, it might contain port which we
+   * will discard and use ALTS_PORT instead.
+   */
+  static String getHandshakerTarget(String envValue) {
+    if (envValue == null || envValue.isEmpty()) {
+      return DEFAULT_TARGET;
+    }
+    String host = envValue;
+    int portIndex = host.lastIndexOf(':');
+    if (portIndex != -1) {
+      host = host.substring(0, portIndex); // Discard port if specified
+    }
+    return host + ":" + ALTS_PORT; // Utilize ALTS port in all cases
+  }
+  
   /** Returns a resource of handshaker service channel for testing only. */
   static Resource<Channel> getHandshakerChannelForTesting(String handshakerAddress) {
     return new ChannelResource(handshakerAddress);

alts/src/main/java/io/grpc/alts/internal/AltsProtocolNegotiator.java

@@ -30,7 +30,6 @@
 import io.grpc.SecurityLevel;
 import io.grpc.Status;
 import io.grpc.alts.internal.RpcProtocolVersionsUtil.RpcVersionsCheckResult;
-import io.grpc.grpclb.GrpclbConstants;
 import io.grpc.internal.ObjectPool;
 import io.grpc.netty.GrpcHttp2ConnectionHandler;
 import io.grpc.netty.InternalProtocolNegotiator;
@@ -299,9 +298,7 @@ public ChannelHandler newHandler(GrpcHttp2ConnectionHandler grpcHandler) {
         isXdsDirectPath = isDirectPathCluster(
             grpcHandler.getEagAttributes().get(clusterNameAttrKey));
       }
-      if (grpcHandler.getEagAttributes().get(GrpclbConstants.ATTR_LB_ADDR_AUTHORITY) != null
-          || grpcHandler.getEagAttributes().get(GrpclbConstants.ATTR_LB_PROVIDED_BACKEND) != null
-          || isXdsDirectPath) {
+      if (isXdsDirectPath) {
         TsiHandshaker handshaker =
             handshakerFactory.newHandshaker(grpcHandler.getAuthority(), negotiationLogger); 
         NettyTsiHandshaker nettyHandshaker = new NettyTsiHandshaker(handshaker);

alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java

@@ -80,7 +80,7 @@ public boolean processBytesFromPeer(ByteBuffer bytes) throws GeneralSecurityExce
       return true;
     }
     int remaining = bytes.remaining();
-    // Call handshaker service to proceess the bytes.
+    // Call handshaker service to process the bytes.
     if (outputFrame == null) {
       checkState(!isClient, "Client handshaker should not process any frame at the beginning.");
       outputFrame = handshaker.startServerHandshake(bytes);

alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java

@@ -67,6 +67,24 @@ public void sharedChannel_authority() {
     }
   }
 
+  @Test
+  public void getHandshakerTarget_nullEnvVar() {
+    assertThat(HandshakerServiceChannel.getHandshakerTarget(null))
+        .isEqualTo("metadata.google.internal.:8080");
+  }
+
+  @Test
+  public void getHandshakerTarget_envVarWithPort() {
+    assertThat(HandshakerServiceChannel.getHandshakerTarget("169.254.169.254:80"))
+        .isEqualTo("169.254.169.254:8080");
+  }
+
+  @Test
+  public void getHandshakerTarget_envVarWithHostOnly() {
+    assertThat(HandshakerServiceChannel.getHandshakerTarget("169.254.169.254"))
+        .isEqualTo("169.254.169.254:8080");
+  }
+  
   @Test
   public void resource_works() {
     Channel channel = resource.create();

alts/src/test/java/io/grpc/alts/internal/GoogleDefaultProtocolNegotiatorTest.java

@@ -29,7 +29,6 @@
 import io.grpc.ChannelLogger;
 import io.grpc.ChannelLogger.ChannelLogLevel;
 import io.grpc.ManagedChannel;
-import io.grpc.grpclb.GrpclbConstants;
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.internal.ObjectPool;
 import io.grpc.netty.GrpcHttp2ConnectionHandler;
@@ -95,13 +94,6 @@ public void tearDown() {
     @Nullable
     abstract Attributes.Key<String> getClusterNameAttrKey();
 
-    @Test
-    public void altsHandler_lbProvidedBackend() {
-      Attributes attrs =
-          Attributes.newBuilder().set(GrpclbConstants.ATTR_LB_PROVIDED_BACKEND, true).build();
-      subtest_altsHandler(attrs);
-    }
-
     @Test
     public void tlsHandler_emptyAttributes() {
       subtest_tlsHandler(Attributes.EMPTY);