支持同时多个DiscoveryEnabledStrategy的联合判断；支持网关动态选择子环境的功能；修复子环境过滤为判断元数据中的env…

…为空的Bug
Alleninggx · Jan 1, 2020 · 23179d6 · 23179d6
1 parent 005670c
commit 23179d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/...java/com/nepxion/discovery/plugin/opentracing/operation/StrategyOpentracingOperation.java b/...java/com/nepxion/discovery/plugin/opentracing/operation/StrategyOpentracingOperation.java
@@ -110,6 +110,10 @@ public void opentracingHeader(Map<String, String> customizationMap) {
             if (StringUtils.isNotEmpty(routeAddress)) {
                 span.setTag(DiscoveryConstant.N_D_ADDRESS, routeAddress);
             }
+            String routeEnvironment = strategyContextHolder.getHeader(DiscoveryConstant.N_D_ENVIRONMENT);
+            if (StringUtils.isNotEmpty(routeEnvironment)) {
+                span.setTag(DiscoveryConstant.N_D_ENVIRONMENT, routeEnvironment);
+            }
             String routeVersionWeight = strategyContextHolder.getHeader(DiscoveryConstant.N_D_VERSION_WEIGHT);
             if (StringUtils.isNotEmpty(routeVersionWeight)) {
                 span.setTag(DiscoveryConstant.N_D_VERSION_WEIGHT, routeVersionWeight);
@@ -170,6 +174,10 @@ public void opentracingLocal(String className, String methodName, Map<String, St
             if (StringUtils.isNotEmpty(routeAddress)) {
                 span.setTag(DiscoveryConstant.N_D_ADDRESS, routeAddress);
             }
+            String routeEnvironment = strategyContextHolder.getHeader(DiscoveryConstant.N_D_ENVIRONMENT);
+            if (StringUtils.isNotEmpty(routeEnvironment)) {
+                span.setTag(DiscoveryConstant.N_D_ENVIRONMENT, routeEnvironment);
+            }
             String routeVersionWeight = strategyContextHolder.getHeader(DiscoveryConstant.N_D_VERSION_WEIGHT);
             if (StringUtils.isNotEmpty(routeVersionWeight)) {
                 span.setTag(DiscoveryConstant.N_D_VERSION_WEIGHT, routeVersionWeight);

diff --git a/...n-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/tracer/StrategyTracer.java b/...n-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/tracer/StrategyTracer.java
@@ -140,6 +140,10 @@ public void debugHeader() {
         if (StringUtils.isNotEmpty(routeAddress)) {
             System.out.println(DiscoveryConstant.N_D_ADDRESS + "=" + routeAddress);
         }
+        String routeEnvironment = strategyContextHolder.getHeader(DiscoveryConstant.N_D_ENVIRONMENT);
+        if (StringUtils.isNotEmpty(routeEnvironment)) {
+            System.out.println(DiscoveryConstant.N_D_ENVIRONMENT + "=" + routeEnvironment);
+        }
         String routeVersionWeight = strategyContextHolder.getHeader(DiscoveryConstant.N_D_VERSION_WEIGHT);
         if (StringUtils.isNotEmpty(routeVersionWeight)) {
             System.out.println(DiscoveryConstant.N_D_VERSION_WEIGHT + "=" + routeVersionWeight);
@@ -188,6 +192,10 @@ public void debugLocal() {
         if (StringUtils.isNotEmpty(routeAddress)) {
             System.out.println(DiscoveryConstant.N_D_ADDRESS + "=" + routeAddress);
         }
+        String routeEnvironment = strategyContextHolder.getHeader(DiscoveryConstant.N_D_ENVIRONMENT);
+        if (StringUtils.isNotEmpty(routeEnvironment)) {
+            System.out.println(DiscoveryConstant.N_D_ENVIRONMENT + "=" + routeEnvironment);
+        }
         String routeVersionWeight = strategyContextHolder.getHeader(DiscoveryConstant.N_D_VERSION_WEIGHT);
         if (StringUtils.isNotEmpty(routeVersionWeight)) {
             System.out.println(DiscoveryConstant.N_D_VERSION_WEIGHT + "=" + routeVersionWeight);