Merge branch 'master' into jferg/learn-more

Author: JoshFerge

.github/CODEOWNERS

@@ -523,6 +523,8 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /static/app/views/settings/dynamicSampling/                                      @getsentry/telemetry-experience
 /static/app/views/onboarding*                                                    @getsentry/telemetry-experience
 /static/app/views/projectInstall/                                                @getsentry/telemetry-experience
+/static/app/views/insights/agentMonitoring/                                      @getsentry/telemetry-experience
+/static/app/views/insights/pages/platform/                                       @getsentry/telemetry-experience
 ## End of Telemetry Experience
 
 

.pre-commit-config.yaml

@@ -143,6 +143,14 @@ repos:
             |static/app/utils/profiling/profile/formats/typescript/trace\.json
           )$
 
+      - id: knip
+        name: knip
+        language: system
+        files: \.(ts|js|tsx|jsx|mjs)$
+        pass_filenames: false
+        stages: [pre-push]
+        entry: bash -c 'if [ -n "${SENTRY_KNIP_PRE_PUSH:-}" ]; then exec ./node_modules/.bin/knip; fi' --
+
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:

Makefile

@@ -100,7 +100,7 @@ test-cli: create-db
 	cd test_cli && sentry init test_conf
 	cd test_cli && sentry --config=test_conf help
 	cd test_cli && sentry --config=test_conf upgrade --traceback --noinput
-	cd test_cli && sentry --config=test_conf export
+	cd test_cli && sentry --config=test_conf export --help
 	rm -r test_cli
 	@echo ""
 

knip.config.ts

