Feat(defaultRequestTimeout) add defaultRequestTimeout property for the client

grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientDeadlineAutoConfiguration.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016-2024 The gRPC-Spring Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.devh.boot.grpc.client.autoconfigure;
+
+import static java.util.Objects.requireNonNull;
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.MethodDescriptor;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.client.config.GrpcChannelProperties;
+import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
+import net.devh.boot.grpc.client.inject.StubTransformer;
+import net.devh.boot.grpc.client.interceptor.DeadlineSetupClientInterceptor;
+
+/**
+ * The deadline autoconfiguration for the client.
+ *
+ * <p>
+ * You can disable this config by using:
+ * </p>
+ *
+ * <pre>
+ * <code>@ImportAutoConfiguration(exclude = GrpcClientDeadlineAutoConfiguration.class)</code>
+ * </pre>
+ *
+ * @author Sergei Batsura ([email protected])
+ */
+@Slf4j
+@Configuration(proxyBeanMethods = false)
+@AutoConfigureBefore(GrpcClientAutoConfiguration.class)
+public class GrpcClientDeadlineAutoConfiguration {
+
+    /**
+     * Creates a {@link StubTransformer} bean with interceptor that will call withDeadlineAfter with deadline from
+     * props.
+     *
+     *
+     * @param props The properties for deadline configuration.
+     * @return The StubTransformer bean with interceptor if deadline is configured.
+     * @see DeadlineSetupClientInterceptor#interceptCall(MethodDescriptor, CallOptions, Channel)
+     */
+    @Bean
+    StubTransformer deadlineStubTransformer(final GrpcChannelsProperties props) {
+        requireNonNull(props, "properties");
+
+        return (name, stub) -> {
+            GrpcChannelProperties channelProps = props.getChannel(name);
+            if (channelProps != null && channelProps.getDeadline() != null
+                    && channelProps.getDeadline().toMillis() > 0L) {
+                return stub.withInterceptors(new DeadlineSetupClientInterceptor(channelProps.getDeadline()));
+            } else {
+                return stub;
+            }
+        };
+    }
+
+}

grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java

@@ -32,6 +32,7 @@
 import org.springframework.util.unit.DataSize;
 import org.springframework.util.unit.DataUnit;
 
+import io.grpc.CallOptions;
 import io.grpc.LoadBalancerRegistry;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.NameResolverProvider;
@@ -118,6 +119,34 @@ public void setAddress(final String address) {
         this.address = address == null ? null : URI.create(address);
     }
 
+    // --------------------------------------------------
+    // Target Deadline
+    // --------------------------------------------------
+
+    private Duration deadline = null;
+
+    /**
+     * Gets the default deadline for each new call.
+     *
+     * @return The connection deadline or null
+     * @see #setDeadline(Duration)
+     */
+    public Duration getDeadline() {
+        return this.deadline;
+    }
+
+    /**
+     * Set the default deadline duration for new calls (on a per call basis). If nothing is configured then the deadline
+     * will not be used by default. If zero value is configured, the deadline will not be used.
+     *
+     * @param deadline The connection deadline or null.
+     *
+     * @see CallOptions#withDeadlineAfter(long, TimeUnit)
+     */
+    public void setDeadline(Duration deadline) {
+        this.deadline = deadline;
+    }
+
     // --------------------------------------------------
     // defaultLoadBalancingPolicy
     // --------------------------------------------------
@@ -480,6 +509,9 @@ public void copyDefaultsFrom(final GrpcChannelProperties config) {
         if (this.address == null) {
             this.address = config.address;
         }
+        if (this.deadline == null) {
+            this.deadline = config.deadline;
+        }
         if (this.defaultLoadBalancingPolicy == null) {
             this.defaultLoadBalancingPolicy = config.defaultLoadBalancingPolicy;
         }

grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/interceptor/DeadlineSetupClientInterceptor.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016-2024 The gRPC-Spring Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.devh.boot.grpc.client.interceptor;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.MethodDescriptor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Deadline setup client interceptor that create new deadline instance from defaultDeadline.
+ *
+ * @author Sergei Batsura ([email protected])
+ */
+@Slf4j
+@GrpcGlobalClientInterceptor
+@RequiredArgsConstructor
+public class DeadlineSetupClientInterceptor implements ClientInterceptor {
+
+    private final Duration defaultDeadline;
+
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+            final MethodDescriptor<ReqT, RespT> method,
+            final CallOptions callOptions,
+            final Channel next) {
+
+        if (defaultDeadline != null) {
+            return next.newCall(method,
+                    callOptions.withDeadlineAfter(defaultDeadline.toMillis(), TimeUnit.MILLISECONDS));
+        } else {
+            return next.newCall(method, callOptions);
+        }
+    }
+}

