Revert "ref(hc): Remove unnecessary get_organization_by_id (#62443)"

This reverts commit 8f9dbeba69e083379c1a84ee5555401a360daca2.

Co-authored-by: mrduncan <14761+mrduncan@users.noreply.github.com>

pyproject.toml

@@ -484,6 +484,7 @@ module = [
     "sentry.snuba.sessions_v2",
     "sentry.snuba.spans_indexed",
     "sentry.snuba.spans_metrics",
+    "sentry.snuba.tasks",
     "sentry.stacktraces.functions",
     "sentry.tagstore.snuba.backend",
     "sentry.tagstore.types",

src/sentry/snuba/tasks.py

@@ -2,13 +2,14 @@ from __future__ import annotations
 
 import logging
 from datetime import timedelta
-from typing import TYPE_CHECKING, Any, MutableMapping, Optional, Sequence
+from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence
 
 import sentry_sdk
 from django.utils import timezone
 
 from sentry import features
 from sentry.models.environment import Environment
+from sentry.services.hybrid_cloud.organization import organization_service
 from sentry.snuba.dataset import Dataset, EntityKey
 from sentry.snuba.entity_subscription import (
     BaseEntitySubscription,
@@ -196,16 +197,19 @@ def build_query_builder(
     query: str,
     project_ids: Sequence[int],
     environment: Optional[Environment],
-    params: Optional[MutableMapping[str, Any]] = None,
+    params: Optional[Mapping[str, Any]] = None,
 ) -> QueryBuilder:
     return entity_subscription.build_query_builder(query, project_ids, environment, params)
 
 
 def _create_in_snuba(subscription: QuerySubscription) -> str:
     with sentry_sdk.start_span(op="snuba.tasks", description="create_in_snuba") as span:
+        organization_context = organization_service.get_organization_by_id(
+            id=subscription.project.organization_id
+        )
         span.set_tag(
             "uses_metrics_layer",
-            features.has("organizations:use-metrics-layer", subscription.project.organization),
+            features.has("organizations:use-metrics-layer", organization_context.organization),
         )
         span.set_tag("dataset", subscription.snuba_query.dataset)