feat: 升级devops-framework版本 TencentBlueKing#73 升级mongo driver版本

yaoxuwan · Apr 27, 2023 · 8114277 · 8114277
1 parent bbac80a
commit 8114277
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/backend/build.gradle.kts b/src/backend/build.gradle.kts
@@ -68,6 +68,13 @@ allprojects {
             }
             dependency("com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:${Versions.ReactiveFeign}")
             dependency("org.springframework.cloud:spring-cloud-sleuth-otel-dependencies:${Versions.SleuthOtel}")
+            dependencySet("org.mongodb:${Versions.Mongo}") {
+                entry("bson")
+                entry("bson-record")
+                entry("mongodb-driver-core")
+                entry("mongodb-driver-reactivestreams")
+                entry("mongodb-driver-sync")
+            }
         }
     }
     ext["netty.version"] = Versions.Netty

diff --git a/src/backend/buildSrc/src/main/kotlin/Versions.kt b/src/backend/buildSrc/src/main/kotlin/Versions.kt
@@ -62,4 +62,5 @@ object Versions {
     const val SleuthOtel = "1.1.2"
     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
@@ -68,5 +68,4 @@ class OtelWebConfiguration  {
         const val HEADER_BKREPO_TRACE_ID = "X-BkRepo-Trace-Id"
         const val TRACE_ID_BAGGAGE_KEY = "X-BKREPO-TRACE-ID"
     }
-
 }
diff --git a/support-files/kubernetes/charts/bkrepo/templates/configmap-common.yaml b/support-files/kubernetes/charts/bkrepo/templates/configmap-common.yaml
@@ -16,8 +16,6 @@ data:
       config: classpath:logback-config.xml
       path: /data/workspace/logs
     spring:
-      sleuth:
-        enabled: true
       data:
         mongodb:
           uri: {{ include "bkrepo.mongodbUri" . }}