hoxton 2.0.0.0 (#1458)

* fix:fix restTemplateCustomizer bean conflict causing service to fail to start properly. * fix:fix NullPointerException when properties contain kv with null value. * fix: memory not released while using wildcard api call with circuitbreaker (#1361) * fix: memory not released while using wildcard api call with circuitbreaker enabled * fix: change version 1.13.3-Hoxton.SR12-SNAPSHOT * fix: update polaris verion to 1.15.9 release * Update CHANGELOG.md * release 1.13.3-Hoxton.SR12 (#1362) * fix: memory not released while using wildcard api call with circuitbreaker enabled * fix: change version 1.13.3-Hoxton.SR12-SNAPSHOT * fix: update polaris verion to 1.15.9 release * Update CHANGELOG.md * release: 1.13.3-Hoxton.SR12 * fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis (#1392) * fix: CHANGE VERSION TO 1.13.4-Hoxton.SR12-SNAPSHOT (#1407) * fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoked by wildcard apis * Update CHANGELOG.md * fix: restore PolarisCircuitBreakerUtils and use ThreadPoolUtils.waitAndStopThreadPools instead * fix: 修复命名不一致问题 * fix: CHANGE VERSION TO 1.13.4-Hoxton.SR12-SNAPSHOT * Update polaris version to 1.15.10-SNAPSHOT * fix:fix rate limit window update bug. * fix: fix npe when feign.hystrix.enabled=false (#1436) * feat: support 2.0.0 feature * fix * feat: support lossless config from console & support warmup (#1435) feat:add admin http handler. (#1448) feat:support concurrency rate limit. (#1454) * fix * add changelog * fix * fix changelog * fix * fix checkstyle * fix ut --------- Co-authored-by: 码匠君 <[email protected]> Co-authored-by: Haotian Zhang <[email protected]> Co-authored-by: andrew shan <[email protected]> Co-authored-by: shedfreewu <[email protected]>
Tencent · Nov 19, 2024 · 84a98de · 84a98de
1 parent eab382b
commit 84a98de
Show file tree

Hide file tree

Showing 351 changed files with 10,034 additions and 3,684 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,4 +15,5 @@
 - [fix:fix the ratelimit bug for hoxton](https://github.com/Tencent/spring-cloud-tencent/pull/1301)
 - [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1306)
 - [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1313)
-- [fix: memory not released while using wildcard api call with circuitbreaker enabled](https://github.com/Tencent/spring-cloud-tencent/pull/1335)
+- [fix: memory not released while using wildcard api call with circuitbreaker enabled](https://github.com/Tencent/spring-cloud-tencent/pull/1335)
+- [feat: support 2.0.0](https://github.com/Tencent/spring-cloud-tencent/pull/1458)
diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-Hoxton.SR12-RC3</revision>
+		<revision>2.0.0.0-Hoxton.SR12-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>5.2.25.RELEASE</spring.framework.version>

diff --git a/spring-cloud-starter-tencent-all/pom.xml b/spring-cloud-starter-tencent-all/pom.xml
@@ -49,6 +49,11 @@
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-starter-tencent-polaris-contract</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-trace-plugin</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...er/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java b/...er/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java
@@ -26,7 +26,6 @@
 import com.tencent.cloud.metadata.core.EncodeTransferMedataScgEnhancedPlugin;
 import com.tencent.cloud.metadata.core.EncodeTransferMedataWebClientEnhancedPlugin;
 import com.tencent.cloud.metadata.core.EncodeTransferMetadataZuulEnhancedPlugin;
-import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -67,8 +66,8 @@ public FilterRegistrationBean<DecodeTransferMetadataServletFilter> metadataServl
 		}
 
 		@Bean
-		public DecodeTransferMetadataServletFilter metadataServletFilter(PolarisContextProperties polarisContextProperties) {
-			return new DecodeTransferMetadataServletFilter(polarisContextProperties);
+		public DecodeTransferMetadataServletFilter metadataServletFilter() {
+			return new DecodeTransferMetadataServletFilter();
 		}
 	}
 
@@ -80,8 +79,8 @@ public DecodeTransferMetadataServletFilter metadataServletFilter(PolarisContextP
 	protected static class MetadataReactiveFilterConfig {
 
 		@Bean
-		public DecodeTransferMetadataReactiveFilter metadataReactiveFilter(PolarisContextProperties polarisContextProperties) {
-			return new DecodeTransferMetadataReactiveFilter(polarisContextProperties);
+		public DecodeTransferMetadataReactiveFilter metadataReactiveFilter() {
+			return new DecodeTransferMetadataReactiveFilter();
 		}
 
 	}
@@ -91,11 +90,10 @@ public DecodeTransferMetadataReactiveFilter metadataReactiveFilter(PolarisContex
 	 */
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(name = "com.netflix.zuul.http.ZuulServlet")
-	@ConditionalOnProperty(value = "spring.cloud.tencent.rpc-enhancement.enabled", havingValue = "true", matchIfMissing = true)
 	protected static class MetadataTransferZuulFilterConfig {
 
 		@Bean
-		public EncodeTransferMetadataZuulEnhancedPlugin encodeTransferMedataZuulEnhancedPlugin() {
+		public EncodeTransferMetadataZuulEnhancedPlugin encodeTransferMetadataZuulEnhancedPlugin() {
 			return new EncodeTransferMetadataZuulEnhancedPlugin();
 		}
 

diff --git a/...r/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java b/...r/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java
@@ -27,7 +27,7 @@
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.common.util.UrlUtils;
 import com.tencent.cloud.metadata.provider.ReactiveMetadataProvider;
-import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
+import com.tencent.polaris.api.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
@@ -39,8 +39,10 @@
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
 
+import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.APPLICATION_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_DISPOSABLE_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA;
+import static com.tencent.polaris.metadata.core.constant.MetadataConstants.LOCAL_IP;
 
 /**
  * Filter used for storing the metadata from upstream temporarily when web application is
@@ -50,14 +52,8 @@
  */
 public class DecodeTransferMetadataReactiveFilter implements WebFilter, Ordered {
 
-	private PolarisContextProperties polarisContextProperties;
-
 	private static final Logger LOG = LoggerFactory.getLogger(DecodeTransferMetadataReactiveFilter.class);
 
-	public DecodeTransferMetadataReactiveFilter(PolarisContextProperties polarisContextProperties) {
-		this.polarisContextProperties = polarisContextProperties;
-	}
-
 	@Override
 	public int getOrder() {
 		return OrderConstant.Server.Reactive.DECODE_TRANSFER_METADATA_FILTER_ORDER;
@@ -67,16 +63,34 @@ public int getOrder() {
 	public Mono<Void> filter(ServerWebExchange serverWebExchange, WebFilterChain webFilterChain) {
 		// Get metadata string from http header.
 		ServerHttpRequest serverHttpRequest = serverWebExchange.getRequest();
-		Map<String, String> internalTransitiveMetadata = getIntervalMetadata(serverHttpRequest, CUSTOM_METADATA);
-		Map<String, String> customTransitiveMetadata = CustomTransitiveMetadataResolver.resolve(serverWebExchange);
 
+		// transitive metadata
+		// from specific header
+		Map<String, String> internalTransitiveMetadata = getInternalMetadata(serverHttpRequest, CUSTOM_METADATA);
+		// from header with specific prefix
+		Map<String, String> customTransitiveMetadata = CustomTransitiveMetadataResolver.resolve(serverWebExchange);
 		Map<String, String> mergedTransitiveMetadata = new HashMap<>();
 		mergedTransitiveMetadata.putAll(internalTransitiveMetadata);
 		mergedTransitiveMetadata.putAll(customTransitiveMetadata);
-		Map<String, String> internalDisposableMetadata = getIntervalMetadata(serverHttpRequest, CUSTOM_DISPOSABLE_METADATA);
+
+		// disposable metadata
+		// from specific header
+		Map<String, String> internalDisposableMetadata = getInternalMetadata(serverHttpRequest, CUSTOM_DISPOSABLE_METADATA);
 		Map<String, String> mergedDisposableMetadata = new HashMap<>(internalDisposableMetadata);
-		ReactiveMetadataProvider metadataProvider = new ReactiveMetadataProvider(serverHttpRequest, polarisContextProperties.getLocalIpAddress());
-		MetadataContextHolder.init(mergedTransitiveMetadata, mergedDisposableMetadata, metadataProvider);
+
+		// application metadata
+		Map<String, String> internalApplicationMetadata = getInternalMetadata(serverHttpRequest, APPLICATION_METADATA);
+		Map<String, String> mergedApplicationMetadata = new HashMap<>(internalApplicationMetadata);
+
+		String callerIp = "";
+		if (StringUtils.isNotBlank(mergedApplicationMetadata.get(LOCAL_IP))) {
+			callerIp = mergedApplicationMetadata.get(LOCAL_IP);
+		}
+		// message metadata
+		ReactiveMetadataProvider callerMessageMetadataProvider = new ReactiveMetadataProvider(serverHttpRequest, callerIp);
+
+		MetadataContextHolder.init(mergedTransitiveMetadata, mergedDisposableMetadata, mergedApplicationMetadata, callerMessageMetadataProvider);
+
 		// Save to ServerWebExchange.
 		serverWebExchange.getAttributes().put(
 				MetadataConstant.HeaderName.METADATA_CONTEXT,
@@ -89,7 +103,7 @@ public Mono<Void> filter(ServerWebExchange serverWebExchange, WebFilterChain web
 				.doFinally((type) -> MetadataContextHolder.remove());
 	}
 
-	private Map<String, String> getIntervalMetadata(ServerHttpRequest serverHttpRequest, String headerName) {
+	private Map<String, String> getInternalMetadata(ServerHttpRequest serverHttpRequest, String headerName) {
 		HttpHeaders httpHeaders = serverHttpRequest.getHeaders();
 		String customMetadataStr = UrlUtils.decode(httpHeaders.getFirst(headerName));
 		LOG.debug("Get upstream metadata string: {}", customMetadataStr);

diff --git a/...er/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java b/...er/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java
@@ -32,16 +32,18 @@
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.common.util.UrlUtils;
 import com.tencent.cloud.metadata.provider.ServletMetadataProvider;
-import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
+import com.tencent.polaris.api.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.core.annotation.Order;
 import org.springframework.lang.NonNull;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.APPLICATION_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_DISPOSABLE_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA;
+import static com.tencent.polaris.metadata.core.constant.MetadataConstants.LOCAL_IP;
 
 /**
  * Filter used for storing the metadata from upstream temporarily when web application is
@@ -54,26 +56,36 @@ public class DecodeTransferMetadataServletFilter extends OncePerRequestFilter {
 
 	private static final Logger LOG = LoggerFactory.getLogger(DecodeTransferMetadataServletFilter.class);
 
-	private PolarisContextProperties polarisContextProperties;
-
-	public DecodeTransferMetadataServletFilter(PolarisContextProperties polarisContextProperties) {
-		this.polarisContextProperties = polarisContextProperties;
-	}
-
 	@Override
 	protected void doFilterInternal(@NonNull HttpServletRequest httpServletRequest,
 			@NonNull HttpServletResponse httpServletResponse, FilterChain filterChain)
 			throws ServletException, IOException {
+		// transitive metadata
+		// from specific header
 		Map<String, String> internalTransitiveMetadata = getInternalMetadata(httpServletRequest, CUSTOM_METADATA);
+		// from header with specific prefix
 		Map<String, String> customTransitiveMetadata = CustomTransitiveMetadataResolver.resolve(httpServletRequest);
-
 		Map<String, String> mergedTransitiveMetadata = new HashMap<>();
 		mergedTransitiveMetadata.putAll(internalTransitiveMetadata);
 		mergedTransitiveMetadata.putAll(customTransitiveMetadata);
+
+		// disposable metadata
+		// from specific header
 		Map<String, String> internalDisposableMetadata = getInternalMetadata(httpServletRequest, CUSTOM_DISPOSABLE_METADATA);
 		Map<String, String> mergedDisposableMetadata = new HashMap<>(internalDisposableMetadata);
-		ServletMetadataProvider metadataProvider = new ServletMetadataProvider(httpServletRequest, polarisContextProperties.getLocalIpAddress());
-		MetadataContextHolder.init(mergedTransitiveMetadata, mergedDisposableMetadata, metadataProvider);
+
+		// application metadata
+		Map<String, String> internalApplicationMetadata = getInternalMetadata(httpServletRequest, APPLICATION_METADATA);
+		Map<String, String> mergedApplicationMetadata = new HashMap<>(internalApplicationMetadata);
+
+		String callerIp = "";
+		if (StringUtils.isNotBlank(mergedApplicationMetadata.get(LOCAL_IP))) {
+			callerIp = mergedApplicationMetadata.get(LOCAL_IP);
+		}
+		// message metadata
+		ServletMetadataProvider callerMessageMetadataProvider = new ServletMetadataProvider(httpServletRequest, callerIp);
+
+		MetadataContextHolder.init(mergedTransitiveMetadata, mergedDisposableMetadata, mergedApplicationMetadata, callerMessageMetadataProvider);
 
 		TransHeadersTransfer.transfer(httpServletRequest);
 		try {

diff --git a/...rc/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignEnhancedPlugin.java b/...rc/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignEnhancedPlugin.java
@@ -39,6 +39,7 @@
 
 import org.springframework.util.CollectionUtils;
 
+import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.APPLICATION_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_DISPOSABLE_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA;
 
@@ -64,6 +65,7 @@ public void run(EnhancedPluginContext context) throws Throwable {
 		MetadataContext metadataContext = MetadataContextHolder.get();
 		Map<String, String> customMetadata = metadataContext.getCustomMetadata();
 		Map<String, String> disposableMetadata = metadataContext.getDisposableMetadata();
+		Map<String, String> applicationMetadata = metadataContext.getApplicationMetadata();
 		Map<String, String> transHeaders = metadataContext.getTransHeadersKV();
 
 		MessageMetadataContainer calleeMessageMetadataContainer = metadataContext.getMetadataContainer(MetadataType.MESSAGE, false);
@@ -77,6 +79,9 @@ public void run(EnhancedPluginContext context) throws Throwable {
 		// process custom metadata
 		this.buildMetadataHeader(request, customMetadata, CUSTOM_METADATA);
 
+		// add application metadata
+		this.buildMetadataHeader(request, applicationMetadata, APPLICATION_METADATA);
+
 		// set headers that need to be transmitted from the upstream
 		this.buildTransmittedHeader(request, transHeaders);
 	}

diff --git a/.../java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateEnhancedPlugin.java b/.../java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateEnhancedPlugin.java
@@ -35,6 +35,7 @@
 import org.springframework.http.HttpRequest;
 import org.springframework.util.CollectionUtils;
 
+import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.APPLICATION_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_DISPOSABLE_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA;
 
@@ -60,6 +61,7 @@ public void run(EnhancedPluginContext context) throws Throwable {
 		MetadataContext metadataContext = MetadataContextHolder.get();
 		Map<String, String> customMetadata = metadataContext.getCustomMetadata();
 		Map<String, String> disposableMetadata = metadataContext.getDisposableMetadata();
+		Map<String, String> applicationMetadata = metadataContext.getApplicationMetadata();
 		Map<String, String> transHeaders = metadataContext.getTransHeadersKV();
 		MessageMetadataContainer calleeMessageMetadataContainer = metadataContext.getMetadataContainer(MetadataType.MESSAGE, false);
 		Map<String, String> calleeTransitiveHeaders = calleeMessageMetadataContainer.getTransitiveHeaders();
@@ -72,6 +74,9 @@ public void run(EnhancedPluginContext context) throws Throwable {
 		// build custom metadata request header
 		this.buildMetadataHeader(httpRequest, customMetadata, CUSTOM_METADATA);
 
+		// build application metadata request header
+		this.buildMetadataHeader(httpRequest, applicationMetadata, APPLICATION_METADATA);
+
 		// set headers that need to be transmitted from the upstream
 		this.buildTransmittedHeader(httpRequest, transHeaders);
 	}

diff --git a/.../src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgEnhancedPlugin.java b/.../src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgEnhancedPlugin.java
@@ -37,6 +37,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.server.ServerWebExchange;
 
+import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.APPLICATION_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_DISPOSABLE_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA;
 
@@ -69,6 +70,7 @@ public void run(EnhancedPluginContext context) throws Throwable {
 
 		Map<String, String> customMetadata = metadataContext.getCustomMetadata();
 		Map<String, String> disposableMetadata = metadataContext.getDisposableMetadata();
+		Map<String, String> applicationMetadata = metadataContext.getApplicationMetadata();
 
 		MessageMetadataContainer calleeMessageMetadataContainer = metadataContext.getMetadataContainer(MetadataType.MESSAGE, false);
 		Map<String, String> calleeTransitiveHeaders = calleeMessageMetadataContainer.getTransitiveHeaders();
@@ -77,6 +79,7 @@ public void run(EnhancedPluginContext context) throws Throwable {
 
 		this.buildMetadataHeader(builder, customMetadata, CUSTOM_METADATA);
 		this.buildMetadataHeader(builder, disposableMetadata, CUSTOM_DISPOSABLE_METADATA);
+		this.buildMetadataHeader(builder, applicationMetadata, APPLICATION_METADATA);
 		TransHeadersTransfer.transfer(exchange.getRequest());
 
 		context.setOriginRequest(exchange.mutate().request(builder.build()).build());

diff --git a/...ain/java/com/tencent/cloud/metadata/core/EncodeTransferMedataWebClientEnhancedPlugin.java b/...ain/java/com/tencent/cloud/metadata/core/EncodeTransferMedataWebClientEnhancedPlugin.java
@@ -35,6 +35,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.reactive.function.client.ClientRequest;
 
+import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.APPLICATION_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_DISPOSABLE_METADATA;
 import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA;
 
@@ -59,6 +60,7 @@ public void run(EnhancedPluginContext context) throws Throwable {
 		MetadataContext metadataContext = MetadataContextHolder.get();
 		Map<String, String> customMetadata = metadataContext.getCustomMetadata();
 		Map<String, String> disposableMetadata = metadataContext.getDisposableMetadata();
+		Map<String, String> applicationMetadata = metadataContext.getApplicationMetadata();
 		Map<String, String> transHeaders = metadataContext.getTransHeadersKV();
 		MessageMetadataContainer calleeMessageMetadataContainer = metadataContext.getMetadataContainer(MetadataType.MESSAGE, false);
 		Map<String, String> calleeTransitiveHeaders = calleeMessageMetadataContainer.getTransitiveHeaders();
@@ -70,6 +72,7 @@ public void run(EnhancedPluginContext context) throws Throwable {
 
 		this.buildMetadataHeader(requestBuilder, customMetadata, CUSTOM_METADATA);
 		this.buildMetadataHeader(requestBuilder, disposableMetadata, CUSTOM_DISPOSABLE_METADATA);
+		this.buildMetadataHeader(requestBuilder, applicationMetadata, APPLICATION_METADATA);
 		this.buildTransmittedHeader(requestBuilder, transHeaders);
 
 		context.setOriginRequest(requestBuilder.build());