feat: support tsf trace demo & remove client span attributes (#1419)

Co-authored-by: andrew shan <[email protected]>
Tencent · Aug 28, 2024 · 22592a2 · 22592a2
1 parent b2d127d
commit 22592a2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,4 +26,5 @@
 - [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1414)
 - [fix: move ConditionalOnTsfEnabled to spring-cloud-tencent-commons and fix PolarisInetUtilsAutoConfiguration.](https://github.com/Tencent/spring-cloud-tencent/pull/1415)
 - [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1416)
-- [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1417)
+- [feat:support consul config data. ](https://github.com/Tencent/spring-cloud-tencent/pull/1417)
+- [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1419)
diff --git a/spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml b/spring-cloud-tencent-examples/tsf-example/consumer-demo/pom.xml
@@ -36,6 +36,16 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-metadata-transfer</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-trace-plugin</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml b/spring-cloud-tencent-examples/tsf-example/provider-demo/pom.xml
@@ -39,6 +39,14 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-metadata-transfer</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-trace-plugin</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...lugin/src/main/java/com/tencent/cloud/plugin/trace/TraceClientMetadataEnhancedPlugin.java b/...lugin/src/main/java/com/tencent/cloud/plugin/trace/TraceClientMetadataEnhancedPlugin.java
diff --git a/...main/java/com/tencent/cloud/plugin/trace/config/TraceEnhancedPluginAutoConfiguration.java b/...main/java/com/tencent/cloud/plugin/trace/config/TraceEnhancedPluginAutoConfiguration.java
@@ -19,7 +19,6 @@
 package com.tencent.cloud.plugin.trace.config;
 
 import com.tencent.cloud.plugin.trace.SpanAttributesProvider;
-import com.tencent.cloud.plugin.trace.TraceClientMetadataEnhancedPlugin;
 import com.tencent.cloud.plugin.trace.TraceServerMetadataEnhancedPlugin;
 import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
 import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
@@ -35,12 +34,6 @@
 @ConditionalOnProperty(value = "spring.cloud.polaris.trace.enabled", matchIfMissing = true)
 public class TraceEnhancedPluginAutoConfiguration {
 
-	@Bean
-	public TraceClientMetadataEnhancedPlugin traceClientMetadataEnhancedPlugin(
-			PolarisSDKContextManager polarisSDKContextManager, @Autowired(required = false) SpanAttributesProvider spanAttributesProvider) {
-		return new TraceClientMetadataEnhancedPlugin(polarisSDKContextManager, spanAttributesProvider);
-	}
-
 	@Bean
 	public TraceServerMetadataEnhancedPlugin traceServerMetadataEnhancedPlugin(
 			PolarisSDKContextManager polarisSDKContextManager, @Autowired(required = false) SpanAttributesProvider spanAttributesProvider) {