Merge pull request #314 from eazence/issue_313

feat: Turbo编译加速变更MQ的exchange #313
TencentBlueKing · Nov 6, 2024 · b7a4eba · b7a4eba
2 parents 32b710e + e2a0dfb
commit b7a4eba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/...o/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/mongotemplate/TurboSummaryDao.kt b/...o/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/mongotemplate/TurboSummaryDao.kt
@@ -5,6 +5,7 @@ import com.tencent.devops.turbo.model.TTurboDaySummaryEntity
 import com.tencent.devops.turbo.pojo.TurboDaySummaryOverviewModel
 import org.bson.Document
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.data.domain.Sort
 import org.springframework.data.mongodb.core.FindAndModifyOptions
 import org.springframework.data.mongodb.core.MongoTemplate
 import org.springframework.data.mongodb.core.aggregation.Aggregation
@@ -144,8 +145,9 @@ class TurboSummaryDao @Autowired constructor(
 
         val skip = Aggregation.skip((pageNum * pageSize).toLong())
         val limit = Aggregation.limit(pageSize.toLong())
+        val sort = Aggregation.sort(Sort.Direction.ASC, "_id")
 
-        val aggregation = Aggregation.newAggregation(match, group, skip, limit)
+        val aggregation = Aggregation.newAggregation(match, group, sort, skip, limit)
         val queryResults: AggregationResults<TurboDaySummaryOverviewModel> =
             mongoTemplate.aggregate(aggregation, "t_turbo_day_summary_entity", TurboDaySummaryOverviewModel::class.java)
         return queryResults.mappedResults

diff --git a/...backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/job/BkMetricsDailyJob.kt b/...backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/job/BkMetricsDailyJob.kt
@@ -85,13 +85,6 @@ class BkMetricsDailyJob @Autowired constructor(
             turboSaveTime = saveTime
         )
 
-        bkMetricsRabbitTemplate.convertAndSend(EXCHANGE_METRICS_STATISTIC_TURBO_DAILY, "",
-            JsonUtil.toJson(bkMetricsMessage)) { message: Message ->
-            val messageProperties = message.messageProperties
-            messageProperties.setHeader("contentType", "application/json")
-            messageProperties.setHeader("contentEncoding", "UTF-8")
-            messageProperties.deliveryMode = MessageDeliveryMode.PERSISTENT
-            message
-        }
+        bkMetricsRabbitTemplate.convertAndSend(EXCHANGE_METRICS_STATISTIC_TURBO_DAILY, "", bkMetricsMessage)
     }
 }
diff --git a/...rbo/common-turbo-util/src/main/kotlin/com/tencent/devops/common/util/constants/TurboMQ.kt b/...rbo/common-turbo-util/src/main/kotlin/com/tencent/devops/common/util/constants/TurboMQ.kt
@@ -12,7 +12,7 @@ const val ROUTE_TURBO_PLUGIN_DATA = "route.turbo.plugin.data.new"
 /**
  * 蓝盾度量数据上报
  */
-const val EXCHANGE_METRICS_STATISTIC_TURBO_DAILY = "e.metrics.statistic.turbo.daily"
+const val EXCHANGE_METRICS_STATISTIC_TURBO_DAILY = "metrics.statistic.turbo.daily"
 
 /**
  * 蓝盾项目停用广播通知