Merge pull request #1453 from chengyouling/develop-dubbo

add dubbo3 route plugin
sermant-io · Mar 18, 2024 · 6da99fd · 6da99fd
2 parents da3e237 + 7dbfc32
commit 6da99fd
Show file tree

Hide file tree

Showing 41 changed files with 752 additions and 50 deletions.
diff --git a/...rc/main/java/com/huaweicloud/sermant/router/dubbo/declarer/AbstractDirectoryDeclarer.java b/...rc/main/java/com/huaweicloud/sermant/router/dubbo/declarer/AbstractDirectoryDeclarer.java
@@ -17,6 +17,7 @@
 package com.huaweicloud.sermant.router.dubbo.declarer;
 
 import com.huaweicloud.sermant.core.plugin.agent.matcher.ClassMatcher;
+import com.huaweicloud.sermant.core.plugin.agent.matcher.MethodMatcher;
 
 /**
  * 增强AbstractDirectory的子类的doList方法，筛选标签应用的地址
@@ -34,6 +35,8 @@ public class AbstractDirectoryDeclarer extends AbstractDeclarer {
 
     private static final String METHOD_NAME = "doList";
 
+    private static final int PARAMETER_COUNT = 1;
+
     /**
      * 构造方法
      */
@@ -45,4 +48,14 @@ public AbstractDirectoryDeclarer() {
     public ClassMatcher getClassMatcher() {
         return ClassMatcher.isExtendedFrom(APACHE_ENHANCE_CLASS).or(ClassMatcher.isExtendedFrom(ALIBABA_ENHANCE_CLASS));
     }
+
+    /**
+     * 获取方法匹配器
+     *
+     * @return 方法匹配器
+     */
+    @Override
+    public MethodMatcher getMethodMatcher() {
+        return super.getMethodMatcher().and(MethodMatcher.paramCountEquals(PARAMETER_COUNT));
+    }
 }
diff --git a/.../src/main/java/com/huaweicloud/sermant/router/dubbo/handler/LaneContextFilterHandler.java b/.../src/main/java/com/huaweicloud/sermant/router/dubbo/handler/LaneContextFilterHandler.java
@@ -20,8 +20,8 @@
 import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
 import com.huaweicloud.sermant.router.common.utils.CollectionUtils;
+import com.huaweicloud.sermant.router.common.utils.DubboReflectUtils;
 import com.huaweicloud.sermant.router.dubbo.service.LaneContextFilterService;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...n/java/com/huaweicloud/sermant/router/dubbo/interceptor/AbstractDirectoryInterceptor.java b/...n/java/com/huaweicloud/sermant/router/dubbo/interceptor/AbstractDirectoryInterceptor.java
@@ -20,7 +20,7 @@
 import com.huaweicloud.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
 import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager;
 import com.huaweicloud.sermant.core.utils.LogUtils;
