From f83909edc4ab195f90f42a2ab08ac2f78f433bcf Mon Sep 17 00:00:00 2001 From: shedfreewu Date: Thu, 17 Jul 2025 21:52:47 +0800 Subject: [PATCH] =?UTF-8?q?tracing=20=E8=AE=BE=E7=BD=AE=20ns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enhancement/instrument/feign/EnhancedFeignClient.java | 7 +++++++ .../resttemplate/EnhancedRestTemplateWrapInterceptor.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClient.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClient.java index 0e9553660..2d3b12ef4 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClient.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClient.java @@ -26,6 +26,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext; import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginRunner; import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType; @@ -71,11 +74,15 @@ public class EnhancedFeignClient implements Client { URI serviceUrl = url.resolve(request.requestTemplate().url()); + String governanceNamespace = MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_APPLICATION_NONE, + MetadataConstant.POLARIS_TARGET_NAMESPACE, MetadataContext.LOCAL_NAMESPACE); + EnhancedRequestContext enhancedRequestContext = EnhancedRequestContext.builder() .httpHeaders(requestHeaders) .httpMethod(HttpMethod.valueOf(request.httpMethod().name())) .url(url) .serviceUrl(serviceUrl) + .governanceNamespace(governanceNamespace) .build(); enhancedPluginContext.setRequest(enhancedRequestContext); enhancedPluginContext.setOriginRequest(request); diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateWrapInterceptor.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateWrapInterceptor.java index cb29597f3..d1d79d0aa 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateWrapInterceptor.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateWrapInterceptor.java @@ -22,6 +22,8 @@ import java.net.URI; import java.util.Optional; import com.tencent.cloud.common.constant.ContextConstant; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext; import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginRunner; @@ -68,11 +70,15 @@ public class EnhancedRestTemplateWrapInterceptor { serviceUrl = ((ServiceRequestWrapper) httpRequest).getRequest().getURI(); } + String governanceNamespace = MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_APPLICATION_NONE, + MetadataConstant.POLARIS_TARGET_NAMESPACE, MetadataContext.LOCAL_NAMESPACE); + EnhancedRequestContext enhancedRequestContext = EnhancedRequestContext.builder() .httpHeaders(httpRequest.getHeaders()) .httpMethod(httpRequest.getMethod()) .url(httpRequest.getURI()) .serviceUrl(serviceUrl) + .governanceNamespace(governanceNamespace) .build(); enhancedPluginContext.setRequest(enhancedRequestContext); enhancedPluginContext.setOriginRequest(httpRequest);