fill context

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplier.java

@@ -33,7 +33,7 @@ import com.tencent.cloud.common.metadata.MetadataContextHolder;
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.polaris.router.resttemplate.PolarisLoadBalancerRequest;
-import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor;
 import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor;
 import com.tencent.polaris.api.exception.ErrorCode;

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterUtils.java

@@ -24,7 +24,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
-import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultServiceInstances;
 import com.tencent.polaris.api.pojo.Instance;
 import com.tencent.polaris.api.pojo.ServiceInstances;

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java

@@ -22,10 +22,10 @@ import java.util.List;
 
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.polaris.router.PolarisRouterServiceInstanceListSupplier;
-import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor;
 import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor;
-import com.tencent.cloud.polaris.router.transformer.PolarisInstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.polaris.router.api.core.RouterAPI;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplierTest.java

@@ -41,7 +41,7 @@ import com.tencent.cloud.polaris.router.interceptor.RuleBasedRouterRequestInterc
 import com.tencent.cloud.polaris.router.resttemplate.PolarisLoadBalancerRequest;
 import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor;
 import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor;
-import com.tencent.cloud.polaris.router.transformer.PolarisInstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.polaris.api.exception.PolarisException;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import com.tencent.polaris.api.pojo.DefaultServiceInstances;

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/RouterUtilsTest.java

@@ -24,7 +24,7 @@ import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.metadata.MetadataContextHolder;
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
-import com.tencent.cloud.polaris.router.transformer.PolarisInstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import com.tencent.polaris.api.pojo.Instance;
 import com.tencent.polaris.api.pojo.ServiceInstances;

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfigurationTest.java

@@ -20,7 +20,7 @@ package com.tencent.cloud.polaris.router.config;
 
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.cloud.polaris.router.PolarisRouterServiceInstanceListSupplier;
-import com.tencent.cloud.polaris.router.transformer.PolarisInstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.polaris.router.api.core.RouterAPI;
 import org.junit.jupiter.api.Test;
 

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/transformer/PolarisInstanceTransformerTest.java

@@ -20,6 +20,7 @@ package com.tencent.cloud.polaris.router.transformer;
 
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import com.tencent.polaris.api.pojo.Instance;
 import org.junit.jupiter.api.BeforeAll;

spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfiguration.java

@@ -21,7 +21,7 @@ package com.tencent.cloud.plugin.discovery.adapter.config;
 import com.tencent.cloud.plugin.discovery.adapter.transformer.NacosInstanceTransformer;
 import com.tencent.cloud.polaris.router.config.ConditionalOnPolarisRouterEnabled;
 import com.tencent.cloud.polaris.router.config.LoadBalancerConfiguration;
-import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosInstanceTransformer.java

@@ -18,7 +18,7 @@
 
 package com.tencent.cloud.plugin.discovery.adapter.transformer;
 
-import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import org.apache.commons.lang.StringUtils;
 

spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/test/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfigurationTest.java

@@ -19,7 +19,7 @@
 package com.tencent.cloud.plugin.discovery.adapter.config;
 
 import com.tencent.cloud.plugin.discovery.adapter.transformer.NacosInstanceTransformer;
-import com.tencent.cloud.polaris.router.transformer.PolarisInstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java

@@ -20,6 +20,7 @@ package com.tencent.cloud.rpc.enhancement.config;
 import java.util.Collections;
 import java.util.List;
 
+import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignBeanPostProcessor;
@@ -40,6 +41,8 @@ import com.tencent.cloud.rpc.enhancement.plugin.reporter.SuccessPolarisReporter;
 import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedRestTemplateInterceptor;
 import com.tencent.cloud.rpc.enhancement.resttemplate.PolarisLoadBalancerRequestTransformer;
 import com.tencent.cloud.rpc.enhancement.scg.EnhancedGatewayGlobalFilter;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.cloud.rpc.enhancement.webclient.EnhancedWebClientExchangeFilterFunction;
 import com.tencent.cloud.rpc.enhancement.webclient.PolarisLoadBalancerClientRequestTransformer;
 import com.tencent.polaris.api.core.ConsumerAPI;