-import com.huaweicloud.sermant.router.dubbo.service.AbstractDirectoryService;
+import com.huaweicloud.sermant.router.common.service.AbstractDirectoryService;
 
 /**
  * 增强AbstractDirectory的子类的doList方法，筛选标签应用的地址
@@ -29,6 +29,7 @@
  * @since 2021-06-28
  */
 public class AbstractDirectoryInterceptor extends AbstractInterceptor {
+    private static final int INDEX = 0;
     private final AbstractDirectoryService abstractDirectoryService;
 
     /**
@@ -46,7 +47,8 @@ public ExecuteContext before(ExecuteContext context) {
 
     @Override
     public ExecuteContext after(ExecuteContext context) {
-        context.changeResult(abstractDirectoryService.selectInvokers(context.getObject(), context.getArguments(),
+        Object[] arguments = context.getArguments();
+        context.changeResult(abstractDirectoryService.selectInvokers(context.getObject(), arguments[INDEX],
                 context.getResult()));
         LogUtils.printDubboRequestAfterPoint(context);
         return context;

diff --git a/...n/java/com/huaweicloud/sermant/router/dubbo/interceptor/ApplicationConfigInterceptor.java b/...n/java/com/huaweicloud/sermant/router/dubbo/interceptor/ApplicationConfigInterceptor.java
@@ -20,9 +20,9 @@
 import com.huaweicloud.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
 import com.huaweicloud.sermant.core.plugin.config.PluginConfigManager;
 import com.huaweicloud.sermant.core.utils.StringUtils;
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.config.RouterConfig;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
+import com.huaweicloud.sermant.router.common.utils.DubboReflectUtils;
 import com.huaweicloud.sermant.router.dubbo.utils.ParametersUtils;
 
 import java.util.HashMap;

diff --git a/.../main/java/com/huaweicloud/sermant/router/dubbo/interceptor/ContextFilterInterceptor.java b/.../main/java/com/huaweicloud/sermant/router/dubbo/interceptor/ContextFilterInterceptor.java
@@ -21,12 +21,12 @@
 import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager;
 import com.huaweicloud.sermant.router.common.handler.Handler;
 import com.huaweicloud.sermant.router.common.utils.CollectionUtils;
+import com.huaweicloud.sermant.router.common.utils.DubboReflectUtils;
 import com.huaweicloud.sermant.router.common.utils.ThreadLocalUtils;
 import com.huaweicloud.sermant.router.dubbo.handler.AbstractContextFilterHandler;
 import com.huaweicloud.sermant.router.dubbo.handler.LaneContextFilterHandler;
 import com.huaweicloud.sermant.router.dubbo.handler.RouteContextFilterHandler;
 import com.huaweicloud.sermant.router.dubbo.service.DubboConfigService;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
 
 import java.util.ArrayList;
 import java.util.Comparator;

diff --git a/...n/java/com/huaweicloud/sermant/router/dubbo/interceptor/SpringApplicationInterceptor.java b/...n/java/com/huaweicloud/sermant/router/dubbo/interceptor/SpringApplicationInterceptor.java
@@ -19,8 +19,8 @@
 import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext;
 import com.huaweicloud.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
 import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager;
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 import com.huaweicloud.sermant.router.dubbo.service.DubboConfigService;
 
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/...uter-plugin/src/main/java/com/huaweicloud/sermant/router/dubbo/utils/ParametersUtils.java b/...uter-plugin/src/main/java/com/huaweicloud/sermant/router/dubbo/utils/ParametersUtils.java
@@ -17,10 +17,10 @@
 package com.huaweicloud.sermant.router.dubbo.utils;
 
 import com.huaweicloud.sermant.core.utils.StringUtils;
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.config.RouterConfig;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
 import com.huaweicloud.sermant.router.common.utils.CollectionUtils;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 
 import java.util.HashMap;
 import java.util.Locale;

diff --git a/.../test/java/com/huaweicloud/sermant/router/dubbo/handler/LaneContextFilterHandlerTest.java b/.../test/java/com/huaweicloud/sermant/router/dubbo/handler/LaneContextFilterHandlerTest.java
@@ -19,7 +19,6 @@
 import com.huaweicloud.sermant.core.service.ServiceManager;
 import com.huaweicloud.sermant.router.dubbo.TestDubboConfigService;
 import com.huaweicloud.sermant.router.dubbo.service.LaneContextFilterService;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtilsTest.ApacheInvoker;
 
 import org.apache.dubbo.rpc.RpcInvocation;
 import org.junit.AfterClass;
@@ -53,6 +52,9 @@ public class LaneContextFilterHandlerTest {
 
     private final ApacheInvoker<?> invoker;
 
+    private static final org.apache.dubbo.common.URL APACHE_URL = org.apache.dubbo.common.URL
+            .valueOf("dubbo://localhost:8081/com.huaweicloud.foo.FooTest?foo=bar&version=0.0.1");
+
     /**
      * UT执行前进行mock
      */
@@ -130,4 +132,31 @@ public void setReturnEmpty(boolean returnEmpty) {
             this.returnEmpty = returnEmpty;
         }
     }
