Merge branch 'master' into extract-fixability-v2

Mihir-Mavalankar · web-flow · commit fc22f9057636 · 2025-11-18T12:48:23.000-08:00
diff --git a/src/sentry/api/api_owners.py b/src/sentry/api/api_owners.py
@@ -32,5 +32,5 @@ class ApiOwner(Enum):
     SECURITY = "security"
     TELEMETRY_EXPERIENCE = "telemetry-experience"
     UNOWNED = "unowned"
-    VISIBILITY = "visibility"
+    DATA_BROWSING = "data-browsing"
     WEB_FRONTEND_SDKS = "team-javascript-sdks"
diff --git a/src/sentry/api/bases/organization_events.py b/src/sentry/api/bases/organization_events.py
@@ -93,7 +93,7 @@ def resolve_axis_column(
 
 
 class OrganizationEventsEndpointBase(OrganizationEndpoint):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def has_feature(self, organization: Organization, request: Request) -> bool:
         return (
@@ -223,7 +223,7 @@ def quantize_date_params(
 
 
 class OrganizationEventsV2EndpointBase(OrganizationEventsEndpointBase):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def build_cursor_link(self, request: HttpRequest, name: str, cursor: Cursor | None) -> str:
         # The base API function only uses the last query parameter, but this endpoint
diff --git a/src/sentry/api/endpoints/organization_ai_conversations.py b/src/sentry/api/endpoints/organization_ai_conversations.py
@@ -58,7 +58,7 @@ class OrganizationAIConversationsEndpoint(OrganizationEventsV2EndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def get(self, request: Request, organization: Organization) -> Response:
         """
diff --git a/src/sentry/api/endpoints/organization_events_histogram.py b/src/sentry/api/endpoints/organization_events_histogram.py
@@ -48,7 +48,7 @@ class OrganizationEventsHistogramEndpoint(OrganizationEventsV2EndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def has_feature(self, organization, request):
         return features.has("organizations:performance-view", organization, actor=request.user)
diff --git a/src/sentry/api/endpoints/organization_spans_fields.py b/src/sentry/api/endpoints/organization_spans_fields.py
@@ -58,7 +58,7 @@ class OrganizationSpansFieldsEndpointBase(OrganizationEventsV2EndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
 
 class OrganizationSpansFieldsEndpointSerializer(serializers.Serializer):
@@ -184,7 +184,7 @@ def get(self, request: Request, organization: Organization, key: str) -> Respons
         with handle_query_errors():
             tag_values = executor.execute()
 
-        tag_values.sort(key=lambda tag: tag.value)
+        tag_values.sort(key=lambda tag: tag.value or "")
 
         paginator = ChainPaginator([tag_values], max_limit=max_span_tag_values)
 
diff --git a/src/sentry/api/endpoints/organization_spans_fields_stats.py b/src/sentry/api/endpoints/organization_spans_fields_stats.py
@@ -33,7 +33,7 @@ class OrganizationSpansFieldsStatsEndpoint(OrganizationEventsV2EndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def get(self, request: Request, organization: Organization) -> Response:
 
diff --git a/src/sentry/api/endpoints/organization_tags.py b/src/sentry/api/endpoints/organization_tags.py
@@ -24,7 +24,7 @@ class OrganizationTagsEndpoint(OrganizationEndpoint):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def get(self, request: Request, organization: Organization) -> Response:
         try:
diff --git a/src/sentry/api/endpoints/organization_trace_item_attributes.py b/src/sentry/api/endpoints/organization_trace_item_attributes.py
@@ -104,7 +104,7 @@ class OrganizationTraceItemAttributesEndpointBase(OrganizationEventsV2EndpointBa
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     feature_flags = [
         "organizations:ourlogs-enabled",
         "organizations:visibility-explore-view",
@@ -231,7 +231,9 @@ def get(self, request: Request, organization: Organization) -> Response:
             )
 
         use_sentry_conventions = features.has(
-            "organizations:performance-sentry-conventions-fields", organization, actor=request.user
+            "organizations:performance-sentry-conventions-fields",
+            organization,
+            actor=request.user,
         )
 
         sentry_sdk.set_tag("feature.use_sentry_conventions", use_sentry_conventions)
@@ -248,7 +250,9 @@ def get(self, request: Request, organization: Organization) -> Response:
         referrer = resolve_attribute_referrer(trace_item_type, attribute_type)
         column_definitions = get_column_definitions(trace_item_type)
         resolver = SearchResolver(
-            params=snuba_params, config=SearchResolverConfig(), definitions=column_definitions
+            params=snuba_params,
+            config=SearchResolverConfig(),
+            definitions=column_definitions,
         )
         query_filter, _, _ = resolver.resolve_query(query_string)
         meta = resolver.resolve_meta(referrer=referrer.value)
@@ -287,16 +291,22 @@ def data_fn(offset: int, limit: int):
                 attribute_keys = {}
                 for attribute in rpc_response.attributes:
                     if attribute.name and can_expose_attribute(
-                        attribute.name, trace_item_type, include_internal=include_internal
+                        attribute.name,
+                        trace_item_type,
+                        include_internal=include_internal,
                     ):
                         attr_key = as_attribute_key(
-                            attribute.name, serialized["attribute_type"], trace_item_type
+                            attribute.name,
+                            serialized["attribute_type"],
+                            trace_item_type,
                         )
                         public_alias = attr_key["name"]
                         replacement = translate_to_sentry_conventions(public_alias, trace_item_type)
                         if public_alias != replacement:
                             attr_key = as_attribute_key(
-                                replacement, serialized["attribute_type"], trace_item_type
+                                replacement,
+                                serialized["attribute_type"],
+                                trace_item_type,
                             )
 
                         attribute_keys[attr_key["name"]] = attr_key
@@ -312,12 +322,16 @@ def data_fn(offset: int, limit: int):
                     ),
                     [
                         as_attribute_key(
-                            attribute.name, serialized["attribute_type"], trace_item_type
+                            attribute.name,
+                            serialized["attribute_type"],
+                            trace_item_type,
                         )
                         for attribute in rpc_response.attributes
                         if attribute.name
                         and can_expose_attribute(
-                            attribute.name, trace_item_type, include_internal=include_internal
+                            attribute.name,
+                            trace_item_type,
+                            include_internal=include_internal,
                         )
                     ],
                 )
@@ -375,7 +389,7 @@ def data_fn(offset: int, limit: int):
 
             with handle_query_errors():
                 tag_values = executor.execute()
-            tag_values.sort(key=lambda tag: tag.value)
+            tag_values.sort(key=lambda tag: tag.value or "")
             return tag_values
 
         return self.paginate(
@@ -425,7 +439,11 @@ def resolve_attribute_key(
         resolved_attr, context_definition = self.resolver.resolve_attribute(key)
         if context_definition:
             resolved_attr = self.resolver.map_context_to_original_column(context_definition)
-        return resolved_attr.search_type, resolved_attr.proto_definition, context_definition
+        return (
+            resolved_attr.search_type,
+            resolved_attr.proto_definition,
+            context_definition,
+        )
 
     def execute(self) -> list[TagValue]:
         func = self.autocomplete_function.get(self.key)
@@ -545,7 +563,8 @@ def semver_build_autocomplete_function(self):
     def semver_package_autocomplete_function(self):
         packages = (
             Release.objects.filter(
-                organization_id=self.snuba_params.organization_id, package__startswith=self.query
+                organization_id=self.snuba_params.organization_id,
+                package__startswith=self.query,
             )
             .values_list("package")
             .distinct()
diff --git a/src/sentry/api/endpoints/organization_trace_item_attributes_ranked.py b/src/sentry/api/endpoints/organization_trace_item_attributes_ranked.py
@@ -38,7 +38,7 @@ class OrganizationTraceItemsAttributesRankedEndpoint(OrganizationEventsV2Endpoin
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def get(self, request: Request, organization: Organization) -> Response:
 
diff --git a/src/sentry/api/endpoints/organization_trace_item_stats.py b/src/sentry/api/endpoints/organization_trace_item_stats.py
@@ -31,7 +31,7 @@ class OrganizationTraceItemsStatsEndpoint(OrganizationEventsV2EndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def get(self, request: Request, organization: Organization) -> Response:
         try:
diff --git a/src/sentry/api/endpoints/organization_traces.py b/src/sentry/api/endpoints/organization_traces.py
@@ -127,7 +127,7 @@ class OrganizationTracesEndpointBase(OrganizationEventsV2EndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
 
 @region_silo_endpoint
diff --git a/src/sentry/api/endpoints/project_create_sample_transaction.py b/src/sentry/api/endpoints/project_create_sample_transaction.py
@@ -66,7 +66,7 @@ def fix_event_data(data):
 
 @region_silo_endpoint
 class ProjectCreateSampleTransactionEndpoint(ProjectEndpoint):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     publish_status = {
         "POST": ApiPublishStatus.PRIVATE,
     }
diff --git a/src/sentry/api/endpoints/project_performance_general_settings.py b/src/sentry/api/endpoints/project_performance_general_settings.py
@@ -19,7 +19,7 @@ class ProjectPerformanceGeneralSettingsSerializer(serializers.Serializer):
 
 @region_silo_endpoint
 class ProjectPerformanceGeneralSettingsEndpoint(ProjectEndpoint):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     publish_status = {
         "DELETE": ApiPublishStatus.PRIVATE,
         "GET": ApiPublishStatus.PRIVATE,
diff --git a/src/sentry/api/endpoints/project_trace_item_details.py b/src/sentry/api/endpoints/project_trace_item_details.py
@@ -238,7 +238,7 @@ class ProjectTraceItemDetailsEndpointSerializer(serializers.Serializer):
 
 @region_silo_endpoint
 class ProjectTraceItemDetailsEndpoint(ProjectEndpoint):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     publish_status = {
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }
diff --git a/src/sentry/api/endpoints/project_transaction_threshold.py b/src/sentry/api/endpoints/project_transaction_threshold.py
@@ -42,7 +42,7 @@ def validate_threshold(self, threshold):
 
 @region_silo_endpoint
 class ProjectTransactionThresholdEndpoint(ProjectEndpoint):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     publish_status = {
         "DELETE": ApiPublishStatus.PRIVATE,
         "GET": ApiPublishStatus.PRIVATE,
diff --git a/src/sentry/data_export/endpoints/data_export_details.py b/src/sentry/data_export/endpoints/data_export_details.py
@@ -20,7 +20,7 @@ class DataExportDetailsEndpoint(OrganizationEndpoint):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     permission_classes = (OrganizationDataExportPermission,)
 
     def get(
diff --git a/src/sentry/data_export/processors/issues_by_tag.py b/src/sentry/data_export/processors/issues_by_tag.py
@@ -113,7 +113,12 @@ def get_raw_data(self, limit: int = 1000, offset: int = 0) -> list[GroupTagValue
             users = EventUser.for_tags(self.group.project_id, [i.value for i in items])
         else:
             users = {}
-        return [GroupTagValueAndEventUser(item, users.get(item.value)) for item in items]
+        return [
+            GroupTagValueAndEventUser(
+                item, users.get(item.value) if item.value is not None else None
+            )
+            for item in items
+        ]
 
     def get_serialized_data(self, limit: int = 1000, offset: int = 0) -> list[dict[str, str]]:
         """
diff --git a/src/sentry/discover/endpoints/discover_saved_queries.py b/src/sentry/discover/endpoints/discover_saved_queries.py
@@ -40,7 +40,7 @@ class DiscoverSavedQueriesEndpoint(OrganizationEndpoint):
         "GET": ApiPublishStatus.PUBLIC,
         "POST": ApiPublishStatus.PUBLIC,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     permission_classes = (DiscoverSavedQueryPermission,)
 
     def has_feature(self, organization, request):
diff --git a/src/sentry/discover/endpoints/discover_saved_query_detail.py b/src/sentry/discover/endpoints/discover_saved_query_detail.py
@@ -28,7 +28,7 @@
 
 
 class DiscoverSavedQueryBase(OrganizationEndpoint):
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     permission_classes = (DiscoverSavedQueryPermission,)
 
     def convert_args(self, request: Request, organization_id_or_slug, query_id, *args, **kwargs):
diff --git a/src/sentry/insights/endpoints/starred_segments.py b/src/sentry/insights/endpoints/starred_segments.py
@@ -31,7 +31,7 @@ class InsightsStarredSegmentsEndpoint(OrganizationEndpoint):
         "POST": ApiPublishStatus.EXPERIMENTAL,
         "DELETE": ApiPublishStatus.EXPERIMENTAL,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
     permission_classes = (MemberPermission,)
 
     def has_feature(self, organization, request):
diff --git a/src/sentry/issues/endpoints/project_user_issue.py b/src/sentry/issues/endpoints/project_user_issue.py
@@ -196,7 +196,7 @@ class ProjectUserIssueEndpoint(ProjectEndpoint):
     publish_status = {
         "POST": ApiPublishStatus.EXPERIMENTAL,
     }
-    owner = ApiOwner.VISIBILITY
+    owner = ApiOwner.DATA_BROWSING
 
     def get_formatter(self, data: dict) -> BaseUserIssueFormatter:
         if data.get("issueType") == WebVitalsGroup.slug:
diff --git a/src/sentry/search/utils.py b/src/sentry/search/utils.py
@@ -831,7 +831,7 @@ def convert_user_tag_to_query(key: str, value: str) -> str | None:
     Converts a user tag to a query string that can be used to search for that
     user. Returns None if not a user tag.
     """
-    if key == "user" and ":" in value:
+    if key == "user" and value is not None and ":" in value:
         sub_key, value = value.split(":", 1)
         if KEYWORD_MAP.get_key(sub_key, None):
             return 'user.{}:"{}"'.format(sub_key, value.replace('"', '\\"'))
diff --git a/src/sentry/tagstore/types.py b/src/sentry/tagstore/types.py
@@ -29,7 +29,16 @@ def __eq__(self, other: object) -> bool:
         )
 
     def __lt__(self, other: object) -> bool:
-        return getattr(self, self._sort_key) < getattr(other, self._sort_key)
+        self_val = getattr(self, self._sort_key)
+        other_val = getattr(other, self._sort_key)
+        # Handle None values in sorting - None sorts before any non-None value
+        if self_val is None and other_val is None:
+            return False
+        if self_val is None:
+            return True
+        if other_val is None:
+            return False
+        return self_val < other_val
 
     def __getstate__(self) -> dict[str, Any]:
         return {name: getattr(self, name) for name in self.__slots__}
@@ -68,7 +77,7 @@ class TagValue(TagType):
     def __init__(
         self,
         key: str,
-        value,
+        value: str | None,
         times_seen: int | None,
         first_seen: datetime | None,
         last_seen: datetime | None,
@@ -107,7 +116,7 @@ def __init__(
         self,
         group_id: int,
         key: str,
-        value,
+        value: str | None,
         times_seen: int,
         first_seen,
         last_seen,
diff --git a/src/sentry/taskworker/namespaces.py b/src/sentry/taskworker/namespaces.py
@@ -38,7 +38,7 @@
 
 deletion_tasks = app.taskregistry.create_namespace(
     "deletions",
-    processing_deadline_duration=60 * 10,
+    processing_deadline_duration=60 * 20,
     app_feature="shared",
 )
 
diff --git a/src/sentry/utils/eventuser.py b/src/sentry/utils/eventuser.py
@@ -314,7 +314,7 @@ def from_snuba(result: Mapping[str, Any]) -> EventUser:
 
     @classmethod
     def for_tags(
-        cls: type[EventUser], project_id: int, values: Sequence[str]
+        cls: type[EventUser], project_id: int, values: Sequence[str | None]
     ) -> dict[str, EventUser]:
         """
         Finds matching EventUser objects from a list of tag values.
@@ -338,14 +338,18 @@ def for_tags(
 
     @classmethod
     def _process_tag_batch(
-        cls, projects: QuerySet[Project], values: Sequence[str]
+        cls, projects: QuerySet[Project], values: Sequence[str | None]
     ) -> dict[str, EventUser]:
         """
         Process a single batch of tag values and return the matching EventUser objects.
         """
         result = {}
         keyword_filters: dict[str, Any] = {}
         for value in values:
+            # Skip None values - these represent events without the tag set.
+            # There's no EventUser to look up for these cases.
+            if value is None:
+                continue
             key, value = value.split(":", 1)[0], value.split(":", 1)[-1]
             if keyword_filters.get(key):
                 keyword_filters[key].append(value)
diff --git a/tests/sentry/issues/endpoints/test_group_tagkey_values.py b/tests/sentry/issues/endpoints/test_group_tagkey_values.py

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class OrganizationAIConversationsEndpoint(OrganizationEventsV2EndpointBase):`
`58`	`58`	`publish_status = {`
`59`	`59`	`"GET": ApiPublishStatus.PRIVATE,`
`60`	`60`	`}`
`61`		`- owner = ApiOwner.VISIBILITY`
	`61`	`+ owner = ApiOwner.DATA_BROWSING`
`62`	`62`
`63`	`63`	`def get(self, request: Request, organization: Organization) -> Response:`
`64`	`64`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class OrganizationEventsHistogramEndpoint(OrganizationEventsV2EndpointBase):`
`48`	`48`	`publish_status = {`
`49`	`49`	`"GET": ApiPublishStatus.PRIVATE,`
`50`	`50`	`}`
`51`		`- owner = ApiOwner.VISIBILITY`
	`51`	`+ owner = ApiOwner.DATA_BROWSING`
`52`	`52`
`53`	`53`	`def has_feature(self, organization, request):`
`54`	`54`	`return features.has("organizations:performance-view", organization, actor=request.user)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class OrganizationSpansFieldsStatsEndpoint(OrganizationEventsV2EndpointBase):`
`33`	`33`	`publish_status = {`
`34`	`34`	`"GET": ApiPublishStatus.EXPERIMENTAL,`
`35`	`35`	`}`
`36`		`- owner = ApiOwner.VISIBILITY`
	`36`	`+ owner = ApiOwner.DATA_BROWSING`
`37`	`37`
`38`	`38`	`def get(self, request: Request, organization: Organization) -> Response:`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class OrganizationTagsEndpoint(OrganizationEndpoint):`
`24`	`24`	`publish_status = {`
`25`	`25`	`"GET": ApiPublishStatus.PRIVATE,`
`26`	`26`	`}`
`27`		`- owner = ApiOwner.VISIBILITY`
	`27`	`+ owner = ApiOwner.DATA_BROWSING`
`28`	`28`
`29`	`29`	`def get(self, request: Request, organization: Organization) -> Response:`
`30`	`30`	`try:`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class OrganizationTraceItemsAttributesRankedEndpoint(OrganizationEventsV2Endpoin`
`38`	`38`	`publish_status = {`
`39`	`39`	`"GET": ApiPublishStatus.PRIVATE,`
`40`	`40`	`}`
`41`		`- owner = ApiOwner.VISIBILITY`
	`41`	`+ owner = ApiOwner.DATA_BROWSING`
`42`	`42`
`43`	`43`	`def get(self, request: Request, organization: Organization) -> Response:`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class OrganizationTraceItemsStatsEndpoint(OrganizationEventsV2EndpointBase):`
`31`	`31`	`publish_status = {`
`32`	`32`	`"GET": ApiPublishStatus.PRIVATE,`
`33`	`33`	`}`
`34`		`- owner = ApiOwner.VISIBILITY`
	`34`	`+ owner = ApiOwner.DATA_BROWSING`
`35`	`35`
`36`	`36`	`def get(self, request: Request, organization: Organization) -> Response:`
`37`	`37`	`try:`