fix: dedupe aliases before final request #104900

shruthilayaj · 2025-12-12T22:41:44Z

The preflight was returning duplicated tag key names (we store the same
attribute key in different format in EAP). Dedupe it before making the
second request.

src/sentry/api/endpoints/organization_trace_item_stats.py

+        data = self.data_fn(offset=offset, limit=limit)
        has_more = data[1] >= limit + 1


cursor · 2025-12-12T22:43:43Z

src/sentry/api/endpoints/organization_trace_item_stats.py

        # Request 1 more than limit so we can tell if there is another page
-        data = self.data_fn(offset=offset, limit=limit + 1)
+        data = self.data_fn(offset=offset, limit=limit)
        has_more = data[1] >= limit + 1


Bug: Pagination never detects next page after limit change

The pagination has_more check is broken. Previously data_fn was called with limit + 1 to detect if more results exist, but now it's called with just limit. However, the has_more condition still checks if data[1] >= limit + 1. Since data_fn returns len(request_attrs_list) which is at most limit (due to the slice [offset : offset + limit]), this condition will never be true. As a result, pagination will never show a "next page" link even when more results exist.

cursor · 2025-12-12T22:43:43Z

src/sentry/api/endpoints/organization_trace_item_stats.py

        # Request 1 more than limit so we can tell if there is another page
-        data = self.data_fn(offset=offset, limit=limit + 1)
+        data = self.data_fn(offset=offset, limit=limit)
        has_more = data[1] >= limit + 1


Bug: Pagination never detects next page after limit change

The pagination has_more check is broken. Previously data_fn was called with limit + 1 to detect if more results exist, but now it's called with just limit. However, the has_more condition still checks if data[1] >= limit + 1. Since data_fn returns len(request_attrs_list) which is at most limit (due to the slice [offset : offset + limit]), this condition will never be true. As a result, pagination will never show a "next page" link even when more results exist.

src/sentry/api/endpoints/organization_trace_item_stats.py

codecov · 2025-12-12T23:00:23Z

❌ 2 Tests Failed:

Tests completed	Failed	Passed	Skipped
30553	2	30551	242

View the top 2 failed test(s) by shortest run time

tests.snuba.api.endpoints.test_organization_trace_item_stats.OrganizationTraceItemsStatsEndpointTest::test_custom_limit_parameter

Stack Traces | 15.9s run time