+
+    public static class ApacheInvoker<T> implements org.apache.dubbo.rpc.Invoker<T> {
+        @Override
+        public Class<T> getInterface() {
+            return null;
+        }
+
+        @Override
+        public org.apache.dubbo.rpc.Result invoke(org.apache.dubbo.rpc.Invocation invocation)
+                throws org.apache.dubbo.rpc.RpcException {
+            return null;
+        }
+
+        @Override
+        public org.apache.dubbo.common.URL getUrl() {
+            return APACHE_URL;
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return false;
+        }
+
+        @Override
+        public void destroy() {
+        }
+    }
 }
diff --git a/...va/com/huaweicloud/sermant/router/dubbo/interceptor/ApplicationConfigInterceptorTest.java b/...va/com/huaweicloud/sermant/router/dubbo/interceptor/ApplicationConfigInterceptorTest.java
@@ -17,9 +17,9 @@
 package com.huaweicloud.sermant.router.dubbo.interceptor;
 
 import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext;
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.config.RouterConfig;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 
 import com.alibaba.dubbo.config.ApplicationConfig;
 

diff --git a/...-service/src/main/java/com/huaweicloud/sermant/router/dubbo/handler/FlowRouteHandler.java b/...-service/src/main/java/com/huaweicloud/sermant/router/dubbo/handler/FlowRouteHandler.java
@@ -18,9 +18,11 @@
 
 import com.huaweicloud.sermant.core.plugin.config.PluginConfigManager;
 import com.huaweicloud.sermant.core.utils.StringUtils;
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.config.RouterConfig;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
 import com.huaweicloud.sermant.router.common.utils.CollectionUtils;
+import com.huaweicloud.sermant.router.common.utils.DubboReflectUtils;
 import com.huaweicloud.sermant.router.common.utils.FlowContextUtils;
 import com.huaweicloud.sermant.router.config.cache.ConfigCache;
 import com.huaweicloud.sermant.router.config.entity.Match;
@@ -32,10 +34,8 @@
 import com.huaweicloud.sermant.router.config.entity.ValueMatch;
 import com.huaweicloud.sermant.router.config.utils.FlowRuleUtils;
 import com.huaweicloud.sermant.router.config.utils.RuleUtils;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 import com.huaweicloud.sermant.router.dubbo.strategy.RuleStrategyHandler;
 import com.huaweicloud.sermant.router.dubbo.strategy.TypeStrategyChooser;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...r-service/src/main/java/com/huaweicloud/sermant/router/dubbo/handler/TagRouteHandler.java b/...r-service/src/main/java/com/huaweicloud/sermant/router/dubbo/handler/TagRouteHandler.java
@@ -16,6 +16,7 @@
 
 package com.huaweicloud.sermant.router.dubbo.handler;
 
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
 import com.huaweicloud.sermant.router.common.utils.CollectionUtils;
 import com.huaweicloud.sermant.router.config.cache.ConfigCache;
@@ -27,7 +28,6 @@
 import com.huaweicloud.sermant.router.config.entity.Rule;
 import com.huaweicloud.sermant.router.config.entity.ValueMatch;
 import com.huaweicloud.sermant.router.config.utils.TagRuleUtils;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 import com.huaweicloud.sermant.router.dubbo.strategy.RuleStrategyHandler;
 
 import java.util.Collections;

diff --git a/.../main/java/com/huaweicloud/sermant/router/dubbo/service/AbstractDirectoryServiceImpl.java b/.../main/java/com/huaweicloud/sermant/router/dubbo/service/AbstractDirectoryServiceImpl.java
@@ -17,12 +17,13 @@
 package com.huaweicloud.sermant.router.dubbo.service;
 
 import com.huaweicloud.sermant.core.utils.StringUtils;
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.request.RequestTag;
+import com.huaweicloud.sermant.router.common.service.AbstractDirectoryService;
 import com.huaweicloud.sermant.router.common.utils.CollectionUtils;
