Skip to content

Commit 2166432

Browse files
ref(uptime): {scheduled -> actual}_check_time_us for trace (#97793)
1 parent 140b1cd commit 2166432

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/sentry/snuba/trace.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def _serialize_columnar_uptime_item(
360360
row_dict["http_status_code"].val_int if "http_status_code" in row_dict else None
361361
)
362362
request_url = row_dict["request_url"].val_str
363-
scheduled_check_time_us = row_dict["scheduled_check_time_us"].val_int
363+
actual_check_time_us = row_dict["actual_check_time_us"].val_int
364364
check_duration_us = (
365365
row_dict["check_duration_us"].val_int if "check_duration_us" in row_dict else 0
366366
)
@@ -412,8 +412,8 @@ def get_value(attr_name: str, attr_value: AttributeValue):
412412
if resolved_val is not None:
413413
additional_attrs[resolved_column.public_alias] = resolved_val
414414

415-
span["start_timestamp"] = scheduled_check_time_us / 1_000_000
416-
span["end_timestamp"] = (scheduled_check_time_us + check_duration_us) / 1_000_000
415+
span["start_timestamp"] = actual_check_time_us / 1_000_000
416+
span["end_timestamp"] = (actual_check_time_us + check_duration_us) / 1_000_000
417417
span["duration"] = check_duration_us / 1_000.0
418418
description = f"Uptime Check [{check_status}] - {request_url}"
419419
if http_status_code:

tests/snuba/api/endpoints/test_organization_trace.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_basic_uptime_item_serialization(self):
4141
"http_status_code": ProtoAttributeValue(val_int=200),
4242
"request_url": ProtoAttributeValue(val_str="https://example.com"),
4343
"original_url": ProtoAttributeValue(val_str="https://example.com"),
44-
"scheduled_check_time_us": ProtoAttributeValue(val_int=1700000000000000),
44+
"actual_check_time_us": ProtoAttributeValue(val_int=1700000000000000),
4545
"check_duration_us": ProtoAttributeValue(val_int=500000),
4646
"subscription_id": ProtoAttributeValue(val_str="sub-456"),
4747
"region": ProtoAttributeValue(val_str="us-east-1"),
@@ -86,7 +86,7 @@ def test_redirect_chain_serialization(self):
8686
"http_status_code": ProtoAttributeValue(val_int=301),
8787
"request_url": ProtoAttributeValue(val_str="https://www.example.com"),
8888
"original_url": ProtoAttributeValue(val_str="https://example.com"),
89-
"scheduled_check_time_us": ProtoAttributeValue(val_int=1700000000000000),
89+
"actual_check_time_us": ProtoAttributeValue(val_int=1700000000000000),
9090
"check_duration_us": ProtoAttributeValue(val_int=300000),
9191
"request_sequence": ProtoAttributeValue(val_int=1),
9292
}
@@ -109,7 +109,7 @@ def test_null_and_missing_fields(self):
109109
"check_status": ProtoAttributeValue(val_str="failure"),
110110
"http_status_code": ProtoAttributeValue(is_null=True),
111111
"request_url": ProtoAttributeValue(val_str="https://test.com"),
112-
"scheduled_check_time_us": ProtoAttributeValue(val_int=1700000000000000),
112+
"actual_check_time_us": ProtoAttributeValue(val_int=1700000000000000),
113113
"dns_lookup_duration_us": ProtoAttributeValue(val_int=50000),
114114
"tcp_connection_duration_us": ProtoAttributeValue(is_null=True),
115115
}

0 commit comments

Comments
 (0)