Skip to content

Commit 66a0f54

Browse files
authored
fix: rename trace_id variable to correlation_id (#408)
I learned that we should not use the trace_id name for a correlation_id. I scoped this change as a fix, as the correltation_id is only used internally.
1 parent cf08842 commit 66a0f54

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

hcloud/_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def request( # type: ignore[no-untyped-def]
215215
**kwargs,
216216
)
217217

218-
trace_id = response.headers.get("X-Correlation-Id")
218+
correlation_id = response.headers.get("X-Correlation-Id")
219219
payload = {}
220220
try:
221221
if len(response.content) > 0:
@@ -225,7 +225,7 @@ def request( # type: ignore[no-untyped-def]
225225
code=response.status_code,
226226
message=response.reason,
227227
details={"content": response.content},
228-
trace_id=trace_id,
228+
correlation_id=correlation_id,
229229
) from exc
230230

231231
if not response.ok:
@@ -234,7 +234,7 @@ def request( # type: ignore[no-untyped-def]
234234
code=response.status_code,
235235
message=response.reason,
236236
details={"content": response.content},
237-
trace_id=trace_id,
237+
correlation_id=correlation_id,
238238
)
239239

240240
error: dict = payload["error"]
@@ -248,7 +248,7 @@ def request( # type: ignore[no-untyped-def]
248248
code=error["code"],
249249
message=error["message"],
250250
details=error["details"],
251-
trace_id=trace_id,
251+
correlation_id=correlation_id,
252252
)
253253

254254
return payload

hcloud/_exceptions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ def __init__(
1616
message: str,
1717
details: Any,
1818
*,
19-
trace_id: str | None = None,
19+
correlation_id: str | None = None,
2020
):
2121
extras = [str(code)]
22-
if trace_id is not None:
23-
extras.append(trace_id)
22+
if correlation_id is not None:
23+
extras.append(correlation_id)
2424

2525
error = f"{message} ({', '.join(extras)})"
2626

2727
super().__init__(error)
2828
self.code = code
2929
self.message = message
3030
self.details = details
31-
self.trace_id = trace_id
31+
self.correlation_id = correlation_id

tests/unit/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_request_fails(self, client, fail_response):
102102
assert error.message == "invalid input in field 'broken_field': is too long"
103103
assert error.details["fields"][0]["name"] == "broken_field"
104104

105-
def test_request_fails_trace_id(self, client, response):
105+
def test_request_fails_correlation_id(self, client, response):
106106
response.headers["X-Correlation-Id"] = "67ed842dc8bc8673"
107107
response.status_code = 409
108108
response._content = json.dumps(
@@ -124,7 +124,7 @@ def test_request_fails_trace_id(self, client, response):
124124
assert error.code == "conflict"
125125
assert error.message == "some conflict"
126126
assert error.details is None
127-
assert error.trace_id == "67ed842dc8bc8673"
127+
assert error.correlation_id == "67ed842dc8bc8673"
128128
assert str(error) == "some conflict (conflict, 67ed842dc8bc8673)"
129129

130130
def test_request_500(self, client, fail_response):

0 commit comments

Comments
 (0)