feat:upgrade lane.

polarismesh · Nov 1, 2024 · fb8a0be · fb8a0be
1 parent a30fabe
commit fb8a0be
Show file tree

Hide file tree

Showing 19 changed files with 1,231 additions and 137 deletions.
diff --git a/polaris-assembly/polaris-assembly-factory/pom.xml b/polaris-assembly/polaris-assembly-factory/pom.xml
@@ -45,6 +45,11 @@
             <artifactId>router-isolated</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>router-lane</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.tencent.polaris</groupId>
             <artifactId>router-healthy</artifactId>

diff --git a/polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml b/polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml
@@ -50,6 +50,11 @@
             <artifactId>router-isolated</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>router-lane</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.tencent.polaris</groupId>
             <artifactId>router-healthy</artifactId>

diff --git a/polaris-common/polaris-config-default/src/main/resources/conf/default-config.yml b/polaris-common/polaris-config-default/src/main/resources/conf/default-config.yml
@@ -169,12 +169,12 @@ consumer:
     beforeChain:
       # 隔离路由
       - isolatedRouter
+      # 泳道路由
+      - laneRouter
     #描述: 服务路由链
     chain:
       # 命名空间就近路由
       - namespaceRouter
-      # 泳道路由
-      - laneRouter
       # 元数据路由
       - metadataRouter
       # 规则路由

diff --git a/polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/utils/CompareUtils.java b/polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/utils/CompareUtils.java
@@ -35,7 +35,7 @@ public static int compareSingleValue(String value1, String value2) {
             return 0;
         }
         if (serviceWildcard1) {
-            // 1 before 2
+            // 2 before 1
             return 1;
         }
         if (serviceWildcard2) {
@@ -52,4 +52,14 @@ public static int compareService(String namespace1, String service1, String name
         }
         return CompareUtils.compareSingleValue(service1, service2);
     }
+
+    /**
+     * compare two boolean.
+     */
+    public static int compareBoolean(boolean b1, boolean b2) {
+        if (b1 == b2) {
+            return 0;
+        }
+        return b1 ? -1 : 1;
+    }
 }
diff --git a/polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/utils/RuleUtils.java b/polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/utils/RuleUtils.java
@@ -172,6 +172,11 @@ public static boolean matchMetadata(Map<String, MatchString> ruleMeta, Map<Strin
         return matchMetadata(ruleMeta, destMeta, null, isMatchSource, multiEnvRouterParamMap, variables, null);
     }
 
+    // 匹配metadata
+    public static boolean matchMetadata(Map<String, MatchString> ruleMeta, Map<String, String> destMeta, MetadataContainerGroup metadataContainerGroup) {
+        return matchMetadata(ruleMeta, destMeta, metadataContainerGroup, true, Collections.emptyMap(), Collections.emptyMap(), null);
+    }
+
     // 匹配metadata
     public static boolean matchMetadata(Map<String, MatchString> ruleMeta, Map<String, String> destMeta,
                                         MetadataContainerGroup metadataContainerGroup, boolean isMatchSource,
@@ -223,7 +228,7 @@ public static boolean matchMetadata(Map<String, MatchString> ruleMeta, Map<Strin
                     destMetaValue = metadataContainerGroup.getCustomMetadataContainer().getRawMetadataStringValue(ruleMetaKey);
                 }
             }
-            if (StringUtils.isBlank(destMetaValue) && destMeta.containsKey(ruleMetaKey)) {
+            if (StringUtils.isBlank(destMetaValue) && CollectionUtils.isNotEmpty(destMeta) && destMeta.containsKey(ruleMetaKey)) {
                 destMetaValue = destMeta.get(ruleMetaKey);
             }
             if (StringUtils.isNotBlank(destMetaValue)) {

diff --git a/polaris-configuration/polaris-configuration-factory/pom.xml b/polaris-configuration/polaris-configuration-factory/pom.xml
@@ -68,6 +68,11 @@
             <artifactId>router-isolated</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>router-lane</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.tencent.polaris</groupId>
             <artifactId>router-healthy</artifactId>

diff --git a/...main/java/com/tencent/polaris/plugins/connector/composite/CompositeServiceUpdateTask.java b/...main/java/com/tencent/polaris/plugins/connector/composite/CompositeServiceUpdateTask.java
@@ -122,7 +122,8 @@ public void execute() {
                 || serviceEventKey.getEventType().equals(EventType.NEARBY_ROUTE_RULE)
                 || serviceEventKey.getEventType().equals(EventType.LOSSLESS)
                 || serviceEventKey.getEventType().equals(EventType.CIRCUIT_BREAKING)
-                || serviceEventKey.getEventType().equals(EventType.RATE_LIMITING)))) {
+                || serviceEventKey.getEventType().equals(EventType.RATE_LIMITING)
+                || serviceEventKey.getEventType().equals(EventType.LANE_RULE)))) {
             return;
         }
         boolean svcDeleted = this.notifyServerEvent(

diff --git a/...consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java b/...consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java
@@ -51,6 +51,7 @@
 import com.tencent.polaris.plugins.connector.consul.service.ServiceService;
 import com.tencent.polaris.plugins.connector.consul.service.circuitbreaker.CircuitBreakingService;
 import com.tencent.polaris.plugins.connector.consul.service.lossless.LosslessService;
+import com.tencent.polaris.plugins.connector.consul.service.lane.LaneService;
 import com.tencent.polaris.plugins.connector.consul.service.ratelimiting.RateLimitingService;
 import com.tencent.polaris.plugins.connector.consul.service.router.NearByRouteRuleService;
 import com.tencent.polaris.plugins.connector.consul.service.router.RoutingService;
@@ -234,6 +235,7 @@ private void initActually(InitContext ctx, ServerConnectorConfig connectorConfig
         consulServiceMap.put(ServiceEventKey.EventType.LOSSLESS, new LosslessService(consulClient, consulRawClient, consulContext, "consul-lossless", mapper));
         consulServiceMap.put(ServiceEventKey.EventType.CIRCUIT_BREAKING, new CircuitBreakingService(consulClient, consulRawClient, consulContext, "consul-circuit-breaking", mapper));
         consulServiceMap.put(ServiceEventKey.EventType.RATE_LIMITING, new RateLimitingService(consulClient, consulRawClient, consulContext, "consul-rate-limiting", mapper));
+        consulServiceMap.put(ServiceEventKey.EventType.LANE_RULE, new LaneService(consulClient, consulRawClient, consulContext, "consul-lane", mapper));
         initialized = true;
     }