ref(ddm): Remove v2 from metrics API (#67676)

src/sentry/api/endpoints/organization_metrics.py

@@ -25,7 +25,7 @@ from sentry.api.serializers.models.metrics_code_locations import MetricCodeLocat
 from sentry.api.utils import get_date_range_from_params, handle_query_errors
 from sentry.exceptions import InvalidParams, InvalidSearchQuery
 from sentry.models.organization import Organization
-from sentry.sentry_metrics.querying.data_v2 import (
+from sentry.sentry_metrics.querying.data import (
     MetricsAPIQueryResultsTransformer,
     MetricsQueriesPlan,
     run_metrics_queries_plan,

src/sentry/sentry_metrics/querying/data_v2/api.py → src/sentry/sentry_metrics/querying/data/api.py

@@ -8,14 +8,14 @@ from sentry import features
 from sentry.models.environment import Environment
 from sentry.models.organization import Organization
 from sentry.models.project import Project
-from sentry.sentry_metrics.querying.data_v2.execution import QueryExecutor, QueryResult
-from sentry.sentry_metrics.querying.data_v2.parsing import QueryParser
-from sentry.sentry_metrics.querying.data_v2.plan import MetricsQueriesPlan, MetricsQueriesPlanResult
-from sentry.sentry_metrics.querying.data_v2.preparation.base import (
+from sentry.sentry_metrics.querying.data.execution import QueryExecutor, QueryResult
+from sentry.sentry_metrics.querying.data.parsing import QueryParser
+from sentry.sentry_metrics.querying.data.plan import MetricsQueriesPlan, MetricsQueriesPlanResult
+from sentry.sentry_metrics.querying.data.preparation.base import (
     IntermediateQuery,
     run_preparation_steps,
 )
-from sentry.sentry_metrics.querying.data_v2.preparation.units_normalization import (
+from sentry.sentry_metrics.querying.data.preparation.units_normalization import (
     UnitsNormalizationStep,
 )
 from sentry.sentry_metrics.querying.types import QueryType

src/sentry/sentry_metrics/querying/data_v2/execution.py → src/sentry/sentry_metrics/querying/data/execution.py

@@ -11,8 +11,8 @@ from snuba_sdk.conditions import BooleanCondition, BooleanOp, Condition, Op
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.sentry_metrics.querying.constants import SNUBA_QUERY_LIMIT
-from sentry.sentry_metrics.querying.data_v2.preparation.base import IntermediateQuery
-from sentry.sentry_metrics.querying.data_v2.utils import adjust_time_bounds_with_interval
+from sentry.sentry_metrics.querying.data.preparation.base import IntermediateQuery
+from sentry.sentry_metrics.querying.data.utils import adjust_time_bounds_with_interval
 from sentry.sentry_metrics.querying.errors import (
     InvalidMetricsQueryError,
     MetricsQueryExecutionError,

src/sentry/sentry_metrics/querying/data_v2/parsing.py → src/sentry/sentry_metrics/querying/data/parsing.py

@@ -5,7 +5,7 @@ from snuba_sdk.mql.mql import InvalidMQLQueryError, parse_mql
 
 from sentry.models.environment import Environment
 from sentry.models.project import Project
-from sentry.sentry_metrics.querying.data_v2.plan import MetricsQueriesPlan
+from sentry.sentry_metrics.querying.data.plan import MetricsQueriesPlan
 from sentry.sentry_metrics.querying.errors import InvalidMetricsQueryError
 from sentry.sentry_metrics.querying.types import QueryExpression, QueryOrder
 from sentry.sentry_metrics.querying.visitors import (

src/sentry/sentry_metrics/querying/data_v2/plan.py → src/sentry/sentry_metrics/querying/data/plan.py

@@ -1,8 +1,8 @@
 import re
 from dataclasses import dataclass, replace
 
-from sentry.sentry_metrics.querying.data_v2.execution import QueryResult
-from sentry.sentry_metrics.querying.data_v2.transformation.base import (
+from sentry.sentry_metrics.querying.data.execution import QueryResult
+from sentry.sentry_metrics.querying.data.transformation.base import (
     QueryResultsTransformer,
     QueryTransformerResult,
 )

src/sentry/sentry_metrics/querying/data_v2/preparation/units_normalization.py → src/sentry/sentry_metrics/querying/data/preparation/units_normalization.py

@@ -1,9 +1,6 @@
 from dataclasses import replace
 
-from sentry.sentry_metrics.querying.data_v2.preparation.base import (
-    IntermediateQuery,
-    PreparationStep,
-)
+from sentry.sentry_metrics.querying.data.preparation.base import IntermediateQuery, PreparationStep
 from sentry.sentry_metrics.querying.units import WithUnit
 from sentry.sentry_metrics.querying.visitors import UnitsNormalizationVisitor