From ccbd704bffd7467221631ebc3bb30818ac8a17be Mon Sep 17 00:00:00 2001 From: zacYL Date: Fri, 10 Jan 2025 12:01:20 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E5=AE=B9=E9=87=8F=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E4=BB=A5=E5=8F=8A=E9=87=8D?= =?UTF-8?q?=E8=AF=95=20#2870?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/batch/task/usage/ProjectMonthMetricReportJob.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/usage/ProjectMonthMetricReportJob.kt b/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/usage/ProjectMonthMetricReportJob.kt index aa241a6f30..86b64729a0 100644 --- a/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/usage/ProjectMonthMetricReportJob.kt +++ b/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/usage/ProjectMonthMetricReportJob.kt @@ -30,6 +30,7 @@ package com.tencent.bkrepo.job.batch.task.usage import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.tencent.bkrepo.common.api.constant.MediaTypes +import com.tencent.bkrepo.common.api.constant.retry import com.tencent.bkrepo.common.api.util.JsonUtils import com.tencent.bkrepo.common.storage.innercos.http.toRequestBody import com.tencent.bkrepo.job.BATCH_SIZE @@ -130,7 +131,8 @@ class ProjectMonthMetricReportJob( logger.info("report project month usage with size ${projectMonthUsage.size}") val bkMonthUsage = BkMonthUsage( dataSourceName = properties.reportServiceName, - bills = projectMonthUsage + bills = projectMonthUsage, + month = projectMonthUsage.first().costDate ) val bkMonthUsageSummary = BkMonthUsageSummary(bkMonthUsage) reportUsageData(bkMonthUsageSummary) @@ -143,7 +145,9 @@ class ProjectMonthMetricReportJob( try { val request = Request.Builder().url(url).header(PLATFORM_KEY_HEADER, properties.reportPlatformKey) .post(requestBody).build() - doRequest(okHttpClient, request) + retry(RETRY_COUNT, 1) { + doRequest(okHttpClient, request) + } } catch (exception: Exception) { logger.warn("report usage data error:", exception) } @@ -231,5 +235,6 @@ class ProjectMonthMetricReportJob( private val logger = LoggerFactory.getLogger(ProjectMonthMetricReportJob::class.java) private const val COLLECTION_NAME_PROJECT_METRICS_DAILY_AVG_RECORD = "project_metrics_daily_avg_record" private const val PLATFORM_KEY_HEADER = "Platform-Key" + private const val RETRY_COUNT = 3 } }