@@ -86,6 +89,13 @@ import static jakarta.servlet.DispatcherType.REQUEST;
 @AutoConfigureAfter(PolarisContextAutoConfiguration.class)
 public class RpcEnhancementAutoConfiguration {
 
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(PolarisServiceInstance.class)
+	public InstanceTransformer instanceTransformer() {
+		return new PolarisInstanceTransformer();
+	}
+
 	@Bean
 	@Lazy
 	public EnhancedPluginRunner enhancedFeignPluginRunner(
@@ -108,13 +118,13 @@ public class RpcEnhancementAutoConfiguration {
 	}
 
 	@Bean
-	public AssemblyClientExceptionHook assemblyClientExceptionHook(AssemblyAPI assemblyAPI) {
+	public AssemblyClientExceptionHook assemblyClientExceptionHook(AssemblyAPI assemblyAPI, InstanceTransformer instanceTransformer) {
-		return new AssemblyClientExceptionHook(assemblyAPI);
+		return new AssemblyClientExceptionHook(assemblyAPI, instanceTransformer);
 	}
 
 	@Bean
-	public AssemblyClientPostHook assemblyClientPostHook(AssemblyAPI assemblyAPI) {
+	public AssemblyClientPostHook assemblyClientPostHook(AssemblyAPI assemblyAPI, InstanceTransformer instanceTransformer) {
-		return new AssemblyClientPostHook(assemblyAPI);
+		return new AssemblyClientPostHook(assemblyAPI, instanceTransformer);
 	}
 
 	@Bean

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/filter/EnhancedReactiveFilter.java

@@ -54,6 +54,8 @@ public class EnhancedReactiveFilter implements WebFilter, Ordered {
 				.build();
 		enhancedPluginContext.setRequest(enhancedRequestContext);
 
+		enhancedPluginContext.setLocalServiceInstance(pluginRunner.getLocalServiceInstance());
+
 		// Run pre enhanced plugins.
 		pluginRunner.run(EnhancedPluginType.Server.PRE, enhancedPluginContext);
 

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/filter/EnhancedServletFilter.java

@@ -73,6 +73,8 @@ public class EnhancedServletFilter extends OncePerRequestFilter {
 				.build();
 		enhancedPluginContext.setRequest(enhancedRequestContext);
 
+		enhancedPluginContext.setLocalServiceInstance(pluginRunner.getLocalServiceInstance());
+
 		// Run pre enhanced plugins.
 		pluginRunner.run(EnhancedPluginType.Server.PRE, enhancedPluginContext);
 

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java

@@ -24,9 +24,14 @@ import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tencent.cloud.common.constant.HeaderConstant;
 import com.tencent.cloud.common.constant.RouterConstant;
 import com.tencent.cloud.common.metadata.MetadataContext;
@@ -252,5 +257,27 @@ public final class PolarisEnhancedPluginUtils {
 		return null;
 	}
 
+	public static Map<String, String> getLabelMap(HttpHeaders headers) {
+		if (headers != null) {
+			Collection<String> labels = headers.get(RouterConstant.ROUTER_LABEL_HEADER);
+			if (CollectionUtils.isNotEmpty(labels) && labels.iterator().hasNext()) {
+				String label = labels.iterator().next();
+				try {
+					label = URLDecoder.decode(label, UTF_8);
+				}
+				catch (UnsupportedEncodingException e) {
+					LOG.error("unsupported charset exception " + UTF_8, e);
+				}
+				try {
+					return new ObjectMapper().readValue(label, new TypeReference<HashMap<String,String>>() {});
+				}
+				catch (JsonProcessingException e) {
+					LOG.error("parse label map exception", e);
+				}
+			}
+		}
+		return null;
+	}
+
 
 }

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/AssemblyMetadataProvider.java

@@ -0,0 +1,35 @@
+package com.tencent.cloud.rpc.enhancement.plugin.assembly;
+
+import com.tencent.cloud.common.metadata.MetadataContext;
+import com.tencent.polaris.api.pojo.ServiceKey;
+import com.tencent.polaris.api.rpc.MetadataProvider;
+
+import org.springframework.cloud.client.ServiceInstance;
+
+public class AssemblyMetadataProvider implements MetadataProvider {
+
+	private final ServiceInstance serviceInstance;
+
+	private final String namespace;
+
+	public AssemblyMetadataProvider(ServiceInstance localServiceInstance, String namespace) {
+		this.serviceInstance = localServiceInstance;
+		this.namespace = namespace;
+	}
+
+	@Override
+	public String getMetadata(String key) {
+		return serviceInstance.getMetadata().get(key);
+	}
+
+	@Override
+	public ServiceKey getLocalService() {
+		return new ServiceKey(namespace, serviceInstance.getServiceId());
+	}
+
+	@Override
+	public String getLocalIp() {
+		return serviceInstance.getHost();
+	}
+
+}

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientExceptionHook.java

@@ -22,12 +22,15 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
 import com.tencent.cloud.rpc.enhancement.plugin.PolarisEnhancedPluginUtils;
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
+import com.tencent.polaris.assembly.api.pojo.Capability;
 
 import org.springframework.core.Ordered;
 
@@ -40,8 +43,11 @@ public class AssemblyClientExceptionHook implements EnhancedPlugin {
 
 	private final AssemblyAPI assemblyAPI;
 
-	public AssemblyClientExceptionHook(AssemblyAPI assemblyAPI) {
+	private final InstanceTransformer instanceTransformer;
+
+	public AssemblyClientExceptionHook(AssemblyAPI assemblyAPI, InstanceTransformer instanceTransformer) {
 		this.assemblyAPI = assemblyAPI;
+		this.instanceTransformer = instanceTransformer;
 	}
 
 	@Override
@@ -51,17 +57,21 @@ public class AssemblyClientExceptionHook implements EnhancedPlugin {
 
 	@Override
 	public void run(EnhancedPluginContext context) {
+
 		AfterRequest afterRequest = new AfterRequest();
-		afterRequest.setTargetService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getTargetServiceInstance().getServiceId()));
+		afterRequest.setCapabilities(new Capability[]{Capability.ALL});
-		RequestContext requestContext = new AssemblyRequestContext(
+		afterRequest.setRequestContext(new AssemblyRequestContext(
 				context.getRequest(),
 				new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getLocalServiceInstance().getServiceId()),
 				context.getLocalServiceInstance().getHost()
-		);
+		));
-		afterRequest.setRequestContext(requestContext);
+		afterRequest.setResponseContext(new AssemblyResponseContext(null, context.getThrowable()));
-
+		afterRequest.setMetadataProvider(new AssemblyMetadataProvider(context.getLocalServiceInstance(), MetadataContext.LOCAL_NAMESPACE));
-		AssemblyResponseContext responseContext = new AssemblyResponseContext(null, context.getThrowable());
+		afterRequest.setDelay(context.getDelay());
-		afterRequest.setResponseContext(responseContext);
+		afterRequest.setRouteLabels(PolarisEnhancedPluginUtils.getLabelMap(context.getRequest().getHttpHeaders()));
+		// TargetService and TargetInstance only exist in client side
+		afterRequest.setTargetService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getTargetServiceInstance().getServiceId()));
+		afterRequest.setTargetInstance(instanceTransformer.transform(context.getTargetServiceInstance()));
 
 		assemblyAPI.afterCallService(afterRequest);
 	}

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPostHook.java

@@ -22,12 +22,15 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
 import com.tencent.cloud.rpc.enhancement.plugin.PolarisEnhancedPluginUtils;
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
+import com.tencent.polaris.assembly.api.pojo.Capability;
 
 import org.springframework.core.Ordered;
 
@@ -40,8 +43,11 @@ public class AssemblyClientPostHook implements EnhancedPlugin {
 
 	private final AssemblyAPI assemblyAPI;
 
-	public AssemblyClientPostHook(AssemblyAPI assemblyAPI) {
+	private final InstanceTransformer instanceTransformer;
+
+	public AssemblyClientPostHook(AssemblyAPI assemblyAPI, InstanceTransformer instanceTransformer) {
 		this.assemblyAPI = assemblyAPI;
+		this.instanceTransformer = instanceTransformer;
 	}
 
 	@Override
@@ -51,17 +57,21 @@ public class AssemblyClientPostHook implements EnhancedPlugin {
 
 	@Override
 	public void run(EnhancedPluginContext context) {
+
 		AfterRequest afterRequest = new AfterRequest();
-		afterRequest.setTargetService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getTargetServiceInstance().getServiceId()));
+		afterRequest.setCapabilities(new Capability[]{Capability.ALL});
-		RequestContext requestContext = new AssemblyRequestContext(
+		afterRequest.setRequestContext(new AssemblyRequestContext(
 				context.getRequest(),
 				new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getLocalServiceInstance().getServiceId()),
 				context.getLocalServiceInstance().getHost()
-		);
+		));
-		afterRequest.setRequestContext(requestContext);
+		afterRequest.setResponseContext(new AssemblyResponseContext(context.getResponse(), null));
-
+		afterRequest.setMetadataProvider(new AssemblyMetadataProvider(context.getLocalServiceInstance(), MetadataContext.LOCAL_NAMESPACE));
-		AssemblyResponseContext responseContext = new AssemblyResponseContext(context.getResponse(), null);
+		afterRequest.setDelay(context.getDelay());
-		afterRequest.setResponseContext(responseContext);
+		afterRequest.setRouteLabels(PolarisEnhancedPluginUtils.getLabelMap(context.getRequest().getHttpHeaders()));
+		// TargetService and TargetInstance only exist in client side
+		afterRequest.setTargetService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getTargetServiceInstance().getServiceId()));
+		afterRequest.setTargetInstance(instanceTransformer.transform(context.getTargetServiceInstance()));
 
 		assemblyAPI.afterCallService(afterRequest);
 	}

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPreHook.java

@@ -21,11 +21,13 @@ import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.BeforeRequest;
+import com.tencent.polaris.assembly.api.pojo.Capability;
 
 import org.springframework.core.Ordered;
 
@@ -49,14 +51,18 @@ public class AssemblyClientPreHook implements EnhancedPlugin {
 
 	@Override
 	public void run(EnhancedPluginContext context) {
+
 		BeforeRequest beforeRequest = new BeforeRequest();
-		beforeRequest.setTargetService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getTargetServiceInstance().getServiceId()));
+		beforeRequest.setCapabilities(new Capability[]{Capability.ALL});
-		RequestContext requestContext = new AssemblyRequestContext(
+		beforeRequest.setRequestContext(new AssemblyRequestContext(
 				context.getRequest(),
 				new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getLocalServiceInstance().getServiceId()),
 				context.getLocalServiceInstance().getHost()
-		);
+		));
-		beforeRequest.setRequestContext(requestContext);
+		beforeRequest.setMetadataProvider(new AssemblyMetadataProvider(context.getLocalServiceInstance(), MetadataContext.LOCAL_NAMESPACE));
+		// TargetService only exist in client side
+		beforeRequest.setTargetService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getTargetServiceInstance().getServiceId()));
+
 		assemblyAPI.beforeCallService(beforeRequest);
 	}
 

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerExceptionHook.java

