Merge pull request #1747 from jsonwan/3.6.x

perf: 二进制环境配置模板文件指定trace是否开启与上报比例默认值 #1746
TencentBlueKing · Feb 15, 2023 · 3c6af13 · 3c6af13
2 parents 298a05f + ab6b053
commit 3c6af13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/support-files/templates/#etc#job#job-common#application.yml b/support-files/templates/#etc#job#job-common#application.yml
@@ -11,13 +11,15 @@ spring:
   sleuth:
     otel:
       exporter:
-        enabled: __BK_JOB_TRACE_REPORT_ENABLED__
+        # 是否上报trace数据至蓝鲸监控APM
+        enabled: false
         otlp:
           endpoint: __BK_JOB_TRACE_REPORT_PUSH_URL__
       resource:
         bkDataToken: __BK_JOB_TRACE_REPORT_SECURE_KEY__
       config:
-        traceIdRatioBased: __BK_JOB_TRACE_REPORT_RATIO__
+        # trace数据上报比率，取值范围为0~1，根据作业平台与监控平台负载适当调节该比率
+        traceIdRatioBased: 0.1
 app:
   code: __BK_JOB_APP_CODE__
   secret: __BK_JOB_APP_SECRET__

diff --git a/support-files/templates/job.env b/support-files/templates/job.env
@@ -25,14 +25,10 @@ BK_JOB_SECURITY_USERNAME=job
 BK_JOB_SECURITY_PASSWORD=
 BK_JOB_ACTUATOR_USERNAME=job
 BK_JOB_ACTUATOR_PASSWORD=
-# 是否上报trace数据至蓝鲸监控APM
-BK_JOB_TRACE_REPORT_ENABLED=false
 # trace数据上报地址：监控平台中目标APM应用的PUSH URL
 BK_JOB_TRACE_REPORT_PUSH_URL=
 # trace数据上报密钥：监控平台中目标APM应用的SecureKey
 BK_JOB_TRACE_REPORT_SECURE_KEY=
-# trace数据上报比率，取值范围为0~1，根据作业平台与监控平台负载适当调节该比率
-BK_JOB_TRACE_REPORT_RATIO=0.1
 
 # 3.3.3新增 Job Encryption and decryption key，一旦确认不能修改
 BK_JOB_ENCRYPT_PASSWORD=