From f205ef98ffe3190dba2d994aaf6b1bbc80c52a55 Mon Sep 17 00:00:00 2001 From: Shahar Sivan Date: Thu, 12 Mar 2026 12:51:33 +0200 Subject: [PATCH] config: Make run id header optional --- httprunner/config.py | 4 ++++ httprunner/models.py | 1 + httprunner/step_request.py | 7 ++++--- httprunner/step_sql_request.py | 9 +++++---- httprunner/step_thrift_request.py | 9 +++++---- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/httprunner/config.py b/httprunner/config.py index f68a5c6..713db9a 100644 --- a/httprunner/config.py +++ b/httprunner/config.py @@ -115,6 +115,10 @@ def verify(self, verify: bool) -> "Config": self.__config.verify = verify return self + def add_request_id(self, add_request_id: bool) -> "Config": + self.__config.add_request_id = add_request_id + return self + def export(self, *export_var_name: Text) -> "Config": self.__config.export.extend(export_var_name) self.__config.export = list(set(self.__config.export)) diff --git a/httprunner/models.py b/httprunner/models.py index 7994240..2620e7a 100644 --- a/httprunner/models.py +++ b/httprunner/models.py @@ -118,6 +118,7 @@ class TConfig(BaseModel): name: Name verify: Verify = False base_url: BaseUrl = "" + add_request_id: bool = True # Text: prepare variables in debugtalk.py, ${gen_variables()} variables: Union[VariablesMapping, Text] = {} parameters: Union[VariablesMapping, Text] = {} diff --git a/httprunner/step_request.py b/httprunner/step_request.py index 2db1def..a04287c 100644 --- a/httprunner/step_request.py +++ b/httprunner/step_request.py @@ -102,9 +102,10 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult: request_headers = { key: request_headers[key] for key in request_headers if not key.startswith(":") } - request_headers[ - "HRUN-Request-ID" - ] = f"HRUN-{runner.case_id}-{str(int(time.time() * 1000))[-6:]}" + if runner.get_config().add_request_id: + request_headers[ + "HRUN-Request-ID" + ] = f"HRUN-{runner.case_id}-{str(int(time.time() * 1000))[-6:]}" parsed_request_dict["headers"] = request_headers step_variables["request"] = parsed_request_dict diff --git a/httprunner/step_sql_request.py b/httprunner/step_sql_request.py index 47a5405..c8124e2 100644 --- a/httprunner/step_sql_request.py +++ b/httprunner/step_sql_request.py @@ -85,10 +85,11 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult: f"?charset=utf8mb4" ) - # parsed_request_dict["headers"].setdefault( - # "HRUN-Request-ID", - # f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}", - # ) + # if runner.config.add_request_id: + # parsed_request_dict["headers"].setdefault( + # "HRUN-Request-ID", + # f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}", + # ) # setup hooks if step.setup_hooks: diff --git a/httprunner/step_thrift_request.py b/httprunner/step_thrift_request.py index 322d34e..a182539 100644 --- a/httprunner/step_thrift_request.py +++ b/httprunner/step_thrift_request.py @@ -95,10 +95,11 @@ def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult: ) parsed_request_dict["thrift_client"] = parsed_request_dict["thrift_client"] - # parsed_request_dict["headers"].setdefault( - # "HRUN-Request-ID", - # f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}", - # ) + # if runner.config.add_request_id: + # parsed_request_dict["headers"].setdefault( + # "HRUN-Request-ID", + # f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}", + # ) step_variables["thrift_request"] = parsed_request_dict psm = parsed_request_dict["psm"]