Skip to content
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.

Sign up for GitHub

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

fix(inc984): scrub the correct bucket for sentry.user #6693

Merged
merged 1 commit into from
Dec 19, 2024
Merged

fix(inc984): scrub the correct bucket for sentry.user #6693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion snuba/manual_jobs/scrub_users_from_eap_spans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def _get_query(self, cluster_name: str | None) -> str:
on_cluster = f"ON CLUSTER '{cluster_name}'" if cluster_name else ""
return f"""ALTER TABLE eap_spans_2_local
{on_cluster}
UPDATE `attr_str_2` = mapApply((k, v) -> (k, if(k = 'user' AND startsWith(v, '{_IP_PREFIX}') AND (isIPv4String(substring(v, 4)) OR isIPv6String(substring(v, 4))), 'ip:scrubbed', v)), `attr_str_2`)
UPDATE `attr_str_11` = mapApply((k, v) -> (k, if(k = 'sentry.user' AND startsWith(v, '{_IP_PREFIX}') AND (isIPv4String(substring(v, 4)) OR isIPv6String(substring(v, 4))), 'ip:scrubbed', v)), `attr_str_11`)
WHERE organization_id IN [{organization_ids}]
AND _sort_timestamp >= toDateTime('{start_datetime}')
AND _sort_timestamp < toDateTime('{end_datetime}')"""
Expand Down
12 changes: 6 additions & 6 deletions tests/manual_jobs/test_scrub_users_from_eap_spans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_generate_query() -> None:
job._get_query(None)
== """ALTER TABLE eap_spans_2_local

UPDATE `attr_str_2` = mapApply((k, v) -> (k, if(k = 'user' AND startsWith(v, 'ip:') AND (isIPv4String(substring(v, 4)) OR isIPv6String(substring(v, 4))), 'ip:scrubbed', v)), `attr_str_2`)
UPDATE `attr_str_11` = mapApply((k, v) -> (k, if(k = 'sentry.user' AND startsWith(v, 'ip:') AND (isIPv4String(substring(v, 4)) OR isIPv6String(substring(v, 4))), 'ip:scrubbed', v)), `attr_str_11`)
WHERE organization_id IN [1,3,5,6]
AND _sort_timestamp >= toDateTime('2024-12-01T00:00:00')
AND _sort_timestamp < toDateTime('2024-12-10T00:00:00')"""
Expand Down Expand Up @@ -185,8 +185,6 @@ def _gen_message(
"relay_protocol_version": "3",
"relay_use_post_or_schedule": "True",
"relay_use_post_or_schedule_rejected": "version",
"user.ip": "192.168.0.45",
"user": user,
Comment on lines -188 to -189
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't this be inside sentry_tags?

Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/getsentry/snuba/pull/6693/files#diff-50de5cd6ba8d124ed143d89ae99a5e1c974581fb25c5969117e4b64e49fffff0L177 for user

I feel like user.ip is tested in test_scrub_user_ip_from_eap_spans alr

"spans_over_limit": "False",
"server_name": "blah",
"color": random.choice(["red", "green", "blue"]),
Expand Down Expand Up @@ -219,11 +217,13 @@ def _generate_request(
key=AttributeKey(type=AttributeKey.TYPE_STRING, name="color")
)
),
columns=[Column(key=AttributeKey(type=AttributeKey.TYPE_STRING, name="user"))],
columns=[
Column(key=AttributeKey(type=AttributeKey.TYPE_STRING, name="sentry.user"))
],
order_by=[
TraceItemTableRequest.OrderBy(
column=Column(
key=AttributeKey(type=AttributeKey.TYPE_STRING, name="user")
key=AttributeKey(type=AttributeKey.TYPE_STRING, name="sentry.user")
)
)
],
Expand All @@ -234,7 +234,7 @@ def _generate_expected_response(user: str) -> TraceItemTableResponse:
return TraceItemTableResponse(
column_values=[
TraceItemColumnValues(
attribute_name="user",
attribute_name="sentry.user",
results=[AttributeValue(val_str=user) for _ in range(20)],
)
],
Expand Down
Loading