V5.13.3 release to v5.14.0

core/api/src/main/java/com/alipay/sofa/rpc/common/RpcConstants.java

@@ -128,15 +128,15 @@ public class RpcConstants {
     /**
      * 调用方式：客户端流
      */
-    public static final String  INVOKER_TYPE_CLIENT_STREAMING                = "clientStream";
+    public static final String  INVOKER_TYPE_CLIENT_STREAMING                = "client_stream";
     /**
      * 调用方式：服务端流
      */
-    public static final String  INVOKER_TYPE_SERVER_STREAMING                = "serverStream";
+    public static final String  INVOKER_TYPE_SERVER_STREAMING                = "server_stream";
     /**
      * 调用方式：双向流
      */
-    public static final String  INVOKER_TYPE_BI_STREAMING                    = "bidirectionalStream";
+    public static final String  INVOKER_TYPE_BI_STREAMING                    = "bi_stream";
 
     /**
      * Hessian序列化 [不推荐]

core/api/src/main/java/com/alipay/sofa/rpc/config/ConsumerConfig.java

@@ -933,8 +933,11 @@ public int getMethodRetries(String methodName) {
      * @return the time out
      */
     public int getMethodTimeout(String methodName) {
-        return (Integer) getMethodConfigValue(methodName, RpcConstants.CONFIG_KEY_TIMEOUT,
-            getTimeout());
+        Object methodTimeout = getMethodConfigValue(methodName, RpcConstants.CONFIG_KEY_TIMEOUT);
+        if (methodTimeout == null || ((Integer) methodTimeout) == 0) {
+            return getTimeout();
+        }
+        return (Integer) methodTimeout;
     }
 
     /**

core/api/src/main/java/com/alipay/sofa/rpc/core/request/SofaRequest.java

@@ -306,7 +306,10 @@ public SofaRequest setData(AbstractByteBuf data) {
      * @return 如果是Future和Callback，是异步请求
      */
     public boolean isAsync() {
-        return invokeType != null && (RpcConstants.INVOKER_TYPE_CALLBACK.equals(invokeType)
-            || RpcConstants.INVOKER_TYPE_FUTURE.equals(invokeType));
+        return RpcConstants.INVOKER_TYPE_CALLBACK.equals(invokeType)
+            || RpcConstants.INVOKER_TYPE_FUTURE.equals(invokeType)
+            || RpcConstants.INVOKER_TYPE_BI_STREAMING.equals(invokeType)
+            || RpcConstants.INVOKER_TYPE_SERVER_STREAMING.equals(invokeType)
+            || RpcConstants.INVOKER_TYPE_CLIENT_STREAMING.equals(invokeType);
     }
 }

core/api/src/test/java/com/alipay/sofa/rpc/config/ConsumerConfigTest.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alipay.sofa.rpc.config;
+
+import com.alipay.sofa.rpc.invoke.Invoker;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Even
+ * @date 2025/3/4 21:36
+ */
+public class ConsumerConfigTest {
+
+    @Test
+    public void testMethodTimeout() {
+        ConsumerConfig<Invoker> consumerConfig = new ConsumerConfig<>();
+        consumerConfig.setTimeout(4000);
+        consumerConfig.setInterfaceId(Invoker.class.getName());
+        consumerConfig.getConfigValueCache(true);
+        Assert.assertEquals(4000, consumerConfig.getMethodTimeout("invoke"));
+
+        List<MethodConfig> methodConfigs = new ArrayList<>();
+        MethodConfig methodConfig = new MethodConfig();
+        methodConfig.setName("invoke");
+        methodConfigs.add(methodConfig);
+        consumerConfig.setMethods(methodConfigs);
+        consumerConfig.getConfigValueCache(true);
+        Assert.assertEquals(4000, consumerConfig.getMethodTimeout("invoke"));
+
+        methodConfig.setTimeout(5000);
+        consumerConfig.getConfigValueCache(true);
+        Assert.assertEquals(5000, consumerConfig.getMethodTimeout("invoke"));
+
+        methodConfig.setTimeout(-1);
+        consumerConfig.getConfigValueCache(true);
+        Assert.assertEquals(-1, consumerConfig.getMethodTimeout("invoke"));
+    }
+}

remoting/pom.xml

@@ -88,6 +88,11 @@
                 <artifactId>sofa-rpc-log-common-tools</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alipay.sofa</groupId>
+                <artifactId>sofa-rpc-tracer-opentracing</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

remoting/remoting-triple/pom.xml

@@ -66,5 +66,9 @@
             <groupId>com.alipay.sofa</groupId>
             <artifactId>tracer-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>sofa-rpc-tracer-opentracing</artifactId>
+        </dependency>
     </dependencies>
 </project>

remoting/remoting-triple/src/main/java/com/alipay/sofa/rpc/interceptor/ClientHeaderClientInterceptor.java

@@ -16,12 +16,20 @@
  */
 package com.alipay.sofa.rpc.interceptor;
 
