feat(uptime): Allow uptime spans to be fetched from the organiation_trace endpoint.
#96821
+685
−29
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
Scope: Backend
wedamija
force-pushed
the
danf/organization-uptime-trace
branch
from
92ec3fe to
f23c3d9
Compare
Comment on lines
-10
to
+11
| public_alias="trace_id", | ||
| internal_name="trace_id", | ||
| public_alias="trace", | ||
| internal_name="sentry.trace_id", |
There was a problem hiding this comment.
Will this break anything else or was this just a fix?
There was a problem hiding this comment.
Just a fix - we aren't relying on this id anywhere else in the ui, afaik.
Worst case it breaks something only in the sentry org where we have reading from EAP enabled. But I doubt it will even break anything there.
…trace` endpoint. This adds the `include_uptime` param to this endpoint. When this is passed, we'll fetch uptime results and make the main request the root span for all other items in the trace.
wedamija
force-pushed
the
danf/organization-uptime-trace
branch
from
f23c3d9 to
252e661
Compare
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| row_dict["check_duration_us"].val_int if "check_duration_us" in row_dict else 0 | ||
| ) | ||
| project_id = row_dict["sentry.project_id"].val_int | ||
| project_slug = project_slugs[project_id] |
There was a problem hiding this comment.
Bug: Uptime Serialization Null Handling
The _serialize_columnar_uptime_item function has two bugs:
http_status_codeandcheck_duration_usare directly accessed via.val_intonAttributeValueobjects without checkingis_null. This can result in incorrect non-null values (e.g., 0) or errors when the field is actually null, bypassing theget_valuehelper's null handling.- Accessing
project_slugs[project_id]can raise aKeyErrorif a project is deleted, asproject_idfrom uptime results might not be present in theproject_slugsmap.
wedamija
added a commit
that referenced
this pull request
Aug 1, 2025
…meta` This adds `include_uptime` to the meta endpoint as well. When it's passed, we'll include the number of uptime spans in the meta as well Relies on #96821
Comment on lines
+390
to
+404
| def get_value(attr_name: str, attr_value: AttributeValue): | ||
| if attr_value.is_null: | ||
| return None | ||
| resolved_column = columns_by_name[attr_name] | ||
| if resolved_column.search_type == "integer": | ||
| return attr_value.val_int | ||
| elif resolved_column.search_type == "string": | ||
| return attr_value.val_str | ||
| elif resolved_column.search_type == "number": | ||
| return attr_value.val_double | ||
| elif resolved_column.search_type == "boolean": | ||
| return attr_value.val_bool | ||
| elif resolved_column.search_type == "byte": | ||
| return attr_value.val_int | ||
| raise ValueError("Unknown column type") |
There was a problem hiding this comment.
feels like this should be a helper util somewhere else
| kwargs.setdefault("response_body_size_bytes", None) | ||
| return self.create_eap_uptime_result(**kwargs) | ||
|
|
||
| def assert_expected_results(self, response_data, input_trace_items, expected_children_ids=None): |
There was a problem hiding this comment.
Would this be useful in other tests?
evanpurkhiser
approved these changes
Aug 5, 2025
|
I'll address feedback in a follow up pr so we can get this merged |
wedamija
added a commit
that referenced
this pull request
Aug 5, 2025
…meta` This adds `include_uptime` to the meta endpoint as well. When it's passed, we'll include the number of uptime spans in the meta as well Relies on #96821
Suspect IssuesThis pull request was deployed and Sentry observed the following issues:
Did you find this useful? React with a 👍 or 👎 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the
include_uptimeparam to this endpoint. When this is passed, we'll fetch uptime results and make the main request the root span for all other items in the trace.