From 5ffd74e18aafba69a4a305a9f1e475c3a70d984e Mon Sep 17 00:00:00 2001
From: chuntaojun <liaochuntao@live.com>
Date: Mon, 26 Sep 2022 22:45:34 +0800
Subject: [PATCH] fix ci error for issue 563

---
 .../cloud/common/metadata/MetadataContextHolder.java      | 6 +++++-
 .../cloud/common/metadata/StaticMetadataManager.java      | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java
index 3fe11f38e..60983ef69 100644
--- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java
+++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java
@@ -26,6 +26,7 @@ import com.tencent.cloud.common.metadata.config.MetadataLocalProperties;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import static com.tencent.cloud.common.metadata.MetadataContext.FRAGMENT_DISPOSABLE;
 import static com.tencent.cloud.common.metadata.MetadataContext.FRAGMENT_RAW_TRANSHEADERS;
@@ -68,7 +69,10 @@ public final class MetadataContextHolder {
 		MetadataContext metadataContext = new MetadataContext();
 		metadataContext.putFragmentContext(FRAGMENT_TRANSITIVE, staticMetadataManager.getMergedStaticTransitiveMetadata());
 		metadataContext.putFragmentContext(FRAGMENT_DISPOSABLE, staticMetadataManager.getMergedStaticDisposableMetadata());
-		metadataContext.putContext(FRAGMENT_RAW_TRANSHEADERS, staticMetadataManager.getEnvTransHeaderMetadata(), "");
+
+		if (StringUtils.hasText(staticMetadataManager.getTransHeaderFromEnv())) {
+			metadataContext.putContext(FRAGMENT_RAW_TRANSHEADERS, staticMetadataManager.getTransHeaderFromEnv(), "");
+		}
 
 		METADATA_CONTEXT.set(metadataContext);
 
diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java
index b983bc906..7c38ed2ec 100644
--- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java
+++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java
@@ -60,7 +60,7 @@ public class StaticMetadataManager {
 	 * The value mapped by this key was specified by user.
 	 * This is configured in environment variables.
 	 */
-	private static final String ENV_METADATA_CONTENT_RAW_TRANSHEADERS = "SCT_METADATA_CONTENT_RAW_TRANSHEADERS";
+	private static final String ENV_TRAFFIC_CONTENT_RAW_TRANSHEADERS = "SCT_TRAFFIC_CONTENT_RAW_TRANSHEADERS";
 	private static final String ENV_METADATA_ZONE = "SCT_METADATA_ZONE";
 	private static final String ENV_METADATA_REGION = "SCT_METADATA_REGION";
 	private static final String ENV_METADATA_CAMPUS = "SCT_METADATA_CAMPUS";
@@ -107,7 +107,7 @@ public class StaticMetadataManager {
 			if (StringUtils.isNotBlank(key) && key.startsWith(ENV_METADATA_PREFIX)
 					&& !key.equals(ENV_METADATA_CONTENT_TRANSITIVE)) {
 				String sourceKey = "";
-				if (key.equals(ENV_METADATA_CONTENT_RAW_TRANSHEADERS)) {
+				if (key.equals(ENV_TRAFFIC_CONTENT_RAW_TRANSHEADERS)) {
 					sourceKey = key;
 				}
 				else {
@@ -282,8 +282,8 @@ public class StaticMetadataManager {
 		return envMetadata;
 	}
 
-	public String getEnvTransHeaderMetadata() {
-		return envMetadata.get(ENV_METADATA_CONTENT_RAW_TRANSHEADERS);
+	public String getTransHeaderFromEnv() {
+		return envMetadata.get(ENV_TRAFFIC_CONTENT_RAW_TRANSHEADERS);
 	}
 
 	public Map<String, String> getEnvTransitiveMetadata() {