+import com.alipay.common.tracer.core.context.trace.SofaTraceContext;
+import com.alipay.common.tracer.core.holder.SofaTraceContextHolder;
+import com.alipay.common.tracer.core.span.SofaTracerSpan;
 import com.alipay.sofa.rpc.config.ConsumerConfig;
+import com.alipay.sofa.rpc.context.RpcInternalContext;
 import com.alipay.sofa.rpc.context.RpcInvokeContext;
 import com.alipay.sofa.rpc.context.RpcRunningState;
 import com.alipay.sofa.rpc.core.request.SofaRequest;
+import com.alipay.sofa.rpc.core.response.SofaResponse;
+import com.alipay.sofa.rpc.event.ClientAsyncReceiveEvent;
+import com.alipay.sofa.rpc.event.EventBus;
 import com.alipay.sofa.rpc.server.triple.TripleContants;
 import com.alipay.sofa.rpc.tracer.sofatracer.TripleTracerAdapter;
+import com.alipay.sofa.rpc.utils.TripleExceptionUtils;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
@@ -59,12 +67,15 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT
 
             @Override
             public void start(Listener<RespT> responseListener, Metadata requestHeader) {
-
+                RpcInternalContext internalContext = RpcInternalContext.getContext();
                 RpcInvokeContext context = RpcInvokeContext.getContext();
                 SofaRequest sofaRequest = (SofaRequest) context.get(TripleContants.SOFA_REQUEST_KEY);
 
-                ConsumerConfig consumerConfig = (ConsumerConfig) context.get(TripleContants.SOFA_CONSUMER_CONFIG_KEY);
-                TripleTracerAdapter.beforeSend(sofaRequest, consumerConfig, requestHeader);
+                ConsumerConfig<?> consumerConfig = (ConsumerConfig<?>) context
+                    .get(TripleContants.SOFA_CONSUMER_CONFIG_KEY);
+                TripleTracerAdapter.beforeSend(sofaRequest, consumerConfig, requestHeader, method);
+                SofaTraceContext sofaTraceContext = SofaTraceContextHolder.getSofaTraceContext();
+                SofaTracerSpan clientSpan = sofaTraceContext.getCurrentSpan();
                 if (RpcRunningState.isDebugMode()) {
                     LOGGER.info("[2]prepare to send from client:{}", requestHeader);
                 }
@@ -80,18 +91,48 @@ public void onHeaders(Metadata responseHeader) {
 
                     @Override
                     public void onMessage(RespT message) {
-                        if (RpcRunningState.isDebugMode()) {
-                            LOGGER.info("[4]response message received from server:{}", message);
+                        // onMessage -> onNext()
+                        try {
+                            if (sofaRequest.isAsync()) {
+                                RpcInvokeContext.setContext(context);
+                                sofaTraceContext.push(clientSpan);
+                            }
+                            if (RpcRunningState.isDebugMode()) {
+                                LOGGER.info("[4]response message received from server:{}", message);
+                            }
+                            super.onMessage(message);
+                        } finally {
+                            if (sofaRequest.isAsync()) {
+                                sofaTraceContext.clear();
+                                RpcInvokeContext.removeContext();
+                            }
                         }
-                        super.onMessage(message);
                     }
 
                     @Override
                     public void onClose(Status status, Metadata trailers) {
-                        if (RpcRunningState.isDebugMode()) {
-                            LOGGER.info("[5]response close received from server:{},trailers:{}", status, trailers);
+                        // onClose -> onComplete() or onError()
+                        try {
+                            if (sofaRequest.isAsync()) {
+                                RpcInvokeContext.setContext(context);
+                                sofaTraceContext.push(clientSpan);
+                            }
+                            if (RpcRunningState.isDebugMode()) {
+                                LOGGER.info("[5]response close received from server:{},trailers:{}", status, trailers);
+                            }
+                            super.onClose(status, trailers);
+                        } finally {
+                            if (sofaRequest.isAsync()) {
+                                Throwable throwable = TripleExceptionUtils.getThrowableFromStatus(status);
+                                RpcInternalContext.setContext(internalContext);
+                                if (EventBus.isEnable(ClientAsyncReceiveEvent.class)) {
+                                    EventBus.post(new ClientAsyncReceiveEvent(consumerConfig, null,
+                                        sofaRequest, new SofaResponse(), throwable));
+                                }
+                                RpcInvokeContext.removeContext();
+                                RpcInternalContext.removeAllContext();
+                            }
                         }
-                        super.onClose(status, trailers);
                     }
 
                     @Override
@@ -104,6 +145,15 @@ public void onReady() {
                 }, requestHeader);
             }
 
+            @Override
+            public void sendMessage(ReqT message) {
+                try {
+                    super.sendMessage(message);
+                } catch (Throwable t) {
+                    LOGGER.error("Client invoke grpc sendMessage meet error:", t);
+                    throw t;
+                }
+            }
         };
     }
 }