@@ -22,12 +22,14 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
 import com.tencent.cloud.rpc.enhancement.plugin.PolarisEnhancedPluginUtils;
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
+import com.tencent.polaris.assembly.api.pojo.Capability;
 
 import org.springframework.core.Ordered;
 
@@ -52,15 +54,16 @@ public class AssemblyServerExceptionHook implements EnhancedPlugin {
 	@Override
 	public void run(EnhancedPluginContext context) {
 		AfterRequest afterRequest = new AfterRequest();
-		RequestContext requestContext = new AssemblyRequestContext(
+		afterRequest.setCapabilities(new Capability[]{Capability.ALL});
+		afterRequest.setRequestContext(new AssemblyRequestContext(
 				context.getRequest(),
 				new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getLocalServiceInstance().getServiceId()),
 				context.getLocalServiceInstance().getHost()
-		);
+		));
-		afterRequest.setRequestContext(requestContext);
+		afterRequest.setResponseContext(new AssemblyResponseContext(null, context.getThrowable()));
-
+		afterRequest.setMetadataProvider(new AssemblyMetadataProvider(context.getLocalServiceInstance(), MetadataContext.LOCAL_NAMESPACE));
-		AssemblyResponseContext responseContext = new AssemblyResponseContext(null, context.getThrowable());
+		afterRequest.setDelay(context.getDelay());
-		afterRequest.setResponseContext(responseContext);
+		afterRequest.setRouteLabels(PolarisEnhancedPluginUtils.getLabelMap(context.getRequest().getHttpHeaders()));
 
 		assemblyAPI.afterProcess(afterRequest);
 	}

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPostHook.java