grpc-client-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -107,6 +107,12 @@
 			"description": "Connection timeout at application startup. If set to a positive duration instructs a client to connect to GRPC-endpoint when GRPC stub is created.",
 			"defaultValue": 0
 		},
+		{
+			"name": "grpc.client.GLOBAL.deadline",
+			"type": "java.time.Duration",
+			"sourceType": "net.devh.boot.grpc.client.config.GrpcChannelProperties",
+			"description": "A deadline is used to specify a point in time past which a client is unwilling to wait for a response from a server"
+		},
 		{
 			"name": "grpc.client.GLOBAL.security.authority-override",
 			"type": "java.lang.String",

grpc-client-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -4,3 +4,4 @@ net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientMicrometerTraceAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
+net.devh.boot.grpc.client.autoconfigure.GrpcClientDeadlineAutoConfiguration

tests/src/test/java/net/devh/boot/grpc/test/config/BaseAutoConfiguration.java

@@ -20,6 +20,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
+import net.devh.boot.grpc.client.autoconfigure.GrpcClientDeadlineAutoConfiguration;
 import net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration;
 import net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration;
 import net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration;
@@ -28,7 +29,7 @@
 @Configuration
 @ImportAutoConfiguration({GrpcCommonCodecAutoConfiguration.class, GrpcServerAutoConfiguration.class,
         GrpcServerFactoryAutoConfiguration.class, GrpcServerSecurityAutoConfiguration.class,
-        GrpcClientAutoConfiguration.class})
+        GrpcClientAutoConfiguration.class, GrpcClientDeadlineAutoConfiguration.class})
 public class BaseAutoConfiguration {
 
 }

tests/src/test/java/net/devh/boot/grpc/test/setup/DeadlineTests.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016-2024 The gRPC-Spring Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.devh.boot.grpc.test.setup;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.concurrent.ExecutionException;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import io.grpc.internal.testing.StreamRecorder;
+import io.grpc.stub.StreamObserver;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.client.config.GrpcChannelProperties;
+import net.devh.boot.grpc.test.config.BaseAutoConfiguration;
+import net.devh.boot.grpc.test.config.ServiceConfiguration;
+import net.devh.boot.grpc.test.proto.SomeType;
+
+/**
+ * These tests check the property {@link GrpcChannelProperties#getDeadline()}.
+ */
+public class DeadlineTests {
+
+    @Slf4j
+    @SpringBootTest(properties = {
+            "grpc.client.GLOBAL.address=localhost:9090",
+            "grpc.client.GLOBAL.deadline=1s",
+            "grpc.client.GLOBAL.negotiationType=PLAINTEXT",
+    })
+    @SpringJUnitConfig(classes = {ServiceConfiguration.class, BaseAutoConfiguration.class})
+    static class DeadlineSetupTest extends AbstractSimpleServerClientTest {
+        @Test
+        @SneakyThrows
+        @DirtiesContext
+        void testServiceStubDeadlineEnabledAndSuccessful() {
+            log.info("--- Starting test with unsuccessful and than successful call ---");
+            final StreamRecorder<SomeType> streamRecorder1 = StreamRecorder.create();
+            StreamObserver<SomeType> echo1 = this.testServiceStub.echo(streamRecorder1);
+            assertThrows(ExecutionException.class, () -> streamRecorder1.firstValue().get());
+
+            final StreamRecorder<SomeType> streamRecorder2 = StreamRecorder.create();
+            StreamObserver<SomeType> echo2 = testServiceStub.echo(streamRecorder2);
+            echo2.onNext(SomeType.getDefaultInstance());
+            assertNull(streamRecorder2.getError());
+            assertNotNull(streamRecorder2.firstValue().get().getVersion());
+            log.info("--- Test completed --- ");
+        }
+    }
+
+    @Slf4j
+    @SpringBootTest(properties = {
+            "grpc.client.GLOBAL.address=localhost:9090",
+            "grpc.client.GLOBAL.deadline=0s",
+            "grpc.client.GLOBAL.negotiationType=PLAINTEXT",
+    })
+    @SpringJUnitConfig(classes = {ServiceConfiguration.class, BaseAutoConfiguration.class})
+    static class ZeroDeadlineSetupTest extends AbstractSimpleServerClientTest {
+    }
+
+}