From 23179d6ff6e00b67a6fc0680a3bad3311f546455 Mon Sep 17 00:00:00 2001
From: HaojunRen <1394997@qq.com>
Date: Wed, 1 Jan 2020 12:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8C=E6=97=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AADiscoveryEnabledStrategy=E7=9A=84=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=9B=E6=94=AF=E6=8C=81=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=80=89=E6=8B=A9=E5=AD=90=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=9B=E4=BF=AE=E5=A4=8D=E5=AD=90?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E8=BF=87=E6=BB=A4=E4=B8=BA=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE=E4=B8=AD=E7=9A=84env=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/StrategyOpentracingOperation.java           | 8 ++++++++
 .../discovery/plugin/strategy/tracer/StrategyTracer.java  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/discovery-plugin-strategy-opentracing/src/main/java/com/nepxion/discovery/plugin/opentracing/operation/StrategyOpentracingOperation.java b/discovery-plugin-strategy-opentracing/src/main/java/com/nepxion/discovery/plugin/opentracing/operation/StrategyOpentracingOperation.java
index 3d00ae3b91..a2f699f0b3 100644
--- a/discovery-plugin-strategy-opentracing/src/main/java/com/nepxion/discovery/plugin/opentracing/operation/StrategyOpentracingOperation.java
+++ b/discovery-plugin-strategy-opentracing/src/main/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/discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/tracer/StrategyTracer.java b/discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/tracer/StrategyTracer.java
index f967fb8968..1dd7d57887 100644
--- a/discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/tracer/StrategyTracer.java
+++ b/discovery-plugin-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);