@@ -22,12 +22,14 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
 import com.tencent.cloud.rpc.enhancement.plugin.PolarisEnhancedPluginUtils;
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
+import com.tencent.polaris.assembly.api.pojo.Capability;
 
 import org.springframework.core.Ordered;
 
@@ -52,15 +54,16 @@ public class AssemblyServerPostHook implements EnhancedPlugin {
 	@Override
 	public void run(EnhancedPluginContext context) {
 		AfterRequest afterRequest = new AfterRequest();
-		RequestContext requestContext = new AssemblyRequestContext(
+		afterRequest.setCapabilities(new Capability[]{Capability.ALL});
+		afterRequest.setRequestContext(new AssemblyRequestContext(
 				context.getRequest(),
 				new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getLocalServiceInstance().getServiceId()),
 				context.getLocalServiceInstance().getHost()
-		);
+		));
-		afterRequest.setRequestContext(requestContext);
+		afterRequest.setResponseContext(new AssemblyResponseContext(context.getResponse(), null));
-
+		afterRequest.setMetadataProvider(new AssemblyMetadataProvider(context.getLocalServiceInstance(), MetadataContext.LOCAL_NAMESPACE));
-		AssemblyResponseContext responseContext = new AssemblyResponseContext(context.getResponse(), null);
+		afterRequest.setDelay(context.getDelay());
-		afterRequest.setResponseContext(responseContext);
+		afterRequest.setRouteLabels(PolarisEnhancedPluginUtils.getLabelMap(context.getRequest().getHttpHeaders()));
 
 		assemblyAPI.afterProcess(afterRequest);
 	}

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPreHook.java

