Merge pull request #117 from jd-opensource/116-fix-unit-route-without…

…-unit-rule-id Fix unit route without unit rule id
jd-opensource · Oct 21, 2024 · 9efefe0 · 9efefe0
2 parents f515fd7 + d014653
commit 9efefe0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...e/invoke/filter/inbound/UnitInFilter.java → ...nce/invoke/filter/inbound/UnitFilter.java b/...e/invoke/filter/inbound/UnitInFilter.java → ...nce/invoke/filter/inbound/UnitFilter.java
@@ -34,14 +34,14 @@
 import static com.jd.live.agent.governance.invoke.Invocation.*;
 
 /**
- * UnitInFilter
+ * UnitFilter
  *
  * @author Zhiguo.Chen
  * @since 1.0.0
  */
-@Extension(value = "UnitInFilter", order = InboundFilter.ORDER_LIVE_UNIT)
+@Extension(value = "UnitFilter", order = InboundFilter.ORDER_LIVE_UNIT)
 @ConditionalOnProperty(value = GovernanceConfig.CONFIG_LIVE_ENABLED, matchIfMissing = true)
-public class UnitInFilter implements InboundFilter {
+public class UnitFilter implements InboundFilter {
 
     @Override
     public <T extends InboundRequest> void filter(InboundInvocation<T> invocation, InboundFilterChain chain) {

diff --git a/...rnance-api/src/main/java/com/jd/live/agent/governance/invoke/filter/route/UnitFilter.java b/...rnance-api/src/main/java/com/jd/live/agent/governance/invoke/filter/route/UnitFilter.java
@@ -90,6 +90,10 @@ private <T extends OutboundRequest> RouteTarget route(OutboundInvocation<T> invo
         ServiceMetadata serviceMetadata = invocation.getServiceMetadata();
         ServiceLivePolicy livePolicy = serviceMetadata.getServiceLivePolicy();
         UnitPolicy unitPolicy = serviceMetadata.getUnitPolicy();
+        if (liveMetadata.getUnitRuleId() == null) {
+            // Not live domain
+            return routeNone(invocation, endpoints, liveMetadata);
+        }
         switch (unitPolicy) {
             case NONE:
                 return routeNone(invocation, endpoints, liveMetadata);

diff --git a/...main/resources/META-INF/services/com.jd.live.agent.governance.invoke.filter.InboundFilter b/...main/resources/META-INF/services/com.jd.live.agent.governance.invoke.filter.InboundFilter
@@ -1,7 +1,7 @@
 com.jd.live.agent.governance.invoke.filter.inbound.ReadyFilter
 com.jd.live.agent.governance.invoke.filter.inbound.AuthFilter
 com.jd.live.agent.governance.invoke.filter.inbound.PermissionFilter
-com.jd.live.agent.governance.invoke.filter.inbound.UnitInFilter
+com.jd.live.agent.governance.invoke.filter.inbound.UnitFilter
 com.jd.live.agent.governance.invoke.filter.inbound.CellFilter
 com.jd.live.agent.governance.invoke.filter.inbound.FailoverFilter
 com.jd.live.agent.governance.invoke.filter.inbound.RateLimitFilter