Skip to content

Commit eb4ee6a

Browse files
author
NisanthanNanthakumar
authored
feat(eventuser): Drop eventuser-from-snuba feature flag (#61401)
## Objective: This feature is GA'd. This is a cleanup PR to remove the feature flag.
1 parent 2df5c06 commit eb4ee6a

File tree

10 files changed

+39
-75
lines changed

10 files changed

+39
-75
lines changed

src/sentry/conf/server.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,8 +1532,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
15321532
"organizations:escalating-metrics-backend": False,
15331533
# Enable attaching arbitrary files to events.
15341534
"organizations:event-attachments": True,
1535-
# Enable querying Snuba to get the EventUser
1536-
"organizations:eventuser-from-snuba": True,
15371535
# Enable the frontend to request from region & control silo domains.
15381536
"organizations:frontend-domainsplit": False,
15391537
# Enable disabling gitlab integrations when broken is detected

src/sentry/features/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@
255255
default_manager.add("organizations:escalating-issues-msteams", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
256256
default_manager.add("organizations:escalating-issues-v2", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
257257
default_manager.add("organizations:escalating-metrics-backend", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
258-
default_manager.add("organizations:eventuser-from-snuba", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
259258
default_manager.add("organizations:integrations-gh-invite", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
260259
default_manager.add("organizations:integrations-deployment", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
261260
default_manager.add("organizations:integrations-feature-flag-integration", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)

tests/acceptance/test_issue_tag_values.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ def create_issue(self):
2929
return self.store_event(data=event_data, project_id=self.project.id)
3030

3131
def test_user_tag(self):
32-
with self.feature("organizations:eventuser-from-snuba"):
33-
self.page.visit_tag_values(self.org.slug, self.event.group_id, "user")
34-
assert self.browser.element_exists_by_test_id("group-tag-mail")
32+
self.page.visit_tag_values(self.org.slug, self.event.group_id, "user")
33+
assert self.browser.element_exists_by_test_id("group-tag-mail")
3534

3635
def test_url_tag(self):
3736
self.page.visit_tag_values(self.org.slug, self.event.group_id, "url")

tests/apidocs/endpoints/projects/test_users.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def setUp(self):
5555
self.login_as(user=self.user)
5656

5757
def test_get(self):
58-
with self.feature("organizations:eventuser-from-snuba"):
59-
response = self.client.get(self.url)
60-
request = RequestFactory().get(self.url)
61-
self.validate_schema(request, response)
58+
response = self.client.get(self.url)
59+
request = RequestFactory().get(self.url)
60+
self.validate_schema(request, response)

tests/sentry/api/endpoints/test_group_tagkey_values.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55

66
from sentry.testutils.cases import APITestCase, PerformanceIssueTestCase, SnubaTestCase
77
from sentry.testutils.helpers.datetime import before_now, iso_format
8-
from sentry.testutils.helpers.features import with_feature
98
from sentry.testutils.silo import region_silo_test
109

1110

12-
@with_feature("organizations:eventuser-from-snuba")
1311
@region_silo_test
1412
class GroupTagKeyValuesTest(APITestCase, SnubaTestCase, PerformanceIssueTestCase):
1513
@mock.patch("sentry.analytics.record")

tests/sentry/api/endpoints/test_project_users.py

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from datetime import timedelta
2-
from unittest import SkipTest, mock
2+
from unittest import mock
33

44
from django.urls import reverse
55
from django.utils import timezone
@@ -10,13 +10,8 @@
1010
from sentry.utils.eventuser import EventUser
1111

1212

13-
class ProjectUsersBaseTest(APITestCase):
14-
@classmethod
15-
def setUpClass(cls):
16-
if cls is ProjectUsersBaseTest:
17-
raise SkipTest("Skipping base class")
18-
super().setUpClass()
19-
13+
@region_silo_test
14+
class EventUserProjectUsersTest(APITestCase, SnubaTestCase):
2015
def setUp(self):
2116
super().setUp()
2217
self.project = self.create_project(date_added=(timezone.now() - timedelta(hours=2)))
@@ -27,9 +22,37 @@ def setUp(self):
2722
"project_slug": self.project.slug,
2823
},
2924
)
30-
# Make mypy happy
31-
self.euser1 = EventUser(None, None, None, None, None, None)
32-
self.euser2 = EventUser(None, None, None, None, None, None)
25+
26+
timestamp = iso_format(timezone.now() - timedelta(hours=1))
27+
28+
self.event1 = self.store_event(
29+
project_id=self.project.id,
30+
data={
31+
"user": {
32+
"id": 1,
33+
"email": "[email protected]",
34+
"username": "foobar",
35+
"ip_address": "127.0.0.1",
36+
},
37+
"event_id": "b" * 32,
38+
"timestamp": timestamp,
39+
},
40+
)
41+
self.euser1 = EventUser.from_event(self.event1)
42+
self.event2 = self.store_event(
43+
project_id=self.project.id,
44+
data={
45+
"user": {
46+
"id": 2,
47+
"email": "[email protected]",
48+
"username": "baz",
49+
"ip_address": "192.168.0.1",
50+
},
51+
"event_id": "c" * 32,
52+
"timestamp": timestamp,
53+
},
54+
)
55+
self.euser2 = EventUser.from_event(self.event2)
3356

3457
@mock.patch("sentry.analytics.record")
3558
def test_simple(self, mock_record):
@@ -121,44 +144,3 @@ def test_ip_search(self):
121144
assert response.data[0]["id"] is None
122145
else:
123146
assert response.data[0]["id"] == str(self.euser2.id)
124-
125-
126-
@region_silo_test
127-
class EventUserProjectUsersTest(ProjectUsersBaseTest, SnubaTestCase):
128-
def setUp(self):
129-
super().setUp()
130-
timestamp = iso_format(timezone.now() - timedelta(hours=1))
131-
132-
self.event1 = self.store_event(
133-
project_id=self.project.id,
134-
data={
135-
"user": {
136-
"id": 1,
137-
"email": "[email protected]",
138-
"username": "foobar",
139-
"ip_address": "127.0.0.1",
140-
},
141-
"event_id": "b" * 32,
142-
"timestamp": timestamp,
143-
},
144-
)
145-
self.euser1 = EventUser.from_event(self.event1)
146-
self.event2 = self.store_event(
147-
project_id=self.project.id,
148-
data={
149-
"user": {
150-
"id": 2,
151-
"email": "[email protected]",
152-
"username": "baz",
153-
"ip_address": "192.168.0.1",
154-
},
155-
"event_id": "c" * 32,
156-
"timestamp": timestamp,
157-
},
158-
)
159-
self.euser2 = EventUser.from_event(self.event2)
160-
self.feature_manager = self.feature("organizations:eventuser-from-snuba")
161-
self.feature_manager.__enter__()
162-
163-
def tearDown(self):
164-
self.feature_manager.__exit__(None, None, None)

tests/sentry/api/serializers/test_organization.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def test_simple(self):
7575
"discover-query",
7676
"derive-code-mappings",
7777
"event-attachments",
78-
"eventuser-from-snuba",
7978
"integrations-alert-rule",
8079
"integrations-chat-unfurl",
8180
"integrations-deployment",

tests/sentry/data_export/processors/test_issues_by_tag.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from sentry.models.project import Project
1010
from sentry.testutils.cases import SnubaTestCase, TestCase
1111
from sentry.testutils.helpers.datetime import before_now, iso_format
12-
from sentry.testutils.helpers.features import with_feature
1312
from sentry.utils.eventuser import EventUser
1413

1514

@@ -74,7 +73,6 @@ def test_get_lookup_key(self):
7473
assert IssuesByTagProcessor.get_lookup_key("generic") == "generic"
7574
assert IssuesByTagProcessor.get_lookup_key("user") == "sentry:user"
7675

77-
@with_feature("organizations:eventuser-from-snuba")
7876
def test_get_eventuser_callback(self):
7977
user_callback = IssuesByTagProcessor.get_eventuser_callback(self.project.id)
8078
processor = IssuesByTagProcessor(
@@ -88,7 +86,6 @@ def test_get_eventuser_callback(self):
8886
user_callback([sample])
8987
assert sample._eventuser == self.euser
9088

91-
@with_feature("organizations:eventuser-from-snuba")
9289
def test_get_callbacks(self):
9390
generic_callbacks = IssuesByTagProcessor.get_callbacks("generic", self.project.id)
9491
assert isinstance(generic_callbacks, list)
@@ -97,7 +94,6 @@ def test_get_callbacks(self):
9794
assert isinstance(user_callbacks, list)
9895
assert len(user_callbacks) == 1
9996

100-
@with_feature("organizations:eventuser-from-snuba")
10197
def test_serialize_row(self):
10298
processor = IssuesByTagProcessor(
10399
project_id=self.project.id,

tests/sentry/search/test_utils.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from sentry.services.hybrid_cloud.user.service import user_service
2323
from sentry.testutils.cases import APITestCase, SnubaTestCase, TestCase
2424
from sentry.testutils.helpers.datetime import before_now, freeze_time, iso_format
25-
from sentry.testutils.helpers.features import with_feature
2625
from sentry.testutils.silo import control_silo_test, region_silo_test
2726

2827

@@ -450,7 +449,6 @@ def test_unknown_user_value(self):
450449
result = self.parse_query("user.xxxxxx:example")
451450
assert result["tags"]["sentry:user"] == "xxxxxx:example"
452451

453-
@with_feature("organizations:eventuser-from-snuba")
454452
def test_user_lookup_with_dot_query(self):
455453
self.project.date_added = timezone.now() - timedelta(minutes=10)
456454
self.project.save()
@@ -470,12 +468,10 @@ def test_user_lookup_with_dot_query(self):
470468
result = self.parse_query("user.username:foobar")
471469
assert result["tags"]["sentry:user"] == "id:1"
472470

473-
@with_feature("organizations:eventuser-from-snuba")
474471
def test_unknown_user_legacy_syntax(self):
475472
result = self.parse_query("user:email:[email protected]")
476473
assert result["tags"]["sentry:user"] == "email:[email protected]"
477474

478-
@with_feature("organizations:eventuser-from-snuba")
479475
def test_user_lookup_legacy_syntax(self):
480476
self.project.date_added = timezone.now() - timedelta(minutes=10)
481477
self.project.save()

tests/sentry/utils/test_eventuser.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from sentry.testutils.cases import APITestCase, SnubaTestCase
1111
from sentry.testutils.helpers.datetime import before_now, freeze_time, iso_format
12-
from sentry.testutils.helpers.features import with_feature
1312
from sentry.testutils.silo import region_silo_test
1413
from sentry.utils.eventuser import EventUser
1514

@@ -440,7 +439,6 @@ def test_tag_value_primary_is_ip(self):
440439
assert euser[0].email is None
441440
assert euser[0].tag_value == "ip:8.8.8.1"
442441

443-
@with_feature("organizations:eventuser-from-snuba")
444442
def test_for_tags(self):
445443
assert EventUser.for_tags(self.project.id, ["id:myminion"]) == {
446444
"id:myminion": EventUser.from_event(self.event_3)

0 commit comments

Comments
 (0)