#x1B[1m#x1B[.../api/endpoints/test_organization_trace_item_stats.py#x1B[0m:235: in test_custom_limit_parameter
    assert (
#x1B[1m#x1B[31mE   AssertionError: assert 1 == 2#x1B[0m
#x1B[1m#x1B[31mE    +  where 1 = len({'sentry.custom3': [{'label': 'value3', 'value': 1.0}]})#x1B[0m

tests.snuba.api.endpoints.test_organization_trace_item_stats.OrganizationTraceItemsStatsEndpointTest::test_substring_match_returns_known_public_aliases

Stack Traces | 18.5s run time

#x1B[1m#x1B[.../api/endpoints/test_organization_trace_item_stats.py#x1B[0m:145: in test_substring_match_returns_known_public_aliases
    assert len(response.data["data"]) == 1
#x1B[1m#x1B[31mE   assert 0 == 1#x1B[0m
#x1B[1m#x1B[31mE    +  where 0 = len([])#x1B[0m

To view more test analytics, go to the Test Analytics Dashboard
_{📋 Got 3 mins? Take this short survey to help us improve Test Analytics.}

getsantry · 2026-01-03T08:03:43Z

This pull request has gone three weeks without activity. In another week, I will close it.

But! If you comment or otherwise update it, I will reset the clock, and if you add the label WIP, I will leave it alone unless WIP is removed ... forever!

"A weed is but an unloved flower." ― Ella Wheeler Wilcox 🥀

src/sentry/api/endpoints/organization_trace_item_stats.py

+                sanitized_keys.add(internal_name)

-            sanitized_keys = sanitized_keys[offset : offset + limit]
+            sanitized_keys = list(sanitized_keys)[offset : offset + limit]


src/sentry/api/endpoints/organization_trace_item_stats.py

-                if key in SPANS_STATS_EXCLUDED_ATTRIBUTES_PUBLIC_ALIAS:
+            sanitized_keys = set()
+            for internal_name in internal_alias_attr_keys:
+                if internal_name in SPANS_STATS_EXCLUDED_ATTRIBUTES_PUBLIC_ALIAS:


src/sentry/api/endpoints/organization_trace_item_stats.py

-            for key in attr_keys:
-                if key in SPANS_STATS_EXCLUDED_ATTRIBUTES_PUBLIC_ALIAS:
+            for internal_name in internal_alias_attr_keys:
+                if internal_name in sanitized_keys_set:


cursor · 2026-01-07T17:15:10Z

src/sentry/api/endpoints/organization_trace_item_stats.py


-                sanitized_keys.append(key)
+                sanitized_keys_set.add(internal_name)
+                sanitized_keys.append(internal_name)


Deduplication tracks internal names instead of public aliases

Medium Severity

The deduplication logic adds internal_name to sanitized_keys_set and checks against it, but internal_alias_attr_keys comes from dictionary keys which are already unique. The PR's goal is to deduplicate when different internal names map to the same public_alias, but the set tracks internal_name instead of public_alias. This means multiple internal names mapping to the same public alias will all be included, defeating the deduplication purpose.

fix: dedupe aliases before final request

79d2f78

shruthilayaj requested a review from a team as a code owner December 12, 2025 22:41

github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Dec 12, 2025

vercel bot deployed to Preview December 12, 2025 22:43 View deployment

sentry bot reviewed Dec 12, 2025

View reviewed changes

src/sentry/api/endpoints/organization_trace_item_stats.py Outdated

Comment on lines 56 to 57

data = self.data_fn(offset=offset, limit=limit)

has_more = data[1] >= limit + 1

This comment was marked as outdated.

Sign in to view

cursor bot reviewed Dec 12, 2025

View reviewed changes

Abdkhan14 approved these changes Dec 12, 2025

View reviewed changes

getsantry bot added the Stale label Jan 3, 2026

Merge branch 'master' into shruthi/dedupe-aliases-before-request

6b67de2

vercel bot deployed to Preview January 7, 2026 15:09 View deployment

sentry bot reviewed Jan 7, 2026

View reviewed changes

src/sentry/api/endpoints/organization_trace_item_stats.py Outdated

sanitized_keys.add(internal_name)

sanitized_keys = sanitized_keys[offset : offset + limit]

sanitized_keys = list(sanitized_keys)[offset : offset + limit]

This comment was marked as outdated.

Sign in to view

cursor bot reviewed Jan 7, 2026

View reviewed changes

src/sentry/api/endpoints/organization_trace_item_stats.py Outdated Show resolved Hide resolved

fix failing tests

f856aee

shruthilayaj requested a review from a team as a code owner January 7, 2026 16:15

vercel bot deployed to Preview January 7, 2026 16:18 View deployment

sentry bot reviewed Jan 7, 2026

View reviewed changes

shruthilayaj added 2 commits January 7, 2026 11:20

track presence and final list separately

42f279b

continue to exclude high cardinality fields

80ac2fc

vercel bot deployed to Preview January 7, 2026 16:25 View deployment

typing

fd34720

vercel bot deployed to Preview January 7, 2026 17:10 View deployment

sentry bot reviewed Jan 7, 2026

View reviewed changes

src/sentry/api/endpoints/organization_trace_item_stats.py Outdated

for key in attr_keys:

if key in SPANS_STATS_EXCLUDED_ATTRIBUTES_PUBLIC_ALIAS:

for internal_name in internal_alias_attr_keys:

if internal_name in sanitized_keys_set:

This comment was marked as outdated.

Sign in to view

cursor bot reviewed Jan 7, 2026

View reviewed changes

keys are unique

fb1f37e

vercel bot deployed to Preview January 7, 2026 17:27 View deployment

shruthilayaj merged commit af904ec into master Jan 7, 2026
65 checks passed

shruthilayaj deleted the shruthi/dedupe-aliases-before-request branch January 7, 2026 18:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix: dedupe aliases before final request #104900

fix: dedupe aliases before final request #104900

shruthilayaj commented Dec 12, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

cursor bot Dec 12, 2025

Uh oh!

cursor bot Dec 12, 2025

Uh oh!

Uh oh!

codecov bot commented Dec 12, 2025 •

edited

Loading

Uh oh!

getsantry bot commented Jan 3, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

cursor bot Jan 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		data = self.data_fn(offset=offset, limit=limit)
		has_more = data[1] >= limit + 1

Uh oh!

fix: dedupe aliases before final request #104900

fix: dedupe aliases before final request #104900

Conversation

shruthilayaj commented Dec 12, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

cursor bot Dec 12, 2025

Choose a reason for hiding this comment

Bug: Pagination never detects next page after limit change

Uh oh!

cursor bot Dec 12, 2025

Choose a reason for hiding this comment

Bug: Pagination never detects next page after limit change

Uh oh!

Uh oh!

codecov bot commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ 2 Tests Failed:

Uh oh!

getsantry bot commented Jan 3, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

cursor bot Jan 7, 2026

Choose a reason for hiding this comment

Deduplication tracks internal names instead of public aliases

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Dec 12, 2025 •

edited

Loading