+import com.huaweicloud.sermant.router.common.utils.DubboReflectUtils;
 import com.huaweicloud.sermant.router.common.utils.ThreadLocalUtils;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 import com.huaweicloud.sermant.router.dubbo.handler.HandlerChainEntry;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -47,7 +48,7 @@ public class AbstractDirectoryServiceImpl implements AbstractDirectoryService {
      * 筛选标签invoker
      *
      * @param registryDirectory RegistryDirectory
-     * @param arguments 参数
+     * @param invocation 参数
      * @param result invokers
      * @return invokers
      * @see com.alibaba.dubbo.registry.integration.RegistryDirectory
@@ -56,14 +57,13 @@ public class AbstractDirectoryServiceImpl implements AbstractDirectoryService {
      * @see org.apache.dubbo.rpc.Invoker
      */
     @Override
-    public Object selectInvokers(Object registryDirectory, Object[] arguments, Object result) {
-        if (arguments == null || arguments.length == 0) {
+    public Object selectInvokers(Object registryDirectory, Object invocation, Object result) {
+        if (invocation == null) {
             return result;
         }
         if (!(result instanceof List<?>)) {
             return result;
         }
-        Object invocation = arguments[0];
         putAttachment(invocation);
         List<Object> invokers = (List<Object>) result;
         Map<String, String> queryMap = DubboReflectUtils.getQueryMap(registryDirectory);

diff --git a/...e/src/main/java/com/huaweicloud/sermant/router/dubbo/service/ClusterUtilsServiceImpl.java b/...e/src/main/java/com/huaweicloud/sermant/router/dubbo/service/ClusterUtilsServiceImpl.java
@@ -16,9 +16,9 @@
 
 package com.huaweicloud.sermant.router.dubbo.service;
 
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
+import com.huaweicloud.sermant.router.common.utils.DubboReflectUtils;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ain/java/com/huaweicloud/sermant/router/dubbo/service/InvokerRuleStrategyServiceImpl.java b/...ain/java/com/huaweicloud/sermant/router/dubbo/service/InvokerRuleStrategyServiceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024-2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ * 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 com.huaweicloud.sermant.router.dubbo.service;
+
+import com.huaweicloud.sermant.router.common.mapper.AbstractMetadataMapper;
+import com.huaweicloud.sermant.router.common.service.InvokerRuleStrategyService;
+import com.huaweicloud.sermant.router.dubbo.strategy.RuleStrategyHandler;
+
+/**
+ * 设置InvokerRuleStrategy的service
+ *
+ * @author chengyouling
+ * @since 2024-02-23
+ */
+public class InvokerRuleStrategyServiceImpl implements InvokerRuleStrategyService {
+    @Override
+    public void builedDubbo3RuleStrategy(AbstractMetadataMapper<Object> mapper) {
+        RuleStrategyHandler.INSTANCE.builedDubbo3Mapper(mapper);
+    }
+}
diff --git a/.../main/java/com/huaweicloud/sermant/router/dubbo/service/LaneContextFilterServiceImpl.java b/.../main/java/com/huaweicloud/sermant/router/dubbo/service/LaneContextFilterServiceImpl.java
@@ -16,14 +16,14 @@
 
 package com.huaweicloud.sermant.router.dubbo.service;
 
+import com.huaweicloud.sermant.router.common.cache.DubboCache;
 import com.huaweicloud.sermant.router.common.constants.RouterConstant;
 import com.huaweicloud.sermant.router.config.cache.ConfigCache;
 import com.huaweicloud.sermant.router.config.entity.Protocol;
 import com.huaweicloud.sermant.router.config.entity.Route;
 import com.huaweicloud.sermant.router.config.entity.RouterConfiguration;
 import com.huaweicloud.sermant.router.config.entity.Rule;
 import com.huaweicloud.sermant.router.config.utils.RuleUtils;
-import com.huaweicloud.sermant.router.dubbo.cache.DubboCache;
 import com.huaweicloud.sermant.router.dubbo.utils.RouteUtils;
 
 import java.util.Collections;

diff --git a/...vice/src/main/java/com/huaweicloud/sermant/router/dubbo/strategy/RuleStrategyHandler.java b/...vice/src/main/java/com/huaweicloud/sermant/router/dubbo/strategy/RuleStrategyHandler.java
@@ -16,6 +16,8 @@
 
 package com.huaweicloud.sermant.router.dubbo.strategy;
 
+import com.huaweicloud.sermant.router.common.mapper.AbstractMetadataMapper;
+import com.huaweicloud.sermant.router.common.mapper.DefaultMapper;
 import com.huaweicloud.sermant.router.config.entity.Rule;
 import com.huaweicloud.sermant.router.config.strategy.RuleStrategy;
 import com.huaweicloud.sermant.router.dubbo.strategy.rule.InvokerRuleStrategy;
@@ -35,10 +37,15 @@ public enum RuleStrategyHandler {
      */
     INSTANCE;
 
-    private final RuleStrategy<Object> ruleStrategy;
+    private RuleStrategy<Object> ruleStrategy = new InvokerRuleStrategy(new DefaultMapper());
 
-    RuleStrategyHandler() {
-        this.ruleStrategy = new InvokerRuleStrategy();
+    /**
+     * 构建dubbo3.x应用注册时的metadata处理类
+     *
+     * @param mapper 元数据meta处理mapper
+     */
+    public void builedDubbo3Mapper(AbstractMetadataMapper<Object> mapper) {
+        ruleStrategy = new InvokerRuleStrategy(mapper);
     }
 
     /**

diff --git a/...src/main/java/com/huaweicloud/sermant/router/dubbo/strategy/rule/InvokerRuleStrategy.java b/...src/main/java/com/huaweicloud/sermant/router/dubbo/strategy/rule/InvokerRuleStrategy.java
@@ -16,10 +16,10 @@
 
 package com.huaweicloud.sermant.router.dubbo.strategy.rule;
 
+import com.huaweicloud.sermant.router.common.mapper.AbstractMetadataMapper;
 import com.huaweicloud.sermant.router.config.strategy.AbstractRuleStrategy;
 import com.huaweicloud.sermant.router.dubbo.strategy.instance.MatchInstanceStrategy;
 import com.huaweicloud.sermant.router.dubbo.strategy.instance.MismatchInstanceStrategy;
-import com.huaweicloud.sermant.router.dubbo.utils.DubboReflectUtils;
 
 /**
  * 路由规则匹配策略
@@ -30,9 +30,10 @@
 public class InvokerRuleStrategy extends AbstractRuleStrategy<Object> {
     /**
      * 构造方法
+     *
+     * @param mapper metadata处理
      */
-    public InvokerRuleStrategy() {
-        super("dubbo", new MatchInstanceStrategy(), new MismatchInstanceStrategy(),
-                obj -> DubboReflectUtils.getParameters(DubboReflectUtils.getUrl(obj)));
+    public InvokerRuleStrategy(AbstractMetadataMapper<Object> mapper) {
+        super("dubbo", new MatchInstanceStrategy(), new MismatchInstanceStrategy(), mapper);
     }
 }
diff --git a/...ain/resources/META-INF/services/com.huaweicloud.sermant.core.plugin.service.PluginService b/...ain/resources/META-INF/services/com.huaweicloud.sermant.core.plugin.service.PluginService
@@ -4,4 +4,5 @@
 
 com.huaweicloud.sermant.router.dubbo.service.AbstractDirectoryServiceImpl
 com.huaweicloud.sermant.router.dubbo.service.ClusterUtilsServiceImpl
-com.huaweicloud.sermant.router.dubbo.service.LaneContextFilterServiceImpl
+com.huaweicloud.sermant.router.dubbo.service.LaneContextFilterServiceImpl
+com.huaweicloud.sermant.router.dubbo.service.InvokerRuleStrategyServiceImpl