ref(viewer-context): Centralize org binding hook

Update the viewer context organization id inside bind_organization_context
instead of repeating the same call at each binding site.

This keeps request-scoped enrichment behavior the same while making the
canonical organization binding hook responsible for both SDK scope tags and
ambient viewer context updates.

Co-Authored-By: Codex <codex@openai.com>

Author: gricha

src/sentry/api/bases/organization.py

@@ -39,7 +39,6 @@
 from sentry.utils.hashlib import hash_values
 from sentry.utils.numbers import format_grouped_length
 from sentry.utils.sdk import bind_organization_context, set_span_attribute
-from sentry.viewer_context import set_viewer_context_organization
 
 
 class NoProjects(Exception):
@@ -318,7 +317,6 @@ def convert_args(
 
         # Used for API access logs
         request._request.organization = organization_context.organization
-        set_viewer_context_organization(organization_context.organization.id)
 
         return (args, kwargs)
 
@@ -640,7 +638,6 @@ def convert_args(
         bind_organization_context(organization)
 
         request._request.organization = organization
-        set_viewer_context_organization(organization.id)
 
         # Track the 'active' organization when the request came from
         # a cookie based agent (react app)

src/sentry/api/bases/project.py

@@ -20,7 +20,6 @@
 from sentry.models.project import Project
 from sentry.models.projectredirect import ProjectRedirect
 from sentry.utils.sdk import Scope, bind_organization_context
-from sentry.viewer_context import set_viewer_context_organization
 
 from .organization import OrganizationPermission
 
@@ -212,7 +211,6 @@ def convert_args(
         request._request.organization = (
             project.organization
         )  # XXX: we should not be stuffing random attributes into HttpRequest
-        set_viewer_context_organization(project.organization.id)
 
         kwargs["project"] = project
         return (args, kwargs)

src/sentry/api/bases/team.py

@@ -9,7 +9,6 @@
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.models.team import Team, TeamStatus
 from sentry.utils.sdk import bind_organization_context
-from sentry.viewer_context import set_viewer_context_organization
 
 from .organization import OrganizationPermission
 
@@ -68,7 +67,6 @@ def convert_args(
         bind_organization_context(team.organization)
 
         request._request.organization = team.organization
-        set_viewer_context_organization(team.organization.id)
 
         kwargs["team"] = team
         return (args, kwargs)

src/sentry/issues/endpoints/bases/group.py

@@ -20,7 +20,6 @@
 from sentry.models.grouplink import GroupLink
 from sentry.models.organization import Organization
 from sentry.utils.sdk import bind_organization_context
-from sentry.viewer_context import set_viewer_context_organization
 
 logger = logging.getLogger(__name__)
 
@@ -78,7 +77,6 @@ def convert_args(
             bind_organization_context(organization)
 
             request._request.organization = organization
-            set_viewer_context_organization(organization.id)
         else:
             organization = None
 
@@ -103,7 +101,6 @@ def convert_args(
             raise ResourceDoesNotExist
 
         request._request.organization = group.project.organization
-        set_viewer_context_organization(group.project.organization.id)
 
         kwargs["group"] = group
 

src/sentry/monitors/endpoints/base.py

@@ -14,7 +14,6 @@
 from sentry.models.project import Project
 from sentry.monitors.models import CheckInStatus, Monitor, MonitorCheckIn, MonitorEnvironment
 from sentry.utils.sdk import Scope, bind_organization_context
-from sentry.viewer_context import set_viewer_context_organization
 
 DEPRECATED_INGEST_API_MESSAGE = "We have removed this deprecated API. Please migrate to using DSN instead: https://docs.sentry.io/product/crons/legacy-endpoint-migration/#am-i-using-legacy-endpoints"
 
@@ -72,7 +71,6 @@ def convert_args(
         bind_organization_context(project.organization)
 
         request._request.organization = project.organization
-        set_viewer_context_organization(project.organization.id)
 
         kwargs["organization"] = organization
         kwargs["project"] = project

src/sentry/utils/sdk.py

@@ -30,6 +30,7 @@
 from sentry.utils import metrics
 from sentry.utils.db import DjangoAtomicIntegration
 from sentry.utils.rust import RustInfoIntegration
+from sentry.viewer_context import set_viewer_context_organization
 
 # Can't import models in utils because utils should be the bottom of the food chain
 if TYPE_CHECKING:
@@ -683,6 +684,7 @@ def bind_organization_context(organization: Organization | RpcOrganization) -> N
     helper = settings.SENTRY_ORGANIZATION_CONTEXT_HELPER
 
     scope = sentry_sdk.get_isolation_scope()
+    set_viewer_context_organization(organization.id)
 
     # XXX(dcramer): this is duplicated in organizationContext.jsx on the frontend
     with sentry_sdk.start_span(op="other", name="bind_organization_context"):