@@ -21,11 +21,13 @@ import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.BeforeRequest;
+import com.tencent.polaris.assembly.api.pojo.Capability;
 
 import org.springframework.core.Ordered;
 
@@ -50,12 +52,14 @@ public class AssemblyServerPreHook implements EnhancedPlugin {
 	@Override
 	public void run(EnhancedPluginContext context) {
 		BeforeRequest beforeRequest = new BeforeRequest();
-		RequestContext requestContext = new AssemblyRequestContext(
+		beforeRequest.setCapabilities(new Capability[]{Capability.ALL});
+		beforeRequest.setRequestContext(new AssemblyRequestContext(
 				context.getRequest(),
 				new ServiceKey(MetadataContext.LOCAL_NAMESPACE, context.getLocalServiceInstance().getServiceId()),
 				context.getLocalServiceInstance().getHost()
-		);
+		));
-		beforeRequest.setRequestContext(requestContext);
+		beforeRequest.setMetadataProvider(new AssemblyMetadataProvider(context.getLocalServiceInstance(), MetadataContext.LOCAL_NAMESPACE));
+
 		assemblyAPI.beforeProcess(beforeRequest);
 	}
 

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/InstanceTransformer.java

@@ -16,7 +16,7 @@
  *
  */
 
-package com.tencent.cloud.polaris.router.spi;
+package com.tencent.cloud.rpc.enhancement.transformer;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.polaris.api.pojo.DefaultInstance;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java

@@ -16,10 +16,10 @@
  *
  */
 
-package com.tencent.cloud.polaris.router.transformer;
+package com.tencent.cloud.rpc.enhancement.transformer;
 
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
-import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 
 import org.springframework.cloud.client.ServiceInstance;

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtilsTest.java

@@ -21,15 +21,13 @@ import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
+import java.util.HashMap;
 
 import com.tencent.cloud.common.constant.HeaderConstant;
 import com.tencent.cloud.common.constant.RouterConstant;
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
-import com.tencent.polaris.api.config.Configuration;
-import com.tencent.polaris.api.config.global.APIConfig;
-import com.tencent.polaris.api.config.global.GlobalConfig;
 import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
 import com.tencent.polaris.api.pojo.RetStatus;
 import com.tencent.polaris.api.rpc.ServiceCallResult;
@@ -100,6 +98,10 @@ public class PolarisEnhancedPluginUtilsTest {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.add(RouterConstant.ROUTER_LABEL_HEADER, "{\"k1\":\"v1\"}");
 
+		assertThat(PolarisEnhancedPluginUtils.getLabelMap(requestHeaders)).isEqualTo(new HashMap<String, String>(){{
+			put("k1", "v1");
+		}});
+
 		serviceCallResult = PolarisEnhancedPluginUtils.createServiceCallResult(
 				"0.0.0.0",
 				"test",