Skip to content

Commit

Permalink
Merge branch 'master' into jb/ref/trace-components
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasBa committed Sep 23, 2024
2 parents 19e0876 + 6ca40f9 commit 55523aa
Show file tree
Hide file tree
Showing 138 changed files with 2,101 additions and 1,018 deletions.
11 changes: 8 additions & 3 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
"useNodejsImportProtocol": "error",
"useLiteralEnumMembers": "error",
"useEnumInitializers": "error",
"useAsConstAssertion": "error"
"useAsConstAssertion": "error",
"useBlockStatements": "error"
}
}
},
Expand All @@ -100,8 +101,12 @@
]
},
"css": {
"formatter": { "enabled": false },
"linter": { "enabled": false }
"formatter": {
"enabled": false
},
"linter": {
"enabled": false
}
},
"formatter": {
"enabled": true,
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@react-stately/tabs": "^3.6.9",
"@react-stately/tree": "^3.8.4",
"@react-types/shared": "^3.24.1",
"@rsdoctor/webpack-plugin": "0.3.11",
"@rsdoctor/webpack-plugin": "0.4.4",
"@sentry-internal/global-search": "^1.0.0",
"@sentry-internal/react-inspector": "6.0.1-4",
"@sentry-internal/rrweb": "2.26.0",
Expand All @@ -65,7 +65,7 @@
"@sentry/status-page-list": "^0.3.0",
"@sentry/types": "^8.28.0",
"@sentry/utils": "^8.28.0",
"@sentry/webpack-plugin": "^2.22.2",
"@sentry/webpack-plugin": "^2.22.4",
"@spotlightjs/spotlight": "^2.0.0-alpha.1",
"@tanstack/react-query": "^5.56.2",
"@tanstack/react-query-devtools": "^5.56.2",
Expand Down Expand Up @@ -173,14 +173,14 @@
"typescript": "^5.5.2",
"u2f-api": "1.0.10",
"url-loader": "^4.1.1",
"webpack": "5.93.0",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-remove-empty-scripts": "^1.0.4",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@biomejs/biome": "^1.9.1",
"@codecov/webpack-plugin": "^1.0.0",
"@codecov/webpack-plugin": "^1.2.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@sentry/jest-environment": "6.0.0",
"@sentry/profiling-node": "^8.28.0",
Expand All @@ -207,7 +207,7 @@
"stylelint-config-recommended": "^14.0.0",
"terser": "5.31.6",
"tsconfig-paths": "^4.2.0",
"webpack-dev-server": "5.0.4"
"webpack-dev-server": "5.1.0"
},
"resolutions": {
"react-mentions/@babel/runtime": "*"
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ module = [
"sentry.api.endpoints.index",
"sentry.api.endpoints.integrations.sentry_apps.details",
"sentry.api.endpoints.integrations.sentry_apps.index",
"sentry.api.endpoints.integrations.sentry_apps.installation.index",
"sentry.api.endpoints.integrations.sentry_apps.internal_app_token.index",
"sentry.api.endpoints.integrations.sentry_apps.publish_request",
"sentry.api.endpoints.integrations.sentry_apps.requests",
Expand Down
12 changes: 0 additions & 12 deletions src/sentry/api/endpoints/integrations/sentry_apps/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
from .details import SentryAppDetailsEndpoint
from .features import SentryAppFeaturesEndpoint
from .index import SentryAppsEndpoint
from .installation.details import SentryAppInstallationDetailsEndpoint
from .installation.external_issue.actions import SentryAppInstallationExternalIssueActionsEndpoint
from .installation.external_issue.details import SentryAppInstallationExternalIssueDetailsEndpoint
from .installation.external_issue.index import SentryAppInstallationExternalIssuesEndpoint
from .installation.external_requests import SentryAppInstallationExternalRequestsEndpoint
from .installation.index import SentryAppInstallationsEndpoint
from .interaction import SentryAppInteractionEndpoint
from .internal_app_token.details import SentryInternalAppTokenDetailsEndpoint
from .internal_app_token.index import SentryInternalAppTokensEndpoint
Expand All @@ -26,12 +20,6 @@
"SentryAppComponentsEndpoint",
"SentryAppDetailsEndpoint",
"SentryAppFeaturesEndpoint",
"SentryAppInstallationDetailsEndpoint",
"SentryAppInstallationExternalIssueActionsEndpoint",
"SentryAppInstallationExternalIssueDetailsEndpoint",
"SentryAppInstallationExternalIssuesEndpoint",
"SentryAppInstallationExternalRequestsEndpoint",
"SentryAppInstallationsEndpoint",
"SentryAppInteractionEndpoint",
"SentryAppPublishRequestEndpoint",
"SentryAppRequestsEndpoint",
Expand Down
6 changes: 0 additions & 6 deletions src/sentry/api/endpoints/project_rules_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from sentry.api.base import region_silo_endpoint
from sentry.api.bases.project import ProjectEndpoint
from sentry.constants import MIGRATED_CONDITIONS, SENTRY_APP_ACTIONS, TICKET_ACTIONS
from sentry.receivers.rules import has_high_priority_issue_alerts
from sentry.rules import rules


Expand Down Expand Up @@ -75,11 +74,6 @@ def get(self, request: Request, project) -> Response:
continue

if rule_type.startswith("condition/"):
if not has_high_priority_issue_alerts(project=project) and context["id"] in (
"sentry.rules.conditions.high_priority_issue.NewHighPriorityIssueCondition",
"sentry.rules.conditions.high_priority_issue.ExistingHighPriorityIssueCondition",
):
continue
condition_list.append(context)
elif rule_type.startswith("filter/"):
if (
Expand Down
10 changes: 9 additions & 1 deletion src/sentry/api/event_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,15 @@
key = ~r"[a-zA-Z0-9_.-]+"
quoted_key = '"' ~r"[a-zA-Z0-9_.:-]+" '"'
explicit_tag_key = "tags" open_bracket search_key closed_bracket
explicit_typed_tag_key = "tags" open_bracket search_key spaces comma spaces search_type closed_bracket
aggregate_key = key open_paren spaces function_args? spaces closed_paren
function_args = aggregate_param (spaces comma spaces !comma aggregate_param?)*
aggregate_param = quoted_aggregate_param / raw_aggregate_param
raw_aggregate_param = ~r"[^()\t\n, \"]+"
quoted_aggregate_param = '"' ('\\"' / ~r'[^\t\n\"]')* '"'
search_key = key / quoted_key
text_key = explicit_tag_key / search_key
search_type = "number" / "string"
text_key = explicit_tag_key / explicit_typed_tag_key / search_key
value = ~r"[^()\t\n ]*"
quoted_value = '"' ('\\"' / ~r'[^"]')* '"'
in_value = (&in_value_termination in_value_char)+
Expand Down Expand Up @@ -1046,6 +1048,12 @@ def visit_quoted_key(self, node, children):
def visit_explicit_tag_key(self, node, children):
return SearchKey(f"tags[{children[2].name}]")

def visit_explicit_typed_tag_key(self, node, children):
return SearchKey(f"tags[{children[2].name},{children[6]}]")

def visit_search_type(self, node, children):
return node.text

def visit_aggregate_key(self, node, children):
children = remove_optional_nodes(children)
children = remove_space(children)
Expand Down
26 changes: 18 additions & 8 deletions src/sentry/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
)
from sentry.issues.endpoints import (
ActionableItemsEndpoint,
EventIdLookupEndpoint,
EventJsonEndpoint,
GroupActivitiesEndpoint,
GroupDetailsEndpoint,
Expand All @@ -191,6 +192,7 @@
ProjectGroupStatsEndpoint,
ProjectStacktraceLinkEndpoint,
SharedGroupDetailsEndpoint,
ShortIdLookupEndpoint,
SourceMapDebugEndpoint,
TeamGroupsOldEndpoint,
)
Expand Down Expand Up @@ -273,6 +275,22 @@
from sentry.scim.endpoints.members import OrganizationSCIMMemberDetails, OrganizationSCIMMemberIndex
from sentry.scim.endpoints.schemas import OrganizationSCIMSchemaIndex
from sentry.scim.endpoints.teams import OrganizationSCIMTeamDetails, OrganizationSCIMTeamIndex
from sentry.sentry_apps.api.endpoints.installation_details import (
SentryAppInstallationDetailsEndpoint,
)
from sentry.sentry_apps.api.endpoints.installation_external_issue_actions import (
SentryAppInstallationExternalIssueActionsEndpoint,
)
from sentry.sentry_apps.api.endpoints.installation_external_issue_details import (
SentryAppInstallationExternalIssueDetailsEndpoint,
)
from sentry.sentry_apps.api.endpoints.installation_external_issues import (
SentryAppInstallationExternalIssuesEndpoint,
)
from sentry.sentry_apps.api.endpoints.installation_external_requests import (
SentryAppInstallationExternalRequestsEndpoint,
)
from sentry.sentry_apps.api.endpoints.sentry_app_installations import SentryAppInstallationsEndpoint
from sentry.uptime.endpoints.project_uptime_alert_details import ProjectUptimeAlertDetailsEndpoint
from sentry.uptime.endpoints.project_uptime_alert_index import ProjectUptimeAlertIndexEndpoint
from sentry.users.api.endpoints.authenticator_index import AuthenticatorIndexEndpoint
Expand Down Expand Up @@ -368,12 +386,6 @@
SentryAppComponentsEndpoint,
SentryAppDetailsEndpoint,
SentryAppFeaturesEndpoint,
SentryAppInstallationDetailsEndpoint,
SentryAppInstallationExternalIssueActionsEndpoint,
SentryAppInstallationExternalIssueDetailsEndpoint,
SentryAppInstallationExternalIssuesEndpoint,
SentryAppInstallationExternalRequestsEndpoint,
SentryAppInstallationsEndpoint,
SentryAppInteractionEndpoint,
SentryAppPublishRequestEndpoint,
SentryAppRequestsEndpoint,
Expand Down Expand Up @@ -428,7 +440,6 @@
from .endpoints.organization_details import OrganizationDetailsEndpoint
from .endpoints.organization_environments import OrganizationEnvironmentsEndpoint
from .endpoints.organization_event_details import OrganizationEventDetailsEndpoint
from .endpoints.organization_eventid import EventIdLookupEndpoint
from .endpoints.organization_events import OrganizationEventsEndpoint
from .endpoints.organization_events_facets import OrganizationEventsFacetsEndpoint
from .endpoints.organization_events_facets_performance import (
Expand Down Expand Up @@ -532,7 +543,6 @@
)
from .endpoints.organization_search_details import OrganizationSearchDetailsEndpoint
from .endpoints.organization_sessions import OrganizationSessionsEndpoint
from .endpoints.organization_shortid import ShortIdLookupEndpoint
from .endpoints.organization_slugs import SlugsUpdateEndpoint
from .endpoints.organization_spans_fields import (
OrganizationSpansFieldsEndpoint,
Expand Down
6 changes: 1 addition & 5 deletions src/sentry/conf/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
CELERY_ACCEPT_CONTENT = {"pickle"}
CELERY_IMPORTS = (
"sentry.data_export.tasks",
"sentry.discover.tasks",
"sentry.deletions.tasks.groups",
"sentry.deletions.tasks.scheduled",
"sentry.deletions.tasks.hybrid_cloud",
Expand Down Expand Up @@ -2184,10 +2183,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
# This flag activates consuming GroupAttribute messages in the development environment
SENTRY_USE_GROUP_ATTRIBUTES = True

# This flag activates code paths that are specific for customer domains
# Deprecated: This setting will be replaced with feature checks for system:multi-region
SENTRY_USE_CUSTOMER_DOMAINS = False

# This flag activates replay analyzer service in the development environment
SENTRY_USE_REPLAY_ANALYZER_SERVICE = False

Expand Down Expand Up @@ -2971,6 +2966,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
"sentry.issues.endpoints",
"sentry.integrations.api.endpoints",
"sentry.users.api.endpoints",
"sentry.sentry_apps.api.endpoints",
)
SENTRY_MAIL_ADAPTER_BACKEND = "sentry.mail.adapter.MailAdapter"

Expand Down
Loading

0 comments on commit 55523aa

Please sign in to comment.