Merge pull request #1242 from felixncheng/issue_1241

bug: 修复metrics访问失败的问题 #1421
TencentBlueKing · Oct 12, 2023 · 0df933a · 0df933a
2 parents fb86d1e + ee5a085
commit 0df933a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...erver/src/main/kotlin/com/tencent/bkrepo/fs/server/filter/ReactiveRequestContextFilter.kt b/...erver/src/main/kotlin/com/tencent/bkrepo/fs/server/filter/ReactiveRequestContextFilter.kt
@@ -29,11 +29,14 @@ package com.tencent.bkrepo.fs.server.filter
 
 import com.tencent.bkrepo.fs.server.context.ReactiveRequestContextHolder
 import com.tencent.bkrepo.fs.server.context.RequestContext
+import org.springframework.core.Ordered
+import org.springframework.core.annotation.Order
 import org.springframework.web.server.ServerWebExchange
 import org.springframework.web.server.WebFilter
 import org.springframework.web.server.WebFilterChain
 import reactor.core.publisher.Mono
 
+@Order(Ordered.HIGHEST_PRECEDENCE)
 class ReactiveRequestContextFilter : WebFilter {
 
     override fun filter(exchange: ServerWebExchange, chain: WebFilterChain): Mono<Void> {

diff --git a/...d/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/metrics/ServerMetrics.kt b/...d/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/metrics/ServerMetrics.kt
@@ -45,7 +45,7 @@ class ServerMetrics : MeterBinder {
     }
 
     companion object {
-        const val FILE_DOWNLOAD_COUNT = "file_download_count"
-        const val FILE_UPLOAD_COUNT = "file_upload_count"
+        const val FILE_DOWNLOAD_COUNT = "artifact.downloading.count"
+        const val FILE_UPLOAD_COUNT = "artifact.uploading.count"
     }
 }