@@ -33,7 +33,7 @@ const storyBookEntryPoints = [
   // our storybook implementation is here
   'static/app/stories/storyBook.tsx',
   // custom webpack loaders for stories
-  'static/app/**/stories/*loader.ts',
+  'static/app/stories/*loader.ts',
 ];
 
 const config: KnipConfig = {

migrations_lockfile.txt

@@ -21,12 +21,12 @@ nodestore: 0001_squashed_0002_nodestore_no_dictfield
 
 replays: 0001_squashed_0005_drop_replay_index
 
-sentry: 0906_django_arrayfield_users
+sentry: 0909_django_array_field_not_release
 
 social_auth: 0001_squashed_0002_default_auto_field
 
 tempest: 0001_squashed_0002_make_message_type_nullable
 
 uptime: 0001_squashed_0042_extra_uptime_indexes
 
-workflow_engine: 0066_workflow_action_group_status_table
+workflow_engine: 0001_squashed_0065_add_status_to_detector_and_workflow

requirements-base.txt

@@ -6,7 +6,7 @@ botocore>=1.34.8
 brotli>=1.1.0
 cachetools>=5
 celery>=5
-click>=8.1
+click>=8.2
 confluent-kafka>=2.3.0
 cronsim>=2.6
 cssselect>=1.0.3

requirements-dev-frozen.txt

@@ -25,8 +25,8 @@ cffi==1.17.1
 cfgv==3.3.1
 chardet==5.2.0
 charset-normalizer==3.4.0
-click==8.1.7
-click-didyoumean==0.3.0
+click==8.2.1
+click-didyoumean==0.3.1
 click-plugins==1.1.1
 click-repl==0.3.0
 confluent-kafka==2.8.0

requirements-frozen.txt

@@ -22,8 +22,8 @@ certifi==2024.7.4
 cffi==1.17.1
 chardet==5.2.0
 charset-normalizer==3.4.0
-click==8.1.7
-click-didyoumean==0.3.0
+click==8.2.1
+click-didyoumean==0.3.1
 click-plugins==1.1.1
 click-repl==0.3.0
 confluent-kafka==2.8.0

rspack.config.ts

@@ -380,8 +380,8 @@ const appConfig: Configuration = {
   resolveLoader: {
     alias: {
       'type-loader': STORYBOOK_TYPES
-        ? path.resolve(__dirname, 'static/app/views/stories/type-loader.ts')
-        : path.resolve(__dirname, 'static/app/views/stories/noop-type-loader.ts'),
+        ? path.resolve(__dirname, 'static/app/stories/type-loader.ts')
+        : path.resolve(__dirname, 'static/app/stories/noop-type-loader.ts'),
     },
   },
 

src/sentry/api/bases/organization.py

@@ -64,6 +64,9 @@ def is_not_2fa_compliant(
         if request.user.is_authenticated and request.user.is_sentry_app:
             return False
 
+        if request.user.is_anonymous:
+            return False
+
         if is_active_superuser(request):
             return False
 

src/sentry/api/endpoints/group_ai_summary.py

@@ -10,6 +10,7 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.group import GroupAiEndpoint
+from sentry.autofix.utils import SeerAutomationSource
 from sentry.models.group import Group
 from sentry.seer.issue_summary import get_issue_summary
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
@@ -37,7 +38,10 @@ def post(self, request: Request, group: Group) -> Response:
         force_event_id = data.get("event_id", None)
 
         summary_data, status_code = get_issue_summary(
-            group=group, user=request.user, force_event_id=force_event_id, source="issue_details"
+            group=group,
+            user=request.user,
+            force_event_id=force_event_id,
+            source=SeerAutomationSource.ISSUE_DETAILS,
         )
 
         return Response(summary_data, status=status_code)

src/sentry/api/endpoints/group_autofix_setup_check.py

@@ -7,12 +7,13 @@
 from django.conf import settings
 from rest_framework.response import Response
 
+from sentry import quotas
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.group import GroupAiEndpoint
 from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
-from sentry.constants import ObjectStatus
+from sentry.constants import DataCategory, ObjectStatus
 from sentry.integrations.services.integration import integration_service
 from sentry.models.group import Group
 from sentry.models.organization import Organization
@@ -126,6 +127,11 @@ def get(self, request: Request, group: Group) -> Response:
         if not user_acknowledgement:  # If the user has acknowledged, the org must have too.
             org_acknowledgement = get_seer_org_acknowledgement(org_id=org.id)
 
+        # TODO return BOTH trial status and autofix quota
+        has_autofix_quota: bool = quotas.backend.has_available_reserved_budget(
+            org_id=org.id, data_category=DataCategory.SEER_AUTOFIX
+        )
+
         return Response(
             {
                 "integration": {
@@ -137,5 +143,8 @@ def get(self, request: Request, group: Group) -> Response:
                     "orgHasAcknowledged": org_acknowledgement,
                     "userHasAcknowledged": user_acknowledgement,
                 },
+                "billing": {
+                    "hasAutofixQuota": has_autofix_quota,
+                },
             }
         )

src/sentry/api/endpoints/organization_events_meta.py

@@ -178,18 +178,16 @@ def get(self, request: Request, organization) -> Response:
         except NoProjects:
             return Response({})
 
-        # TODO: remove useRpc param
-        use_eap = (
-            request.GET.get("useRpc", "0") == "1" or request.GET.get("dataset", None) == "spans"
-        )
+        use_eap = request.GET.get("dataset", None) == "spans"
         orderby = self.get_orderby(request) or ["timestamp"]
 
-        if use_eap:
-            result = get_eap_span_samples(request, snuba_params, orderby)
-            dataset = spans_rpc
-        else:
-            result = get_span_samples(request, snuba_params, orderby)
-            dataset = spans_indexed
+        with handle_query_errors():
+            if use_eap:
+                result = get_eap_span_samples(request, snuba_params, orderby)
+                dataset = spans_rpc
+            else:
+                result = get_span_samples(request, snuba_params, orderby)
+                dataset = spans_indexed
 
         return Response(
             self.handle_results_with_meta(

src/sentry/api/endpoints/organization_trace_item_attributes.py

@@ -10,6 +10,7 @@
     TraceItemAttributeNamesRequest,
     TraceItemAttributeValuesRequest,
 )
+from sentry_protos.snuba.v1.request_common_pb2 import PageToken
 from sentry_protos.snuba.v1.request_common_pb2 import TraceItemType as ProtoTraceItemType
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeKey
 
@@ -20,7 +21,7 @@
 from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
 from sentry.api.endpoints.organization_spans_fields import BaseSpanFieldValuesAutocompletionExecutor
 from sentry.api.event_search import translate_escape_sequences
-from sentry.api.paginator import ChainPaginator
+from sentry.api.paginator import ChainPaginator, GenericOffsetPaginator
 from sentry.api.serializers import serialize
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
@@ -35,6 +36,40 @@
 from sentry.snuba.referrer import Referrer
 from sentry.tagstore.types import TagValue
 from sentry.utils import snuba_rpc
+from sentry.utils.cursors import Cursor, CursorResult
+
+
+class TraceItemAttributesNamesPaginator:
+    """
+    This is a bit of a weird paginator.
+
+    The trace item attributes RPC returns a list of attribute names from the
+    database. But depending on the item type, it is possible that there are some
+    hard coded attribute names that gets appended to the end of the results.
+    Because of that, the number of results returned can exceed limit + 1.
+
+    To handle this nicely, here we choose to return the full set of results
+    even if it exceeds limit + 1.
+    """
+
+    def __init__(self, data_fn):
+        self.data_fn = data_fn
+
+    def get_result(self, limit, cursor=None):
+        if limit <= 0:
+            raise ValueError(f"invalid limit for paginator, expected >0, got {limit}")
+
+        offset = cursor.offset if cursor is not None else 0
+        # Request 1 more than limit so we can tell if there is another page
+        data = self.data_fn(offset=offset, limit=limit + 1)
+        assert isinstance(data, list)
+        has_more = len(data) >= limit + 1
+
+        return CursorResult(
+            data,
+            prev=Cursor(0, max(0, offset - limit), True, offset > 0),
+            next=Cursor(0, max(0, offset + limit), False, has_more),
+        )
 
 
 class OrganizationTraceItemAttributesEndpointBase(OrganizationEventsV2EndpointBase):
@@ -166,32 +201,28 @@ def get(self, request: Request, organization: Organization) -> Response:
             else AttributeKey.Type.TYPE_STRING
         )
 
-        rpc_request = TraceItemAttributeNamesRequest(
-            meta=meta,
-            limit=max_attributes,
-            offset=0,
-            type=attr_type,
-            value_substring_match=value_substring_match,
-            intersecting_attributes_filter=filter,
-        )
+        def data_fn(offset: int, limit: int):
+            rpc_request = TraceItemAttributeNamesRequest(
+                meta=meta,
+                limit=limit,
+                page_token=PageToken(offset=offset),
+                type=attr_type,
+                value_substring_match=value_substring_match,
+                intersecting_attributes_filter=filter,
+            )
 
-        with handle_query_errors():
-            rpc_response = snuba_rpc.attribute_names_rpc(rpc_request)
-
-        paginator = ChainPaginator(
-            [
-                [
-                    as_attribute_key(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)
-                ],
-            ],
-            max_limit=max_attributes,
-        )
+            with handle_query_errors():
+                rpc_response = snuba_rpc.attribute_names_rpc(rpc_request)
+
+            return [
+                as_attribute_key(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)
+            ]
 
         return self.paginate(
             request=request,
-            paginator=paginator,
+            paginator=TraceItemAttributesNamesPaginator(data_fn=data_fn),
             on_results=lambda results: serialize(results, request.user),
             default_per_page=max_attributes,
             max_per_page=max_attributes,
@@ -230,24 +261,25 @@ def get(self, request: Request, organization: Organization, key: str) -> Respons
             else OURLOG_DEFINITIONS
         )
 
-        executor = TraceItemAttributeValuesAutocompletionExecutor(
-            organization=organization,
-            snuba_params=snuba_params,
-            key=key,
-            query=substring_match,
-            max_span_tag_values=max_attribute_values,
-            definitions=definitions,
-        )
-
-        with handle_query_errors():
-            tag_values = executor.execute()
-        tag_values.sort(key=lambda tag: tag.value)
+        def data_fn(offset: int, limit: int):
+            executor = TraceItemAttributeValuesAutocompletionExecutor(
+                organization=organization,
+                snuba_params=snuba_params,
+                key=key,
+                query=substring_match,
+                limit=limit,
+                offset=offset,
+                definitions=definitions,
+            )
 
-        paginator = ChainPaginator([tag_values], max_limit=max_attribute_values)
+            with handle_query_errors():
+                tag_values = executor.execute()
+            tag_values.sort(key=lambda tag: tag.value)
+            return tag_values
 
         return self.paginate(
             request=request,
-            paginator=paginator,
+            paginator=GenericOffsetPaginator(data_fn=data_fn),
             on_results=lambda results: serialize(results, request.user),
             default_per_page=max_attribute_values,
             max_per_page=max_attribute_values,
@@ -261,10 +293,13 @@ def __init__(
         snuba_params: SnubaParams,
         key: str,
         query: str | None,
-        max_span_tag_values: int,
+        limit: int,
+        offset: int,
         definitions: ColumnDefinitions,
     ):
-        super().__init__(organization, snuba_params, key, query, max_span_tag_values)
+        super().__init__(organization, snuba_params, key, query, limit)
+        self.limit = limit
+        self.offset = offset
         self.resolver = SearchResolver(
             params=snuba_params, config=SearchResolverConfig(), definitions=definitions
         )
@@ -326,7 +361,8 @@ def string_autocomplete_function(self) -> list[TagValue]:
             meta=meta,
             key=self.attribute_key,
             value_substring_match=query,
-            limit=self.max_span_tag_values,
+            limit=self.limit,
+            page_token=PageToken(offset=self.offset),
         )
         rpc_response = snuba_rpc.attribute_values_rpc(rpc_request)