From 2bc6b5b0f97439cb458f18069ec9e9f6ed621a9c Mon Sep 17 00:00:00 2001 From: yjieliang Date: Thu, 2 Mar 2023 09:53:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?pref:=20MeasureService=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E8=B0=83=E6=95=B4=20issue#8287?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/measure/MeasureServiceImpl.kt | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt index 93a45534429..ebaf6724d15 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt @@ -49,22 +49,41 @@ import com.tencent.devops.process.service.ProjectCacheService import com.tencent.devops.process.service.measure.MeasureEventDispatcher import com.tencent.devops.process.template.service.TemplateService import org.apache.lucene.util.RamUsageEstimator +import org.jooq.DSLContext import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Value +import org.springframework.stereotype.Service import java.util.concurrent.TimeUnit @Suppress("ALL", "UNUSED") -class MeasureServiceImpl constructor( - private val projectCacheService: ProjectCacheService, - private val pipelineTaskService: PipelineTaskService, - private val buildVariableService: BuildVariableService, - private val templateService: TemplateService, - private val pipelineInfoService: PipelineInfoService, - private val redisOperation: RedisOperation, - private val pipelineEventDispatcher: PipelineEventDispatcher, - private val atomMonitorSwitch: String, - private val maxMonitorDataSize: String = "1677216", - private val measureEventDispatcher: MeasureEventDispatcher -) : MeasureService { +@Service +class MeasureServiceImpl : MeasureService { + + @Autowired + lateinit var projectCacheService: ProjectCacheService + @Autowired + lateinit var pipelineTaskService: PipelineTaskService + @Autowired + lateinit var buildVariableService: BuildVariableService + @Autowired + lateinit var dslContext: DSLContext + @Autowired + lateinit var templateService: TemplateService + @Autowired + lateinit var pipelineInfoService: PipelineInfoService + @Autowired + lateinit var redisOperation: RedisOperation + @Autowired + lateinit var pipelineEventDispatcher: PipelineEventDispatcher + @Autowired + lateinit var measureEventDispatcher: MeasureEventDispatcher + + @Value("\${build.atomMonitorData.report.switch:false}") + private val atomMonitorSwitch: String = "false" + + @Value("\${build.atomMonitorData.report.maxMonitorDataSize:1677216}") + private val maxMonitorDataSize: String = "1677216" override fun postCancelData(projectId: String, pipelineId: String, buildId: String, userId: String) { try { From 1cacb2263732c786fe07e24dcb75e33ea06ab3cf Mon Sep 17 00:00:00 2001 From: v_yjieliang Date: Thu, 2 Mar 2023 10:14:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?pref:=20MeasureService=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E8=B0=83=E6=95=B4=20issue#8287?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/process/engine/service/measure/MeasureServiceImpl.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt index ebaf6724d15..14ef3486f19 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt @@ -202,6 +202,7 @@ class MeasureServiceImpl : MeasureService { monitorData = atomMonitorData ) ) + logger.warn("MK_postTaskData|$atomCode") } catch (ignored: Throwable) { // MK = Monitor Key logger.warn("MK_postTaskData|${task.buildId}|message: ${ignored.message}") } From ecfa47a7cfe9791968c608f2febaeac02de394e0 Mon Sep 17 00:00:00 2001 From: v_yjieliang Date: Thu, 2 Mar 2023 10:19:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?pref:=20MeasureService=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E8=B0=83=E6=95=B4=20issue#8287?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/engine/service/measure/MeasureServiceImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt index 14ef3486f19..70e7fdfa8b4 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt @@ -124,7 +124,7 @@ class MeasureServiceImpl : MeasureService { val vmSeqId = task.containerId val taskParams = task.taskParams val atomCode = task.atomCode ?: taskParams["atomCode"] as String? ?: task.taskType - + logger.warn("MK_postTaskData1|$atomCode") pipelineEventDispatcher.dispatch( PipelineBuildTaskFinishBroadCastEvent( source = "build-element-$taskId", @@ -202,7 +202,7 @@ class MeasureServiceImpl : MeasureService { monitorData = atomMonitorData ) ) - logger.warn("MK_postTaskData|$atomCode") + logger.warn("MK_postTaskData2|$atomCode") } catch (ignored: Throwable) { // MK = Monitor Key logger.warn("MK_postTaskData|${task.buildId}|message: ${ignored.message}") } From f881b45be7b9b6065214c675971be92e42e0d8d1 Mon Sep 17 00:00:00 2001 From: v_yjieliang Date: Thu, 2 Mar 2023 11:32:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?pref:=20MeasureService=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E8=B0=83=E6=95=B4=20issue#8287?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/process/engine/service/measure/MeasureServiceImpl.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt index 70e7fdfa8b4..ffdf3cfe166 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt @@ -124,7 +124,6 @@ class MeasureServiceImpl : MeasureService { val vmSeqId = task.containerId val taskParams = task.taskParams val atomCode = task.atomCode ?: taskParams["atomCode"] as String? ?: task.taskType - logger.warn("MK_postTaskData1|$atomCode") pipelineEventDispatcher.dispatch( PipelineBuildTaskFinishBroadCastEvent( source = "build-element-$taskId", @@ -202,7 +201,6 @@ class MeasureServiceImpl : MeasureService { monitorData = atomMonitorData ) ) - logger.warn("MK_postTaskData2|$atomCode") } catch (ignored: Throwable) { // MK = Monitor Key logger.warn("MK_postTaskData|${task.buildId}|message: ${ignored.message}") }