Merge branch 'master' into julia/user-option

Author: Julia Hoge

.github/CODEOWNERS

@@ -24,6 +24,9 @@
 /src/sentry/tagstore/snuba/                              @getsentry/owners-snuba
 /src/sentry/sentry_metrics/                              @getsentry/owners-snuba
 /tests/sentry/sentry_metrics/                            @getsentry/owners-snuba
+/src/sentry/snuba/metrics/                               @getsentry/owners-snuba @getsentry/telemetry-experience
+/src/sentry/snuba/metrics/query.py                       @getsentry/owners-snuba @getsentry/telemetry-experience
+/src/sentry/search/events/datasets/metrics_layer.py      @getsentry/owners-snuba
 
 ## Event Ingestion
 /src/sentry/attachments/                                 @getsentry/owners-ingest
@@ -397,13 +400,11 @@ yarn.lock                                                @getsentry/owners-js-de
 
 
 ## Telemetry Experience
-/src/sentry/snuba/metrics/                                                       @getsentry/telemetry-experience
 /src/sentry/api/endpoints/organization_metrics.py                                @getsentry/telemetry-experience
 /src/sentry/api/endpoints/organization_sessions.py                               @getsentry/telemetry-experience
 /src/sentry/api/endpoints/project_dynamic_sampling.py                            @getsentry/telemetry-experience
 /src/sentry/api/endpoints/organization_dynamic_sampling_sdk_versions.py          @getsentry/telemetry-experience
 /src/sentry/dynamic_sampling/                                                    @getsentry/telemetry-experience
-/src/sentry/snuba/metrics/query.py                                               @getsentry/telemetry-experience
 /src/sentry/release_health/metrics_sessions_v2.py                                @getsentry/telemetry-experience
 /tests/sentry/api/endpoints/test_organization_metric_data.py                     @getsentry/telemetry-experience
 /tests/sentry/api/endpoints/test_organization_metric_details.py                  @getsentry/telemetry-experience

.gitignore

@@ -1,5 +1,6 @@
 .env
 .cache/
+.code-workspace
 .coverage*
 .DS_Store
 .venv

fixtures/backup/single-option.json

@@ -0,0 +1,20 @@
+[
+    {
+        "model": "sites.site",
+        "pk": 1,
+        "fields": {
+        "domain": "example.com",
+        "name": "example.com"
+        }
+    },
+    {
+        "model": "sentry.option",
+        "pk": 1,
+        "fields": {
+        "key": "sentry:latest_version",
+        "last_updated": "2023-06-22T00:00:00.000Z",
+        "last_updated_by": "unknown",
+        "value": "\"23.6.1\""
+        }
+    }
+]

pyproject.toml

