feat: 升级devops-framework版本 #73

TencentBlueKing · Apr 27, 2023 · fdc4b20 · fdc4b20
1 parent 8114277
commit fdc4b20
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/backend/build.gradle.kts b/src/backend/build.gradle.kts
@@ -79,7 +79,7 @@ allprojects {
     }
     ext["netty.version"] = Versions.Netty
     // 2.1.2才支持配置使用信号量隔离
-    ext["spring-cloud-circuitbreaker.version"] = Versions.SpringCloudCircuitbreaker
+//    ext["spring-cloud-circuitbreaker.version"] = Versions.SpringCloudCircuitbreaker
 
     configurations.all {
         // io.netty:netty已替换成io.netty:netty-all

diff --git a/src/backend/buildSrc/src/main/kotlin/Versions.kt b/src/backend/buildSrc/src/main/kotlin/Versions.kt
@@ -31,7 +31,7 @@ object Release {
 }
 
 object Versions {
-    const val DevopsBoot = "0.0.7-SNAPSHOT"
+    const val DevopsBoot = "0.0.7"
     const val Netty = "4.1.77.Final"
     const val SpringCloudCircuitbreaker = "2.1.2"
     const val Jersey = "2.35"
@@ -59,7 +59,7 @@ object Versions {
     const val DockerJava = "3.2.13"
     const val Mockk = "1.12.2"
     const val Swagger = "1.6.2"
-    const val SleuthOtel = "1.1.2"
+    const val SleuthOtel = "1.1.1"
     const val KubernetesClient = "11.0.2"
     const val ReactiveFeign = "3.2.6"
     const val Mongo = "4.6.1"

diff --git a/...ervice/src/main/kotlin/com/tencent/bkrepo/common/service/otel/web/OtelWebConfiguration.kt b/...ervice/src/main/kotlin/com/tencent/bkrepo/common/service/otel/web/OtelWebConfiguration.kt
@@ -54,10 +54,13 @@ class OtelWebConfiguration  {
     fun traceIdInResponseFilter(tracer: Tracer): Filter {
         return Filter { request, response, chain ->
             val currentSpan: Span? = tracer.currentSpan()
+            val resp = response as HttpServletResponse
             if (currentSpan != null) {
-                val resp = response as HttpServletResponse
-                resp.addHeader(HEADER_TRACE_ID, currentSpan.context().traceId())
-                resp.addHeader(HEADER_BKREPO_TRACE_ID, tracer.getBaggage(TRACE_ID_BAGGAGE_KEY)?.get().toString())
+                resp.addHeader(HEADER_TRACE_ID, currentSpan.context()?.traceId())
+                val baggage = tracer.getBaggage(TRACE_ID_BAGGAGE_KEY)?.get()
+                if (!baggage.isNullOrBlank()) {
+                    resp.addHeader(HEADER_BKREPO_TRACE_ID, baggage)
+                }
             }
             chain.doFilter(request, response)
         }

diff --git a/.../common-service/src/main/kotlin/com/tencent/bkrepo/common/service/util/ResponseBuilder.kt b/.../common-service/src/main/kotlin/com/tencent/bkrepo/common/service/util/ResponseBuilder.kt
@@ -60,7 +60,16 @@ object ResponseBuilder {
     private fun getTraceId(): String? {
         return try {
             val tracer = SpringContextUtils.getBean<Tracer>()
-            tracer.getBaggage(TRACE_ID_BAGGAGE_KEY)?.get() ?: tracer.currentSpan()?.context()?.traceId()
+            if (tracer.currentSpan() != null) {
+                val baggage = tracer.getBaggage(TRACE_ID_BAGGAGE_KEY)?.get()
+                if (baggage.isNullOrBlank()) {
+                    tracer.currentSpan()!!.context()?.traceId()
+                } else {
+                    baggage
+                }
+            } else {
+                null
+            }
         } catch (_: BeansException) {
             null
         }