Skip to content

Commit eded23d

Browse files
committed
config: Make run id header optional
1 parent f4860de commit eded23d

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

httprunner/config.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def __init__(self, name: Text) -> None:
9494
self.__base_url: Text = ""
9595
self.__variables: VariablesMapping = {}
9696
self.__config = TConfig(name=name, path=caller_frame.filename)
97+
self.__add_request_id = True
9798

9899
@property
99100
def name(self) -> Text:
@@ -115,6 +116,10 @@ def verify(self, verify: bool) -> "Config":
115116
self.__config.verify = verify
116117
return self
117118

119+
def add_request_id(self, add_request_id: bool) -> "Config":
120+
self.__config.add_request_id = add_request_id
121+
return self
122+
118123
def export(self, *export_var_name: Text) -> "Config":
119124
self.__config.export.extend(export_var_name)
120125
self.__config.export = list(set(self.__config.export))

httprunner/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ class TConfig(BaseModel):
118118
name: Name
119119
verify: Verify = False
120120
base_url: BaseUrl = ""
121+
add_request_id: bool = True
121122
# Text: prepare variables in debugtalk.py, ${gen_variables()}
122123
variables: Union[VariablesMapping, Text] = {}
123124
parameters: Union[VariablesMapping, Text] = {}

httprunner/step_request.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,10 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
102102
request_headers = {
103103
key: request_headers[key] for key in request_headers if not key.startswith(":")
104104
}
105-
request_headers[
106-
"HRUN-Request-ID"
107-
] = f"HRUN-{runner.case_id}-{str(int(time.time() * 1000))[-6:]}"
105+
if runner.config.add_request_id:
106+
request_headers[
107+
"HRUN-Request-ID"
108+
] = f"HRUN-{runner.case_id}-{str(int(time.time() * 1000))[-6:]}"
108109
parsed_request_dict["headers"] = request_headers
109110

110111
step_variables["request"] = parsed_request_dict

httprunner/step_sql_request.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,11 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
8585
f"?charset=utf8mb4"
8686
)
8787

88-
# parsed_request_dict["headers"].setdefault(
89-
# "HRUN-Request-ID",
90-
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
91-
# )
88+
# if runner.config.add_request_id:
89+
# parsed_request_dict["headers"].setdefault(
90+
# "HRUN-Request-ID",
91+
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
92+
# )
9293

9394
# setup hooks
9495
if step.setup_hooks:

httprunner/step_thrift_request.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult:
9595
)
9696
parsed_request_dict["thrift_client"] = parsed_request_dict["thrift_client"]
9797

98-
# parsed_request_dict["headers"].setdefault(
99-
# "HRUN-Request-ID",
100-
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
101-
# )
98+
# if runner.config.add_request_id:
99+
# parsed_request_dict["headers"].setdefault(
100+
# "HRUN-Request-ID",
101+
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
102+
# )
102103
step_variables["thrift_request"] = parsed_request_dict
103104

104105
psm = parsed_request_dict["psm"]

0 commit comments

Comments
 (0)