Skip to content

Commit 6d3f981

Browse files
Sangamesh1997Sangamesh1997
authored
Merge branch 'grpc:master' into Issue_fixed_6868
2 parents 94f92f6 + 2fb0957 commit 6d3f981

39 files changed

Lines changed: 87 additions & 61 deletions

File tree

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module(
22
name = "grpc-java",
33
compatibility_level = 0,
44
repo_name = "io_grpc_grpc_java",
5-
version = "1.73.0-SNAPSHOT", # CURRENT_GRPC_VERSION
5+
version = "1.74.0-SNAPSHOT", # CURRENT_GRPC_VERSION
66
)
77

88
# GRPC_DEPS_START

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.grpc.ClientCall;
2222
import io.grpc.ManagedChannel;
2323
import io.grpc.MethodDescriptor;
24+
import io.grpc.internal.GrpcUtil;
2425
import io.grpc.internal.SharedResourceHolder.Resource;
2526
import io.grpc.netty.NettyChannelBuilder;
2627
import io.netty.channel.EventLoopGroup;
@@ -45,6 +46,9 @@ static Resource<Channel> getHandshakerChannelForTesting(String handshakerAddress
4546
return new ChannelResource(handshakerAddress);
4647
}
4748

49+
private static final boolean EXPERIMENTAL_ALTS_HANDSHAKER_KEEPALIVE_PARAMS =
50+
GrpcUtil.getFlag("GRPC_EXPERIMENTAL_ALTS_HANDSHAKER_KEEPALIVE_PARAMS", false);
51+
4852
private static class ChannelResource implements Resource<Channel> {
4953
private final String target;
5054

@@ -57,12 +61,16 @@ public Channel create() {
5761
/* Use its own event loop thread pool to avoid blocking. */
5862
EventLoopGroup eventGroup =
5963
new NioEventLoopGroup(1, new DefaultThreadFactory("handshaker pool", true));
60-
ManagedChannel channel = NettyChannelBuilder.forTarget(target)
64+
NettyChannelBuilder channelBuilder =
65+
NettyChannelBuilder.forTarget(target)
6166
.channelType(NioSocketChannel.class, InetSocketAddress.class)
6267
.directExecutor()
6368
.eventLoopGroup(eventGroup)
64-
.usePlaintext()
65-
.build();
69+
.usePlaintext();
70+
if (EXPERIMENTAL_ALTS_HANDSHAKER_KEEPALIVE_PARAMS) {
71+
channelBuilder.keepAliveTime(10, TimeUnit.MINUTES).keepAliveTimeout(10, TimeUnit.SECONDS);
72+
}
73+
ManagedChannel channel = channelBuilder.build();
6674
return new EventLoopHoldingChannel(channel, eventGroup);
6775
}
6876

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ subprojects {
2121
apply plugin: "net.ltgt.errorprone"
2222

2323
group = "io.grpc"
24-
version = "1.73.0-SNAPSHOT" // CURRENT_GRPC_VERSION
24+
version = "1.74.0-SNAPSHOT" // CURRENT_GRPC_VERSION
2525

2626
plugins.withId("com.android.base") {
2727
android {

‎buildscripts/kokoro/psm-cloud-run.cfg‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Config file for internal CI
2+
3+
# Location of the continuous shell script in repository.
4+
build_file: "grpc-java/buildscripts/kokoro/psm-interop-test-java.sh"
5+
timeout_mins: 240
6+
7+
action {
8+
define_artifacts {
9+
regex: "artifacts/**/*sponge_log.xml"
10+
regex: "artifacts/**/*.log"
11+
strip_prefix: "artifacts"
12+
}
13+
}
14+
env_vars {
15+
key: "PSM_TEST_SUITE"
16+
value: "cloud_run"
17+
}

‎compiler/src/test/golden/TestDeprecatedService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
88
* </pre>
99
*/
1010
@javax.annotation.Generated(
11-
value = "by gRPC proto compiler (version 1.73.0-SNAPSHOT)",
11+
value = "by gRPC proto compiler (version 1.74.0-SNAPSHOT)",
1212
comments = "Source: grpc/testing/compiler/test.proto")
1313
@io.grpc.stub.annotations.GrpcGenerated
1414
@java.lang.Deprecated

‎compiler/src/test/golden/TestService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
88
* </pre>
99
*/
1010
@javax.annotation.Generated(
11-
value = "by gRPC proto compiler (version 1.73.0-SNAPSHOT)",
11+
value = "by gRPC proto compiler (version 1.74.0-SNAPSHOT)",
1212
comments = "Source: grpc/testing/compiler/test.proto")
1313
@io.grpc.stub.annotations.GrpcGenerated
1414
public final class TestServiceGrpc {

‎core/src/main/java/io/grpc/internal/GrpcUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public byte[] parseAsciiString(byte[] serialized) {
219219

220220
public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
221221

222-
public static final String IMPLEMENTATION_VERSION = "1.73.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
222+
public static final String IMPLEMENTATION_VERSION = "1.74.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
223223

224224
/**
225225
* The default timeout in nanos for a keepalive ping request.

‎examples/MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
2-
bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.73.0-SNAPSHOT") # CURRENT_GRPC_VERSION
2+
bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.74.0-SNAPSHOT") # CURRENT_GRPC_VERSION
33
bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
44
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
55
bazel_dep(name = "rules_jvm_external", version = "6.0")

‎examples/android/clientcache/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
protobuf {
3535
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
3636
plugins {
37-
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
37+
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
3838
}
3939
}
4040
generateProtoTasks {
@@ -54,12 +54,12 @@ dependencies {
5454
implementation 'androidx.appcompat:appcompat:1.0.0'
5555

5656
// You need to build grpc-java to obtain these libraries below.
57-
implementation 'io.grpc:grpc-okhttp:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
58-
implementation 'io.grpc:grpc-protobuf-lite:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
59-
implementation 'io.grpc:grpc-stub:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57+
implementation 'io.grpc:grpc-okhttp:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
58+
implementation 'io.grpc:grpc-protobuf-lite:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
59+
implementation 'io.grpc:grpc-stub:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
6060
implementation 'org.apache.tomcat:annotations-api:6.0.53'
6161

6262
testImplementation 'junit:junit:4.13.2'
6363
testImplementation 'com.google.truth:truth:1.1.5'
64-
testImplementation 'io.grpc:grpc-testing:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
64+
testImplementation 'io.grpc:grpc-testing:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
6565
}

‎examples/android/helloworld/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
protobuf {
3333
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
3434
plugins {
35-
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
35+
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
3636
}
3737
}
3838
generateProtoTasks {
@@ -52,8 +52,8 @@ dependencies {
5252
implementation 'androidx.appcompat:appcompat:1.0.0'
5353

5454
// You need to build grpc-java to obtain these libraries below.
55-
implementation 'io.grpc:grpc-okhttp:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
56-
implementation 'io.grpc:grpc-protobuf-lite:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57-
implementation 'io.grpc:grpc-stub:1.73.0-SNAPSHOT' // CURRENT_GRPC_VERSION
55+
implementation 'io.grpc:grpc-okhttp:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
56+
implementation 'io.grpc:grpc-protobuf-lite:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57+
implementation 'io.grpc:grpc-stub:1.74.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5858
implementation 'org.apache.tomcat:annotations-api:6.0.53'
5959
}

0 commit comments

Comments
 (0)