Skip to content

feat: Use Snuba for Group.from_event_id #14034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions src/sentry/models/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,13 @@ def from_event_id(self, project, event_id):
Resolves the 32 character event_id string into
a Group for which it is found.
"""
from sentry.models import EventMapping, Event
from sentry.models import SnubaEvent
group_id = None

# Look up event_id in both Event and EventMapping,
# and bail when it matches one of them, prioritizing
# Event since it contains more history.
for model in Event, EventMapping:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try:
group_id = model.objects.filter(
project_id=project.id,
event_id=event_id,
).values_list('group_id', flat=True)[0]
event = SnubaEvent.objects.from_event_id(event_id, project.id)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


# It's possible that group_id is NULL
if group_id is not None:
break
except IndexError:
pass
if event:
group_id = event.group_id

if group_id is None:
# Raise a Group.DoesNotExist here since it makes
Expand Down
36 changes: 17 additions & 19 deletions tests/snuba/api/endpoints/test_project_group_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
from mock import patch, Mock

from sentry.models import (
Activity, ApiToken, EventMapping, Group, GroupAssignee, GroupBookmark, GroupHash,
Activity, ApiToken, Group, GroupAssignee, GroupBookmark, GroupHash,
GroupLink, GroupResolution, GroupSeen, GroupShare, GroupSnooze, GroupStatus, GroupSubscription,
GroupTombstone, ExternalIssue, Integration, Release, OrganizationIntegration, UserOption
)
from sentry.models.event import Event
from sentry.testutils import APITestCase, SnubaTestCase
from sentry.testutils.helpers import parse_link_header
from six.moves.urllib.parse import quote
Expand Down Expand Up @@ -192,31 +191,31 @@ def test_auto_resolved(self):
def test_lookup_by_event_id(self):
project = self.project
project.update_option('sentry:resolve_age', 1)
group = self.create_group(checksum='a' * 32)
self.create_group(checksum='b' * 32)
event_id = 'c' * 32
event = Event.objects.create(project_id=self.project.id, event_id=event_id)
EventMapping.objects.create(
event_id=event_id,
project=group.project,
group=group,
event = self.store_event(
data={
'event_id': event_id,
'timestamp': self.min_ago.isoformat()[:19],
},
project_id=self.project.id
)

self.login_as(user=self.user)

response = self.client.get(u'{}?query={}'.format(self.path, 'c' * 32), format='json')
assert response.status_code == 200
assert len(response.data) == 1
assert response.data[0]['id'] == six.text_type(group.id)
assert response.data[0]['id'] == six.text_type(event.group.id)
assert response.data[0]['matchingEventId'] == event.id

def test_lookup_by_event_with_matching_environment(self):
project = self.project
project.update_option('sentry:resolve_age', 1)
self.create_environment(name="test", project=project)

event = self.store_event(
data={
'environment': 'test',
'timestamp': self.min_ago.isoformat()[:19],
},
project_id=self.project.id,
)
Expand All @@ -235,21 +234,20 @@ def test_lookup_by_event_with_matching_environment(self):
def test_lookup_by_event_id_with_whitespace(self):
project = self.project
project.update_option('sentry:resolve_age', 1)
group = self.create_group(checksum='a' * 32)
self.create_group(checksum='b' * 32)
EventMapping.objects.create(
event_id='c' * 32,
project=group.project,
group=group,
event = self.store_event(
data={
'event_id': 'c' * 32,
'timestamp': self.min_ago.isoformat()[:19],
},
project_id=self.project.id
)

self.login_as(user=self.user)
response = self.client.get(
u'{}?query=%20%20{}%20%20'.format(self.path, 'c' * 32), format='json'
)
assert response.status_code == 200
assert len(response.data) == 1
assert response.data[0]['id'] == six.text_type(group.id)
assert response.data[0]['id'] == six.text_type(event.group.id)

def test_lookup_by_unknown_event_id(self):
project = self.project
Expand Down