ref(eventsv2): Remove organization eventsv2 base

src/sentry/api/bases/organization_events.py

@@ -215,10 +215,6 @@ def quantize_date_params(
             )
         return results
 
-
-class OrganizationEventsV2EndpointBase(OrganizationEventsEndpointBase):
-    owner = ApiOwner.DATA_BROWSING
-
     def build_cursor_link(self, request: HttpRequest, name: str, cursor: Cursor | None) -> str:
         # The base API function only uses the last query parameter, but this endpoint
         # needs all the parameters, particularly for the "field" query param.
@@ -776,7 +772,7 @@ def serialize_accuracy_data(
         return serialized_values
 
 
-class KeyTransactionBase(OrganizationEventsV2EndpointBase):
+class KeyTransactionBase(OrganizationEventsEndpointBase):
     def has_feature(self, organization: Organization, request: Request) -> bool:
         return features.has("organizations:performance-view", organization, actor=request.user)
 

src/sentry/api/endpoints/organization_ai_conversations.py

@@ -12,7 +12,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
@@ -52,7 +52,7 @@ def validate_sort(self, value):
 
 
 @region_silo_endpoint
-class OrganizationAIConversationsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationAIConversationsEndpoint(OrganizationEventsEndpointBase):
     """Endpoint for fetching AI agent conversation traces."""
 
     publish_status = {

src/sentry/api/endpoints/organization_events.py

@@ -12,7 +12,7 @@
 from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.helpers.error_upsampling import (
     is_errors_query_for_error_upsampled_projects,
     transform_orderby_for_error_upsampling,
@@ -85,7 +85,7 @@ class EventsApiResponse(TypedDict):
 
 @extend_schema(tags=["Discover"])
 @region_silo_endpoint
-class OrganizationEventsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PUBLIC,
     }
@@ -164,14 +164,6 @@ def get(self, request: Request, organization: Organization) -> Response:
         """
         Retrieves discover (also known as events) data for a given organization.
 
-        **Eventsv2 Deprecation Note**: Users who may be using the `eventsv2` endpoint should update their requests to the `events` endpoint outline in this document.
-        The `eventsv2` endpoint is not a public endpoint and has no guaranteed availability. If you are not making any API calls to `eventsv2`, you can safely ignore this.
-        Changes between `eventsv2` and `events` include:
-        - Field keys in the response now match the keys in the requested `field` param exactly.
-        - The `meta` object in the response now shows types in the nested `field` object.
-
-        Aside from the url change, there are no changes to the request payload itself.
-
         **Note**: This endpoint is intended to get a table of results, and is not for doing a full export of data sent to
         Sentry.
 

src/sentry/api/endpoints/organization_events_facets.py

@@ -8,7 +8,7 @@
 from sentry import tagstore
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors, update_snuba_params_with_timestamp
 from sentry.models.organization import Organization
@@ -27,7 +27,7 @@ class _KeyTopValues(TypedDict):
 
 
 @region_silo_endpoint
-class OrganizationEventsFacetsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsFacetsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_facets_performance.py

@@ -12,7 +12,7 @@
 from sentry import features, tagstore
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
@@ -39,7 +39,7 @@
 DEFAULT_TAG_KEY_LIMIT = 5
 
 
-class OrganizationEventsFacetsPerformanceEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationEventsFacetsPerformanceEndpointBase(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_has_measurements.py

@@ -9,7 +9,7 @@
 
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.snuba import discover
@@ -50,7 +50,7 @@ def validate(self, data):
 
 
 @region_silo_endpoint
-class OrganizationEventsHasMeasurementsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsHasMeasurementsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_histogram.py

@@ -7,7 +7,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.snuba import discover
@@ -44,7 +44,7 @@ def validate_field(self, fields):
 
 
 @region_silo_endpoint
-class OrganizationEventsHistogramEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsHistogramEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_meta.py

@@ -8,11 +8,7 @@
 from sentry import features, options, search
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import (
-    NoProjects,
-    OrganizationEventsEndpointBase,
-    OrganizationEventsV2EndpointBase,
-)
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.event_search import parse_search_query
 from sentry.api.helpers.environments import get_environment_func
 from sentry.api.helpers.group_index import build_query_params_from_request
@@ -185,7 +181,7 @@ def get(self, request: Request, organization: Organization) -> Response:
 
 
 @region_silo_endpoint
-class OrganizationSpansSamplesEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationSpansSamplesEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_spans_histogram.py

@@ -5,7 +5,7 @@
 
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.search.events.types import Span
@@ -36,7 +36,7 @@ def validate_span(self, span: str) -> Span:
 
 
 @region_silo_endpoint
-class OrganizationEventsSpansHistogramEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsSpansHistogramEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_spans_performance.py

@@ -17,7 +17,7 @@
 
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.discover.arithmetic import is_equation, strip_equation
@@ -86,7 +86,7 @@ class SpanPerformanceColumn:
 }
 
 
-class OrganizationEventsSpansEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationEventsSpansEndpointBase(OrganizationEventsEndpointBase):
     def get_snuba_params(
         self,
         request: Request,

src/sentry/api/endpoints/organization_events_stats.py

@@ -11,7 +11,7 @@
 from sentry.analytics.events.agent_monitoring_events import AgentMonitoringQuery
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import OrganizationEventsV2EndpointBase
+from sentry.api.bases import OrganizationEventsEndpointBase
 from sentry.api.helpers.error_upsampling import (
     is_errors_query_for_error_upsampled_projects,
     transform_query_columns_for_error_upsampling,
@@ -54,7 +54,7 @@
 
 
 @region_silo_endpoint
-class OrganizationEventsStatsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsStatsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }

src/sentry/api/endpoints/organization_events_timeseries.py

@@ -10,7 +10,7 @@
 from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.endpoints.organization_events_stats import SENTRY_BACKEND_REFERRERS
 from sentry.api.endpoints.timeseries import (
     EMPTY_STATS_RESPONSE,
@@ -72,7 +72,7 @@ def null_zero(value: float) -> float | None:
 
 
 @region_silo_endpoint
-class OrganizationEventsTimeseriesEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsTimeseriesEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }

src/sentry/api/endpoints/organization_events_trace.py

@@ -19,7 +19,7 @@
 from sentry import constants, features, options
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.serializers.models.event import EventTag, get_tags_with_meta
 from sentry.api.utils import handle_query_errors, update_snuba_params_with_timestamp
 from sentry.issues.issue_occurrence import IssueOccurrence
@@ -734,7 +734,7 @@ def pad_span_id(span: str | None) -> str:
     return span.rjust(16, "0")
 
 
-class OrganizationEventsTraceEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationEventsTraceEndpointBase(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
@@ -1448,7 +1448,7 @@ def serialize_with_spans(
 
 
 @region_silo_endpoint
-class OrganizationEventsTraceMetaEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsTraceMetaEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_trends.py

@@ -13,7 +13,7 @@
 from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.event_search import AggregateFilter
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
@@ -80,7 +80,7 @@ def resolve_function(
             return super().resolve_function(function, match, resolve_only, overwrite_alias)
 
 
-class OrganizationEventsTrendsEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationEventsTrendsEndpointBase(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_trends_v2.py

@@ -10,7 +10,7 @@
 from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.issue_detection.detectors.utils import escape_transaction
@@ -46,7 +46,7 @@
 
 
 @region_silo_endpoint
-class OrganizationEventsNewTrendsStatsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsNewTrendsStatsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_vitals.py

@@ -6,15 +6,15 @@
 from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.search.events.fields import get_function_alias
 from sentry.snuba import discover
 
 
 @region_silo_endpoint
-class OrganizationEventsVitalsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsVitalsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_on_demand_metrics_estimation_stats.py

@@ -12,7 +12,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import OrganizationEventsV2EndpointBase
+from sentry.api.bases import OrganizationEventsEndpointBase
 from sentry.models.organization import Organization
 from sentry.search.events import fields
 from sentry.search.events.types import SnubaParams
@@ -52,7 +52,7 @@ class StatsQualityEstimation(Enum):
 
 
 @region_silo_endpoint
-class OrganizationOnDemandMetricsEstimationStatsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationOnDemandMetricsEstimationStatsEndpoint(OrganizationEventsEndpointBase):
     """Gets the estimated volume of an organization's metric events."""
 
     publish_status = {

src/sentry/api/endpoints/organization_profiling_functions.py

@@ -12,7 +12,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.exceptions import InvalidSearchQuery
@@ -66,7 +66,7 @@ class FunctionTrendsSerializer(serializers.Serializer):
 
 
 @region_silo_endpoint
-class OrganizationProfilingFunctionTrendsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationProfilingFunctionTrendsEndpoint(OrganizationEventsEndpointBase):
     owner = ApiOwner.PROFILING
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,

src/sentry/api/endpoints/organization_profiling_profiles.py

@@ -11,7 +11,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.profiles.flamegraph import FlamegraphExecutor
@@ -22,7 +22,7 @@
 from sentry.utils.snuba import raw_snql_query
 
 
-class OrganizationProfilingBaseEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationProfilingBaseEndpoint(OrganizationEventsEndpointBase):
     owner = ApiOwner.PROFILING
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,

src/sentry/api/endpoints/organization_spans_fields.py

@@ -17,7 +17,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.event_search import translate_escape_sequences
 from sentry.api.paginator import ChainPaginator
 from sentry.api.serializers import serialize
@@ -54,7 +54,7 @@ def as_tag_key(name: str, type: Literal["string", "number"]):
     }
 
 
-class OrganizationSpansFieldsEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationSpansFieldsEndpointBase(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }