Merge pull request #1151 from bensonhome/main

增加客户端渠道信息打印

client/node/localtask/codecounttask.py

@@ -20,7 +20,7 @@
 class CodeCountTask(object):
     @staticmethod
     def run_count_line_task(request_list, task_name_id_maps, job_id, scm_auth_info, token, server_url, source_dir,
-                            scm_info, origin_os_env):
+                            scm_info, origin_os_env, create_from):
         """
         统计代码行
         :param request_list:
@@ -38,7 +38,7 @@ def run_count_line_task(request_list, task_name_id_maps, job_id, scm_auth_info,
         RequestModify.modify_local_task_request(request, task_name_id_maps, job_id,
                                                 scm_auth_info.ssh_file,
                                                 token, server_url, source_dir, scm_info,
-                                                scm_auth_info)
+                                                scm_auth_info, create_from)
         # 执行单个任务扫描
         logger.info("启动 linecount 工具统计代码行...")
         task = SingleTaskRuner(request, env=origin_os_env).run()

client/node/localtask/localrunner.py

@@ -344,6 +344,7 @@ def _get_proj_config(self, repo_id, proj_id, org_sid, team_name):
     def run(self):
         """执行本地项目扫描
         """
+        LogPrinter.info(f"start from {self._create_from}.")
         self._job_start_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
 
         try:

client/node/localtask/requestmodify.py

@@ -43,14 +43,16 @@ def add_params(task_request, job_context, scm_info, pre_cmd, build_cmd, project_
             task_params['ignore_merged_issue'] = True
 
     @staticmethod
-    def modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info):
+    def modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from):
         """
         向task_request中添加参数
         :param task_request: dict, 任务参数
         :return:
         """
         # 添加task_scene信息,标记任务运行场景
         task_request['task_params']['task_scene'] = TaskScene.LOCAL
+        # 添加create_from参数
+        task_request['task_params']['created_from'] = create_from
         # 将token, server_url放到task_params中,供task进度上报和代码行上报使用
         task_request['task_params']['token'] = Crypto(settings.PASSWORD_KEY).encrypt(token)
         task_request['task_params']['server_url'] = server_url
@@ -70,13 +72,13 @@ def modify_task_request(task_request, token, server_url, source_dir, scm_info, s
 
     @staticmethod
     def modify_local_task_request(task_request, task_name_id_maps, job_id, ssh_file, token, server_url,
-                                  source_dir, scm_info, scm_auth_info):
+                                  source_dir, scm_info, scm_auth_info, create_from):
         """
         本地任务,向task_request中添加参数
         :param task_request:
         :return:
         """
-        RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info)
+        RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from)
         # 添加 task_dir 信息
         task_name = task_request["task_name"]
         task_id = task_name_id_maps.get(task_name)
@@ -90,13 +92,13 @@ def modify_local_task_request(task_request, task_name_id_maps, job_id, ssh_file,
         task_request['task_params']['ssh_file'] = ssh_file
 
     @staticmethod
-    def modify_pri_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info):
+    def modify_pri_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from):
         """
         私有任务,向task_request中添加参数
         :param task_request:
         :return:
         """
-        RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info)
+        RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from)
 
         # 在request中添加 task_dir 信息
         task_id = task_request["id"]

client/node/localtask/runlocaltask.py

@@ -79,7 +79,7 @@ def scan_project(self, execute_request_list, proj_conf):
                 RequestModify.modify_local_task_request(task_request, self._task_name_id_maps, self._job_id,
                                                         self._scm_auth_info.ssh_file,
                                                         self._token, self._server_url, self._source_dir, self._scm_info,
-                                                        self._scm_auth_info)
+                                                        self._scm_auth_info, self._create_from)
                 codecount_handler = LocalCountLine(task_request)
                 codecount_handler.start_thread()
             else:
@@ -88,14 +88,14 @@ def scan_project(self, execute_request_list, proj_conf):
                                                                           self._scm_auth_info,
                                                                           self._token, self._server_url,
                                                                           self._source_dir, self._scm_info,
-                                                                          self._origin_os_env)
+                                                                          self._origin_os_env, self._create_from)
 
         for task_request in execute_request_list:
             # 完善task request字段
             RequestModify.modify_local_task_request(task_request, self._task_name_id_maps, self._job_id,
                                                     self._scm_auth_info.ssh_file, self._token,
                                                     self._server_url, self._source_dir, self._scm_info,
-                                                    self._scm_auth_info)
+                                                    self._scm_auth_info, self._create_from)
 
         # 通过环境变量获取并发执行开关
         concurrent_task_env = os.getenv("TCA_CONCURRENT_SCAN")
@@ -189,7 +189,7 @@ def _wait_and_run_private_procs(self, project_id, job_id):
                 task_list = rt_data["tasks"]
                 for task_request in task_list:
                     RequestModify.modify_pri_task_request(task_request, self._token, self._server_url, self._source_dir,
-                                                          self._scm_info, self._scm_auth_info)
+                                                          self._scm_info, self._scm_auth_info, self._create_from)
                     # 执行单个任务分析
                     task = SingleTaskRuner(task_request, env=self._origin_os_env).run()
                     self._local_task_dirs.append(task_request["task_dir"])

client/node/servertask/looprunner.py

@@ -42,9 +42,10 @@ def __init__(self, args):
         self._token = args.token
         self._tag = args.tag
         self._org_sid = args.org_sid
-        self._create_from = args.create_from
+        self._create_from = args.create_from if args.create_from else "codedog_client"
         self._server_url = LocalConfig.get_server_url()
-        # 打印连接的sever地址
+        # 打印启动渠道和连接的sever地址
+        LogPrinter.info(f"start from {self._create_from}.")
         LogPrinter.info("using server: %s" % self._server_url)
         # 初始化与codedog服务器通信的api server实例
         self._server = RetryDogServer(self._server_url, self._token).get_api_server()

scripts/base/install_bin.sh

@@ -8,8 +8,8 @@ source $TCA_SCRIPT_ROOT/utils.sh
 
 # 代码库根目录
 TCA_ROOT=$( cd "$(dirname $TCA_SCRIPT_ROOT)"; pwd )
-LIB_GITHUB_URL=${LIB_GITHUB_URL:-"https://github.com/TCATools/tca_lib/releases/download/v20240716.3/tca_lib-v1.5.zip"}
-LIB_GONGFENG_URL=${LIB_GONGFENG_URL:-"https://git.code.tencent.com/TCA/tca-tools/tca_lib.git#v20240716.3"}
+LIB_GITHUB_URL=${LIB_GITHUB_URL:-"https://github.com/TCATools/tca_lib/releases/download/v20240729.1/tca_lib-v1.6.zip"}
+LIB_GONGFENG_URL=${LIB_GONGFENG_URL:-"https://git.code.tencent.com/TCA/tca-tools/tca_lib.git#v20240729.1"}
 LIB_DIR_NAME="tca_lib"