Skip to content

Commit ee21cae

Browse files
committed
Revert "feat(events-v2): Add an organization event details endpoint (#13553)"
This reverts commit 822f85f.
1 parent 880d00b commit ee21cae

File tree

4 files changed

+0
-418
lines changed

4 files changed

+0
-418
lines changed

src/sentry/api/bases/organization_events.py

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
from copy import deepcopy
44
from rest_framework.exceptions import PermissionDenied
5-
import six
6-
from enum import Enum
75

86
from sentry import features
97
from sentry.api.bases import OrganizationEndpoint, OrganizationEventsError
108
from sentry.api.event_search import get_snuba_query_args, InvalidSearchQuery
119
from sentry.models.project import Project
12-
from sentry.utils import snuba
1310

1411
# We support 4 "special fields" on the v2 events API which perform some
1512
# additional calculations over aggregated event data
@@ -31,11 +28,6 @@
3128
ALLOWED_GROUPINGS = frozenset(('issue.id', 'project.id'))
3229

3330

34-
class Direction(Enum):
35-
NEXT = 0
36-
PREV = 1
37-
38-
3931
class OrganizationEventsEndpointBase(OrganizationEndpoint):
4032

4133
def get_snuba_query_args(self, request, organization):
@@ -145,55 +137,3 @@ def get_snuba_query_args_v2(self, request, organization, params):
145137
raise OrganizationEventsError(
146138
'Boolean search operator OR and AND not allowed in this search.')
147139
return snuba_args
148-
149-
def next_event_id(self, *args):
150-
"""
151-
Returns the next event ID if there is a subsequent event matching the
152-
conditions provided
153-
"""
154-
return self._get_next_or_prev_id(Direction.NEXT, *args)
155-
156-
def prev_event_id(self, *args):
157-
"""
158-
Returns the previous event ID if there is a previous event matching the
159-
conditions provided
160-
"""
161-
return self._get_next_or_prev_id(Direction.PREV, *args)
162-
163-
def _get_next_or_prev_id(self, direction, request, organization, snuba_args, event):
164-
if (direction == Direction.NEXT):
165-
time_condition = [
166-
['timestamp', '>=', event.timestamp],
167-
[['timestamp', '>', event.timestamp], ['event_id', '>', event.event_id]]
168-
]
169-
orderby = ['timestamp', 'event_id']
170-
start = max(event.datetime, snuba_args['start'])
171-
end = snuba_args['end']
172-
173-
else:
174-
time_condition = [
175-
['timestamp', '<=', event.timestamp],
176-
[['timestamp', '<', event.timestamp], ['event_id', '<', event.event_id]]
177-
]
178-
orderby = ['-timestamp', '-event_id']
179-
start = snuba_args['start']
180-
end = min(event.datetime, snuba_args['end'])
181-
182-
conditions = snuba_args['conditions'][:]
183-
conditions.extend(time_condition)
184-
185-
result = snuba.raw_query(
186-
start=start,
187-
end=end,
188-
selected_columns=['event_id'],
189-
conditions=conditions,
190-
filter_keys=snuba_args['filter_keys'],
191-
orderby=orderby,
192-
limit=1,
193-
referrer='api.organization-events.next-or-prev-id',
194-
)
195-
196-
if 'error' in result or len(result['data']) == 0:
197-
return None
198-
199-
return six.text_type(result['data'][0]['event_id'])

src/sentry/api/endpoints/organization_event_details.py

Lines changed: 0 additions & 119 deletions
This file was deleted.

src/sentry/api/urls.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
from .endpoints.organization_discover_saved_queries import OrganizationDiscoverSavedQueriesEndpoint
7373
from .endpoints.organization_discover_saved_query_detail import OrganizationDiscoverSavedQueryDetailEndpoint
7474
from .endpoints.organization_events import OrganizationEventsEndpoint, OrganizationEventsMetaEndpoint, OrganizationEventsStatsEndpoint, OrganizationEventsHeatmapEndpoint
75-
from .endpoints.organization_event_details import OrganizationEventDetailsEndpoint, OrganizationEventDetailsLatestEndpoint, OrganizationEventDetailsOldestEndpoint
7675
from .endpoints.organization_group_index import OrganizationGroupIndexEndpoint
7776
from .endpoints.organization_dashboard_details import OrganizationDashboardDetailsEndpoint
7877
from .endpoints.organization_dashboard_widget_details import OrganizationDashboardWidgetDetailsEndpoint
@@ -606,21 +605,6 @@
606605
OrganizationEventsEndpoint.as_view(),
607606
name='sentry-api-0-organization-events'
608607
),
609-
url(
610-
r'^organizations/(?P<organization_slug>[^\/]+)/events/(?P<project_slug>[^\/]+):(?P<event_id>(?:\d+|[A-Fa-f0-9]{32}))/$',
611-
OrganizationEventDetailsEndpoint.as_view(),
612-
name='sentry-api-0-organization-event-details'
613-
),
614-
url(
615-
r'^organizations/(?P<organization_slug>[^\/]+)/events/latest/$',
616-
OrganizationEventDetailsLatestEndpoint.as_view(),
617-
name='sentry-api-0-organization-event-details-latest'
618-
),
619-
url(
620-
r'^organizations/(?P<organization_slug>[^\/]+)/events/oldest/$',
621-
OrganizationEventDetailsOldestEndpoint.as_view(),
622-
name='sentry-api-0-organization-event-details-oldest'
623-
),
624608
url(
625609
r'^organizations/(?P<organization_slug>[^\/]+)/events-stats/$',
626610
OrganizationEventsStatsEndpoint.as_view(),

0 commit comments

Comments
 (0)