@@ -814,7 +814,6 @@ module = [
     "sentry.utils.concurrent",
     "sentry.utils.distutils.commands.base",
     "sentry.utils.distutils.commands.build_assets",
-    "sentry.utils.email.list_resolver",
     "sentry.utils.email.signer",
     "sentry.utils.http",
     "sentry.utils.locking.backends.migration",
@@ -1059,7 +1058,6 @@ module = [
     "tests.sentry.notifications.test_utils",
     "tests.sentry.notifications.utils.test_tasks",
     "tests.sentry.options.test_store",
-    "tests.sentry.ownership.test_grammar",
     "tests.sentry.pipeline.test_pipeline",
     "tests.sentry.plugins.bases.test_issue2",
     "tests.sentry.processing.realtime_metrics.test_redis",
@@ -1083,14 +1081,12 @@ module = [
     "tests.sentry.replays.test_project_replay_recording_segment_index",
     "tests.sentry.replays.unit.test_dead_click_issue",
     "tests.sentry.replays.unit.test_ingest_dom_index",
-    "tests.sentry.roles.test_manager",
     "tests.sentry.rules.conditions.test_event_attribute",
     "tests.sentry.rules.conditions.test_level_event",
     "tests.sentry.rules.conditions.test_tagged_event",
     "tests.sentry.rules.filters.test_issue_category",
     "tests.sentry.rules.history.endpoints.test_project_rule_preview",
     "tests.sentry.rules.test_processor",
-    "tests.sentry.runner.test_initializer",
     "tests.sentry.search.events.builder.test_discover",
     "tests.sentry.search.events.builder.test_metrics",
     "tests.sentry.search.events.test_fields",
@@ -1109,8 +1105,6 @@ module = [
     "tests.sentry.sentry_metrics.test_multiprocess_steps",
     "tests.sentry.sentry_metrics.test_postgres_indexer",
     "tests.sentry.sentry_metrics.test_strings",
-    "tests.sentry.services.test_http",
-    "tests.sentry.shared_integrations.client.test_base",
     "tests.sentry.snuba.metrics.test_metrics_layer.test_release_health",
     "tests.sentry.snuba.metrics.test_mqb_query_transformer",
     "tests.sentry.snuba.metrics.test_query_builder",
@@ -1122,7 +1116,6 @@ module = [
     "tests.sentry.snuba.test_profiles",
     "tests.sentry.snuba.test_query_subscription_consumer",
     "tests.sentry.snuba.test_tasks",
-    "tests.sentry.spans.grouping.test_strategy",
     "tests.sentry.tagstore.test_types",
     "tests.sentry.tasks.deletion.test_groups",
     "tests.sentry.tasks.deletion.test_scheduled",
@@ -1136,22 +1129,7 @@ module = [
     "tests.sentry.tasks.test_servicehooks",
     "tests.sentry.tasks.test_store",
     "tests.sentry.templatetags.test_sentry_assets",
-    "tests.sentry.test_killswitches",
     "tests.sentry.test_stacktraces",
-    "tests.sentry.testutils.helpers.test_features",
-    "tests.sentry.tsdb.test_redissnuba",
-    "tests.sentry.utils.email.test_list_resolver",
-    "tests.sentry.utils.locking.backends.test_redis",
-    "tests.sentry.utils.suspect_resolutions.test_metric_correlation",
-    "tests.sentry.utils.test_audit",
-    "tests.sentry.utils.test_cursors",
-    "tests.sentry.utils.test_event_frames",
-    "tests.sentry.utils.test_functional",
-    "tests.sentry.utils.test_meta",
-    "tests.sentry.utils.test_outcomes",
-    "tests.sentry.utils.test_safe",
-    "tests.sentry.utils.test_services",
-    "tests.sentry.utils.test_time_window",
     "tests.sentry.web.test_client_config",
     "tests.snuba.rules.conditions.test_event_frequency",
     "tests.snuba.sessions.test_sessions",

src/sentry/api/base.py

@@ -666,7 +666,18 @@ def __call__(self, decorated_obj: Any) -> Any:
 
 
 control_silo_endpoint = EndpointSiloLimit(SiloMode.CONTROL)
+"""
+Apply to endpoints that exist in CONTROL silo.
+If a request is received and the application is not in CONTROL
+mode 404s will be returned.
+"""
+
 region_silo_endpoint = EndpointSiloLimit(SiloMode.REGION)
+"""
+Apply to endpoints that exist in REGION silo.
+If a request is received and the application is not in REGION
+mode 404s will be returned.
+"""
 
 # Use this decorator to mark endpoints that still need to be marked as either
 # control_silo_endpoint or region_silo_endpoint. Marking a class with
@@ -675,5 +686,10 @@ def __call__(self, decorated_obj: Any) -> Any:
 # Eventually we should replace all instances of this decorator and delete it.
 pending_silo_endpoint = EndpointSiloLimit()
 
-# This should be rarely used, but this should be used for any endpoints that exist in any silo mode.
+
 all_silo_endpoint = EndpointSiloLimit(SiloMode.CONTROL, SiloMode.REGION, SiloMode.MONOLITH)
+"""
+Apply to endpoints that are available in all silo modes.
+
+This should be rarely used, but is relevant for resources like ROBOTS.txt.
+"""

src/sentry/api/helpers/group_index/update.py

@@ -173,7 +173,7 @@ def get_current_release_version_of_group(
 
 def update_groups(
     request: Request,
-    group_ids: Sequence[Group],
+    group_ids: Sequence[int],
     projects: Sequence[Project],
     organization_id: int,
     search_fn: SearchFunction | None,

src/sentry/auth/providers/saml2/generic/views.py

@@ -10,11 +10,13 @@
     process_metadata,
 )
 from sentry.auth.view import AuthView, ConfigureView
+from sentry.services.hybrid_cloud.auth import RpcAuthProvider, auth_service
+from sentry.services.hybrid_cloud.organization.model import RpcOrganization
 from sentry.utils.http import absolute_uri
 
 
 class SAML2ConfigureView(ConfigureView):
-    def dispatch(self, request: Request, organization, provider):
+    def dispatch(self, request: Request, organization: RpcOrganization, provider: RpcAuthProvider):
         sp_metadata_url = absolute_uri(
             reverse("sentry-auth-organization-saml-metadata", args=[organization.slug])
         )
@@ -25,11 +27,14 @@ def dispatch(self, request: Request, organization, provider):
         else:
             saml_form = SAMLForm(request.POST)
             attr_mapping_form = AttributeMappingForm(request.POST)
-
             if saml_form.is_valid() and attr_mapping_form.is_valid():
                 provider.config["idp"] = saml_form.cleaned_data
                 provider.config["attribute_mapping"] = attr_mapping_form.cleaned_data
-                provider.save()
+                auth_service.update_provider_config(
+                    organization_id=organization.id,
+                    auth_provider_id=provider.id,
+                    config=provider.config,
+                )
 
         return self.render(
             "sentry_auth_saml2/configure.html",

src/sentry/backup/comparators.py

@@ -55,17 +55,17 @@ def existence(self, on: InstanceID, left: JSONData, right: JSONData) -> list[Com
             if f not in left["fields"]:
                 findings.append(
                     ComparatorFinding(
-                        kind=self.get_kind(),
+                        kind="Unexecuted" + self.get_kind(),
                         on=on,
-                        reason=f"the left {f} value on `{on}` was missing",
+                        reason=f"the left `{f}` value was missing",
                     )
                 )
             if f not in right["fields"]:
                 findings.append(
                     ComparatorFinding(
-                        kind=self.get_kind(),
+                        kind="Unexecuted" + self.get_kind(),
                         on=on,
-                        reason=f"the right {f} value on `{on}` was missing",
+                        reason=f"the right `{f}` value was missing",
                     )
                 )
         return findings
@@ -214,11 +214,12 @@ class HashObfuscatingComparator(ObfuscatingComparator):
     def truncate(self, data: list[str]) -> list[str]:
         truncated = []
         for d in data:
-            if len(d) >= 16:
+            length = len(d)
+            if length >= 16:
                 truncated.append(f"{d[:3]}...{d[-3:]}")
-            elif len(d) >= 8:
+            elif length >= 8:
                 truncated.append(f"{d[:1]}...{d[-1:]}")
-            elif len(d):
+            else:
                 truncated.append("...")
         return truncated
 

src/sentry/backup/findings.py

@@ -35,6 +35,9 @@ def __init__(self, findings: list[ComparatorFinding]):
     def append(self, finding: ComparatorFinding) -> None:
         self.findings.append(finding)
 
+    def empty(self) -> bool:
+        return not self.findings
+
     def extend(self, findings: list[ComparatorFinding]) -> None:
         self.findings += findings
 

src/sentry/backup/validate.py

@@ -29,23 +29,38 @@ def json_lines(obj: JSONData) -> list[str]:
     findings = ComparatorFindings([])
     exp_models = {}
     act_models = {}
-    for model in expect:
-        id = InstanceID(model["model"], model["pk"])
-        exp_models[id] = model
 
     # Because we may be scrubbing data from the objects as we compare them, we may (optionally) make
     # deep copies to start to avoid potentially mangling the input data.
     expect = deepcopy(expect)
     actual = deepcopy(actual)
 
-    # Ensure that the actual JSON contains no duplicates - we assume that the expected JSON did not.
+    # Ensure that the actual JSON contains no duplicates.
+    exp_dupes = set()
+    for model in expect:
+        id = InstanceID(model["model"], model["pk"])
+        if id in exp_models and id not in exp_dupes:
+            findings.append(
+                ComparatorFinding("DuplicateEntry", id, "Duplicate entry in expected output")
+            )
+            exp_dupes.add(id)
+        else:
+            exp_models[id] = model
+    act_dupes = set()
     for model in actual:
         id = InstanceID(model["model"], model["pk"])
-        if id in act_models:
-            findings.append(ComparatorFinding("DuplicateEntry", id))
+        if id in act_models and id not in act_dupes:
+            findings.append(
+                ComparatorFinding("DuplicateEntry", id, "Duplicate entry in actual output")
+            )
+            act_dupes.add(id)
         else:
             act_models[id] = model
 
+    # If there are duplicate entries, something is seriously wrong, so abort ASAP.
+    if not findings.empty():
+        return findings
+
     # Report unexpected and missing entries in the actual JSON.
     extra = sorted(act_models.keys() - exp_models.keys())
     missing = sorted(exp_models.keys() - act_models.keys())

src/sentry/conf/server.py

@@ -1110,7 +1110,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     },
     "github_comment_reactions": {
         "task": "sentry.tasks.integrations.github_comment_reactions",
-        "schedule": crontab(hour=16),  # 9:00 PDT, 12:00 EDT, 16:00 UTC
+        "schedule": crontab(minute=0, hour=16),  # 9:00 PDT, 12:00 EDT, 16:00 UTC
     },
     "poll_recap_servers": {
         "task": "sentry.tasks.poll_recap_servers",
@@ -1500,6 +1500,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "organizations:issue-details-most-helpful-event-ui": False,
     # Display if a release is using semver when resolving issues
     "organizations:issue-release-semver": False,
+    # Display a prompt to setup releases in the resolve options dropdown
+    "organizations:issue-resolve-release-setup": False,
     # Adds the ttid & ttfd vitals to the frontend
     "organizations:mobile-vitals": False,
     # Display CPU and memory metrics in transactions with profiles
@@ -1671,8 +1673,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "organizations:org-auth-tokens": False,
     # Enable detecting SDK crashes during event processing
     "organizations:sdk-crash-detection": False,
-    # Enables commenting on PRs from the Sentry comment bot.
-    "organizations:pr-comment-bot": True,
     # Enables slack channel lookup via schedule message
     "organizations:slack-use-new-lookup": False,
     # Enable functionality for recap server polling.

src/sentry/db/models/base.py

@@ -231,4 +231,13 @@ def __call__(self, model_class: Type[ModelClass]) -> Type[ModelClass]:
 
 
 control_silo_only_model = ModelSiloLimit(SiloMode.CONTROL)
+"""
+Apply to models that are shared by multiple organizations or
+require strong consistency with other Control silo resources.
+"""
+
 region_silo_only_model = ModelSiloLimit(SiloMode.REGION)
+"""
+Apply to models that belong to a single organization or
+require strong consistency with other Region silo resources.
+"""

src/sentry/features/__init__.py

@@ -95,6 +95,7 @@
 default_manager.add("organizations:issue-details-stacktrace-improvements", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:issue-platform", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:issue-release-semver", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
+default_manager.add("organizations:issue-resolve-release-setup", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:issue-search-allow-postgres-only-search", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:issue-search-use-cdc-primary", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:issue-search-use-cdc-secondary", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
@@ -258,7 +259,6 @@
 default_manager.add("organizations:codecov-commit-sha-from-git-blame", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:ds-sliding-window", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("organizations:ds-sliding-window-org", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
-default_manager.add("organizations:pr-comment-bot", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:ds-org-recalibration", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("organizations:slack-use-new-lookup", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:slack-disable-on-broken", OrganizationFeature, FeatureHandlerStrategy.REMOTE)

src/sentry/grouping/variants.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 from sentry.grouping.utils import hash_from_values, is_default_fingerprint_var
 
 
 class BaseVariant:
     # The type of the variant that is reported to the UI.
-    type: str
+    type: str | None = None
 
     # This is true if `get_hash` does not return `None`.
     contributes = True

src/sentry/integrations/discord/__init__.py

@@ -1,5 +1,14 @@
+from sentry.rules import rules
+
+from .actions import *  # noqa: F401,F403
+from .actions import DiscordNotifyServiceAction
+from .client import *  # noqa: F401,F403
 from .commands import *  # noqa: F401,F403
 from .integration import *  # noqa: F401,F403
+from .message_builder.base import *  # noqa: F401,F403
+from .message_builder.issues import *  # noqa: F401,F403
 from .urls import *  # noqa: F401,F403
 from .utils import *  # noqa: F401,F403
 from .views import *  # noqa: F401,F403
+
+rules.add(DiscordNotifyServiceAction)  # type: ignore

src/sentry/integrations/discord/actions/__init__.py

@@ -0,0 +1,2 @@
+from .form import *  # noqa: F401, F403
+from .notification import *  # noqa: F401, F403