feat(CapMan): Tagstore Org IDs passed to Snuba

src/sentry/api/endpoints/group_details.py

@@ -185,7 +185,12 @@ def get(self, request: Request, group) -> Response:
                     }
                 )
 
-            tags = tagstore.get_group_tag_keys(group, environment_ids, limit=100)
+            tags = tagstore.get_group_tag_keys(
+                group,
+                environment_ids,
+                limit=100,
+                tenant_ids={"organization_id": group.project.organization_id},
+            )
 
             user_reports = (
                 UserReport.objects.filter(group_id=group.id)

src/sentry/api/endpoints/group_tagkey_details.py

@@ -23,7 +23,7 @@ def get(self, request: Request, group, key) -> Response:
         :auth: required
         """
         lookup_key = tagstore.prefix_reserved_key(key)
-
+        tenant_ids = {"organization_id": group.project.organization_id}
         try:
             environment_id = self._get_environment_id_from_request(
                 request, group.project.organization_id
@@ -33,18 +33,23 @@ def get(self, request: Request, group, key) -> Response:
             raise ResourceDoesNotExist
 
         try:
-            group_tag_key = tagstore.get_group_tag_key(group, environment_id, lookup_key)
+            group_tag_key = tagstore.get_group_tag_key(
+                group,
+                environment_id,
+                lookup_key,
+                tenant_ids=tenant_ids,
+            )
         except tagstore.GroupTagKeyNotFound:
             raise ResourceDoesNotExist
 
         if group_tag_key.count is None:
             group_tag_key.count = tagstore.get_group_tag_value_count(
-                group.project_id, group.id, environment_id, lookup_key
+                group.project_id, group.id, environment_id, lookup_key, tenant_ids=tenant_ids
             )
 
         if group_tag_key.top_values is None:
             group_tag_key.top_values = tagstore.get_top_group_tag_values(
-                group, environment_id, lookup_key
+                group, environment_id, lookup_key, tenant_ids=tenant_ids
             )
 
         return Response(serialize(group_tag_key, request.user))

src/sentry/api/endpoints/group_tagkey_values.py

@@ -27,9 +27,14 @@ def get(self, request: Request, group, key) -> Response:
         lookup_key = tagstore.prefix_reserved_key(key)
 
         environment_ids = [e.id for e in get_environments(request, group.project.organization)]
-
+        tenant_ids = {"organization_id": group.project.organization_id}
         try:
-            tagstore.get_group_tag_key(group, None, lookup_key)
+            tagstore.get_group_tag_key(
+                group,
+                None,
+                lookup_key,
+                tenant_ids=tenant_ids,
+            )
         except tagstore.GroupTagKeyNotFound:
             raise ResourceDoesNotExist
         sort = request.GET.get("sort")
@@ -48,7 +53,7 @@ def get(self, request: Request, group, key) -> Response:
             serializer_cls = None
 
         paginator = tagstore.get_group_tag_value_paginator(
-            group, environment_ids, lookup_key, order_by=order_by
+            group, environment_ids, lookup_key, order_by=order_by, tenant_ids=tenant_ids
         )
 
         return self.paginate(

src/sentry/api/endpoints/group_tags.py

@@ -39,7 +39,11 @@ def get(self, request: Request, group: Group) -> Response:
         environment_ids = [e.id for e in get_environments(request, group.project.organization)]
 
         tag_keys = tagstore.get_group_tag_keys_and_top_values(
-            group, environment_ids, keys=keys, value_limit=value_limit
+            group,
+            environment_ids,
+            keys=keys,
+            value_limit=value_limit,
+            tenant_ids={"organization_id": group.project.organization_id},
         )
 
         data = serialize(tag_keys, request.user)

src/sentry/api/endpoints/organization_tagkey_values.py

@@ -46,6 +46,7 @@ def get(self, request: Request, organization, key) -> Response:
                     include_transactions=request.GET.get("includeTransactions") == "1",
                     include_sessions=request.GET.get("includeSessions") == "1",
                     include_replays=request.GET.get("includeReplays") == "1",
+                    tenant_ids={"organization_id": organization.id},
                 )
 
         return self.paginate(

src/sentry/api/endpoints/organization_tags.py

@@ -28,6 +28,7 @@ def get(self, request: Request, organization) -> Response:
                     use_cache=request.GET.get("use_cache", "0") == "1",
                     # Defaults to True, because the frontend caches these tags globally
                     include_transactions=request.GET.get("include_transactions", "1") == "1",
+                    tenant_ids={"organization_id": organization.id},
                 )
                 if not features.has(
                     "organizations:javascript-console-error-tag",

src/sentry/api/endpoints/organization_user_issues_search.py

@@ -38,6 +38,7 @@ def get(self, request: Request, organization) -> Response:
                     project_ids=list({e.project_id for e in event_users}),
                     event_users=event_users,
                     limit=limit,
+                    tenant_ids={"organization_id": organization.id},
                 )
             ).order_by("-last_seen")[:limit]
         else:

src/sentry/api/endpoints/project_tagkey_details.py

@@ -32,7 +32,12 @@ def get(self, request: Request, project, key) -> Response:
             raise ResourceDoesNotExist
 
         try:
-            tagkey = tagstore.get_tag_key(project.id, environment_id, lookup_key)
+            tagkey = tagstore.get_tag_key(
+                project.id,
+                environment_id,
+                lookup_key,
+                tenant_ids={"organization_id": project.organization_id},
+            )
         except tagstore.TagKeyNotFound:
             raise ResourceDoesNotExist
 
@@ -55,7 +60,7 @@ def delete(self, request: Request, project, key) -> Response:
 
             eventstream_state = eventstream.start_delete_tag(project.id, key)
 
-            deleted = self.get_tag_keys_for_deletion(project.id, lookup_key)
+            deleted = self.get_tag_keys_for_deletion(project, lookup_key)
 
             # NOTE: By sending the `end_delete_tag` message here we are making
             # the assumption that the `delete_tag_key` does its work
@@ -77,8 +82,15 @@ def delete(self, request: Request, project, key) -> Response:
 
         return Response(status=204)
 
-    def get_tag_keys_for_deletion(self, project_id, key):
+    def get_tag_keys_for_deletion(self, project, key):
         try:
-            return [tagstore.get_tag_key(project_id=project_id, key=key, environment_id=None)]
+            return [
+                tagstore.get_tag_key(
+                    project_id=project.id,
+                    key=key,
+                    environment_id=None,
+                    tenant_ids={"organization_id": project.organization_id},
+                )
+            ]
         except tagstore.TagKeyNotFound:
             return []

src/sentry/api/endpoints/project_tagkey_values.py

@@ -28,15 +28,20 @@ def get(self, request: Request, project, key) -> Response:
         :auth: required
         """
         lookup_key = tagstore.prefix_reserved_key(key)
-
+        tenant_ids = {"organization_id": project.organization_id}
         try:
             environment_id = self._get_environment_id_from_request(request, project.organization_id)
         except Environment.DoesNotExist:
             # if the environment doesn't exist then the tag can't possibly exist
             raise ResourceDoesNotExist
 
         try:
-            tagkey = tagstore.get_tag_key(project.id, environment_id, lookup_key)
+            tagkey = tagstore.get_tag_key(
+                project.id,
+                environment_id,
+                lookup_key,
+                tenant_ids=tenant_ids,
+            )
         except tagstore.TagKeyNotFound:
             raise ResourceDoesNotExist
 
@@ -50,6 +55,7 @@ def get(self, request: Request, project, key) -> Response:
             end=end,
             query=request.GET.get("query"),
             order_by="-last_seen",
+            tenant_ids=tenant_ids,
         )
 
         return self.paginate(

src/sentry/api/endpoints/project_tags.py

@@ -26,7 +26,12 @@ def get(self, request: Request, project) -> Response:
                 kwargs.update(denylist=DS_DENYLIST)
 
             tag_keys = sorted(
-                tagstore.get_tag_keys(project.id, environment_id, **kwargs),
+                tagstore.get_tag_keys(
+                    project.id,
+                    environment_id,
+                    tenant_ids={"organization_id": project.organization_id},
+                    **kwargs,
+                ),
                 key=lambda x: x.key,
             )
 

src/sentry/api/serializers/models/group.py

@@ -811,16 +811,25 @@ def __seen_stats_impl(
 
         project_id = issue_list[0].project_id
         item_ids = [g.id for g in issue_list]
+        tenant_ids = {"organization_id": issue_list[0].project.organization_id}
         user_counts: Mapping[int, int] = user_counts_func(
-            [project_id], item_ids, environment_ids=environment and [environment.id]
+            [project_id],
+            item_ids,
+            environment_ids=environment and [environment.id],
+            tenant_ids=tenant_ids,
         )
         first_seen: MutableMapping[int, datetime] = {}
         last_seen: MutableMapping[int, datetime] = {}
         times_seen: MutableMapping[int, int] = {}
 
         if environment is not None:
             environment_seen_stats = environment_seen_stats_func(
-                [project_id], item_ids, [environment.id], "environment", environment.name
+                [project_id],
+                item_ids,
+                [environment.id],
+                "environment",
+                environment.name,
+                tenant_ids=tenant_ids,
             )
             for item_id, value in environment_seen_stats.items():
                 first_seen[item_id] = value.first_seen

src/sentry/data_export/processors/issues_by_tag.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from sentry import tagstore
 from sentry.models import EventUser, Group, Project, get_group_with_redirect
 
@@ -9,7 +11,14 @@ class IssuesByTagProcessor:
     Processor for exports of issues data based on a provided tag
     """
 
-    def __init__(self, project_id, group_id, key, environment_id):
+    def __init__(
+        self,
+        project_id,
+        group_id,
+        key,
+        environment_id,
+        tenant_ids: dict[str, str | int] | None = None,
+    ):
         self.project = self.get_project(project_id)
         self.group = self.get_group(group_id, self.project)
         self.key = key
@@ -18,7 +27,9 @@ def __init__(self, project_id, group_id, key, environment_id):
         self.lookup_key = self.get_lookup_key(self.key)
         # Ensure the tag key exists, as it may have been deleted
         try:
-            tagstore.get_tag_key(self.project.id, environment_id, self.lookup_key)
+            tagstore.get_tag_key(
+                self.project.id, environment_id, self.lookup_key, tenant_ids=tenant_ids
+            )
         except tagstore.TagKeyNotFound:
             raise ExportError("Requested key does not exist")
         self.callbacks = self.get_callbacks(self.key, self.group.project_id)
@@ -101,6 +112,7 @@ def get_raw_data(self, limit=1000, offset=0):
             callbacks=self.callbacks,
             limit=limit,
             offset=offset,
+            tenant_ids={"organization_id": self.project.organization_id},
         )
 
     def get_serialized_data(self, limit=1000, offset=0):

src/sentry/models/group.py

@@ -627,7 +627,11 @@ def get_email_subject(self):
 
     def count_users_seen(self):
         return tagstore.get_groups_user_counts(
-            [self.project_id], [self.id], environment_ids=None, start=self.first_seen
+            [self.project_id],
+            [self.id],
+            environment_ids=None,
+            start=self.first_seen,
+            tenant_ids={"organization_id": self.project.organization_id},
         )[self.id]
 
     @classmethod