Skip to content

feat(perf-issues): Replace sentence keys with snake case in backend #47830

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

Merged
narsaynorath merged 5 commits into from
Apr 27, 2023
Merged

feat(perf-issues): Replace sentence keys with snake case in backend #47830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
304f041
Change Encoded Body Size -> encoded_body_size
narsaynorath Apr 24, 2023
cc8bbcc
Decoded Body Size -> decoded_body_size
narsaynorath Apr 24, 2023
87c7743
Transfer Size -> transfer_size
narsaynorath Apr 24, 2023
4029586
Update to new keys
narsaynorath Apr 26, 2023
8a0f0be
Merge branch 'master' into nar/feat/performance-issues-replace-senten…
narsaynorath Apr 26, 2023
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
8 changes: 4 additions & 4 deletions bin/load-mocks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,9 +1054,9 @@ def create_mock_transactions(
"span_id": uuid4().hex[:16],
"hash": "858fea692d4d93e9",
"data": {
"Transfer Size": 1_000_000,
"Encoded Body Size": 1_000_000,
"Decoded Body Size": 1_000_000,
"http.transfer_size": 1_000_000,
"http.response_content_length": 1_000_000,
"http.decoded_response_content_length": 1_000_000,
},
},
]
Expand Down Expand Up @@ -1147,7 +1147,7 @@ def create_mock_transactions(
"parent_span_id": parent_span_id,
"span_id": uuid4().hex[:16],
"hash": "858fea692d4d93e8",
"data": {"Encoded Body Size": 1000001},
"data": {"http.response_content_length": 1000001},
}
]

Expand Down
24 changes: 12 additions & 12 deletions fixtures/events/performance_problems/consecutive-http/consecutive-http-basic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,9 +1381,9 @@
"parent_span_id": "90747d4310a2a358",
"trace_id": "dfbb4f07016a450791bf09d308d66af4",
"data": {
"Decoded Body Size": 2573190,
"Encoded Body Size": 527961,
"Transfer Size": 528261,
"http.decoded_response_content_length": 2573190,
"http.response_content_length": 527961,
"http.transfer_size": 528261,
"resource.render_blocking_status": "non-blocking"
},
"hash": "032ded07ff89c3b4"
Expand Down Expand Up @@ -1431,9 +1431,9 @@
"parent_span_id": "90747d4310a2a358",
"trace_id": "dfbb4f07016a450791bf09d308d66af4",
"data": {
"Decoded Body Size": 3870,
"Encoded Body Size": 3461,
"Transfer Size": 3761,
"http.decoded_response_content_length": 3870,
"http.response_content_length": 3461,
"http.transfer_size": 3761,
"resource.render_blocking_status": "non-blocking"
},
"hash": "35a63c8a85b1279a"
Expand All @@ -1448,9 +1448,9 @@
"parent_span_id": "90747d4310a2a358",
"trace_id": "dfbb4f07016a450791bf09d308d66af4",
"data": {
"Decoded Body Size": 492,
"Encoded Body Size": 492,
"Transfer Size": 792,
"http.decoded_response_content_length": 492,
"http.response_content_length": 492,
"http.transfer_size": 792,
"resource.render_blocking_status": "non-blocking"
},
"hash": "a2a63063e1bd6ed2"
Expand All @@ -1465,9 +1465,9 @@
"parent_span_id": "90747d4310a2a358",
"trace_id": "dfbb4f07016a450791bf09d308d66af4",
"data": {
"Decoded Body Size": 5347,
"Encoded Body Size": 5347,
"Transfer Size": 5647,
"http.decoded_response_content_length": 5347,
"http.response_content_length": 5347,
"http.transfer_size": 5647,
"resource.render_blocking_status": "non-blocking"
},
"hash": "03cf160ff9190e10"
Expand Down
12 changes: 6 additions & 6 deletions fixtures/events/performance_problems/uncompressed-assets/uncompressed-script-asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"parent_span_id": "a0c39078d1570b00",
"trace_id": "0102834d0bf74d388ce0b1e15329f731",
"data": {
"Decoded Body Size": 3,
"Encoded Body Size": 2,
"Transfer Size": 3
"http.decoded_response_content_length": 3,
"http.response_content_length": 2,
"http.transfer_size": 3
},
"hash": "b2978b51d54d9078"
},
Expand All @@ -70,9 +70,9 @@
"parent_span_id": "a0c39078d1570b00",
"trace_id": "0102834d0bf74d388ce0b1e15329f731",
"data": {
"Decoded Body Size": 571733,
"Encoded Body Size": 571733,
"Transfer Size": 571833
"http.decoded_response_content_length": 571733,
"http.response_content_length": 571733,
"http.transfer_size": 571833
},
"hash": "a2978b51d54d9079"
}
Expand Down
54 changes: 27 additions & 27 deletions src/sentry/data/samples/react-transaction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1912,9 +1912,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 1434,
"Encoded Body Size": 377,
"Transfer Size": 873,
"http.decoded_response_content_length": 1434,
"http.response_content_length": 377,
"http.transfer_size": 873,
"duration": 0.19784391574400753,
"offset": 1.987476914226067
}
Expand All @@ -1928,9 +1928,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 2834,
"Encoded Body Size": 1031,
"Transfer Size": 1181,
"http.decoded_response_content_length": 2834,
"http.response_content_length": 1031,
"http.transfer_size": 1181,
"duration": 0.03448497280930315,
"offset": 2.185320829970075
}
Expand All @@ -1944,9 +1944,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 393615,
"Encoded Body Size": 104822,
"Transfer Size": 105241,
"http.decoded_response_content_length": 393615,
"http.response_content_length": 104822,
"http.transfer_size": 105241,
"duration": 0.06483037331022606,
"offset": 2.219805802779378
}
Expand All @@ -1973,9 +1973,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 14900,
"Encoded Body Size": 14900,
"Transfer Size": 15249,
"http.decoded_response_content_length": 14900,
"http.response_content_length": 14900,
"http.transfer_size": 15249,
"duration": 0.07117168916452873,
"offset": 2.3922796225243945
}
Expand All @@ -1989,9 +1989,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 14904,
"Encoded Body Size": 14904,
"Transfer Size": 15018,
"http.decoded_response_content_length": 14904,
"http.response_content_length": 14904,
"http.transfer_size": 15018,
"duration": 0.01938506940816541,
"offset": 2.463451311688923
}
Expand Down Expand Up @@ -2031,9 +2031,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 24838,
"Encoded Body Size": 3719,
"Transfer Size": 4007,
"http.decoded_response_content_length": 24838,
"http.response_content_length": 3719,
"http.transfer_size": 4007,
"duration": 0.13824814691353782,
"offset": 2.7785280575866445
}
Expand All @@ -2047,9 +2047,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 0,
"Encoded Body Size": 0,
"Transfer Size": 0,
"http.decoded_response_content_length": 0,
"http.response_content_length": 0,
"http.transfer_size": 0,
"duration": 0.029537339013289896,
"offset": 2.916776204500182
}
Expand All @@ -2063,9 +2063,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 0,
"Encoded Body Size": 0,
"Transfer Size": 0,
"http.decoded_response_content_length": 0,
"http.response_content_length": 0,
"http.transfer_size": 0,
"duration": 0.19305941897035148,
"offset": 2.946313543513472
}
Expand All @@ -2079,9 +2079,9 @@
"parent_span_id": "a7afa33e288a45c4",
"trace_id": "7eaab1c04557466d8588ddcb6bdd511d",
"data": {
"Decoded Body Size": 0,
"Encoded Body Size": 0,
"Transfer Size": 0,
"http.decoded_response_content_length": 0,
"http.response_content_length": 0,
"http.transfer_size": 0,
"duration": 0.8028300824075338,
"offset": 3.1393729624838236
}
Expand Down
40 changes: 20 additions & 20 deletions src/sentry/data/samples/transaction-n-plus-one-api-call.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,9 @@
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {
"Decoded Body Size": 48521,
"Encoded Body Size": 9251,
"Transfer Size": 9551
"http.decoded_response_content_length": 48521,
"http.response_content_length": 9251,
"http.transfer_size": 9551
},
"hash": "1f1dd0897c16565b"
},
Expand All @@ -707,9 +707,9 @@
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {
"Decoded Body Size": 4529244,
"Encoded Body Size": 1103151,
"Transfer Size": 1103451
"http.decoded_response_content_length": 4529244,
"http.response_content_length": 1103151,
"http.transfer_size": 1103451
},
"hash": "1f058070477778b8"
},
Expand All @@ -723,9 +723,9 @@
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {
"Decoded Body Size": 166604,
"Encoded Body Size": 49443,
"Transfer Size": 49743
"http.decoded_response_content_length": 166604,
"http.response_content_length": 49443,
"http.transfer_size": 49743
},
"hash": "254c644cff8b3e09"
},
Expand All @@ -739,9 +739,9 @@
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {
"Decoded Body Size": 1980965,
"Encoded Body Size": 507607,
"Transfer Size": 507907
"http.decoded_response_content_length": 1980965,
"http.response_content_length": 507607,
"http.transfer_size": 507907
},
"hash": "779ec19f50f1ea39"
},
Expand All @@ -754,7 +754,7 @@
"span_id": "9d5b3c332aec7802",
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {"Decoded Body Size": 296, "Encoded Body Size": 296, "Transfer Size": 596},
"data": {"http.decoded_response_content_length": 296, "http.response_content_length": 296, "http.transfer_size": 596},
"hash": "4f2043f50fc2f515"
},
{
Expand All @@ -766,7 +766,7 @@
"span_id": "a92f3520fc053460",
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {"Decoded Body Size": 76, "Encoded Body Size": 76, "Transfer Size": 376},
"data": {"http.decoded_response_content_length": 76, "http.response_content_length": 76, "http.transfer_size": 376},
"hash": "26d97630b7867f3e"
},
{
Expand All @@ -779,9 +779,9 @@
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {
"Decoded Body Size": 78104,
"Encoded Body Size": 24604,
"Transfer Size": 24904
"http.decoded_response_content_length": 78104,
"http.response_content_length": 24604,
"http.transfer_size": 24904
},
"hash": "b7d184affa2b21b2"
},
Expand All @@ -806,9 +806,9 @@
"parent_span_id": "829d17842d952371",
"trace_id": "80972418b74940bda6977932055f7fcd",
"data": {
"Decoded Body Size": 25931,
"Encoded Body Size": 9296,
"Transfer Size": 300
"http.decoded_response_content_length": 25931,
"http.response_content_length": 9296,
"http.transfer_size": 300
},
"hash": "35a63c8a85b1279a"
},
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/data/samples/transaction-render-blocking-asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"parent_span_id": "d333ac34048040f7",
"trace_id": "af6cd4ed98d1459a9d496071342ab3e7",
"data": {
"Encoded Body Size": 1000001,
"http.response_content_length": 1000001,
"duration": 1
},
"hash": "a8b09954a220aea9"
Expand Down
4 changes: 3 additions & 1 deletion src/sentry/utils/performance_issues/detectors/large_payload_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def visit_span(self, span: Span) -> None:
return

data = span.get("data", None)
encoded_body_size = data and data.get("Encoded Body Size", None)
encoded_body_size = data and (
data.get("http.response_content_length", None) or data.get("Encoded Body Size")
)
if not (encoded_body_size):
return

Expand Down
6 changes: 5 additions & 1 deletion src/sentry/utils/performance_issues/detectors/render_blocking_asset_span_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ def _is_blocking_render(self, span):
return False

minimum_size_bytes = self.settings.get("minimum_size_bytes")
encoded_body_size = data and data.get("Encoded Body Size", 0) or 0
encoded_body_size = (
data
and (data.get("http.response_content_length", 0) or data.get("Encoded Body Size", 0))
or 0
)
if encoded_body_size < minimum_size_bytes or encoded_body_size > self.MAX_SIZE_BYTES:
return False

Expand Down
13 changes: 10 additions & 3 deletions src/sentry/utils/performance_issues/detectors/uncompressed_asset_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,16 @@ def visit_span(self, span: Span) -> None:
return

data = span.get("data", None)
transfer_size = data and data.get("Transfer Size", None)
encoded_body_size = data and data.get("Encoded Body Size", None)
decoded_body_size = data and data.get("Decoded Body Size", None)
transfer_size = data and (
data.get("http.transfer_size", None) or data.get("Transfer Size", None)
)
encoded_body_size = data and (
data.get("http.response_content_length", None) or data.get("Encoded Body Size", None)
)
decoded_body_size = data and (
data.get("http.decoded_response_content_length", None)
or data.get("Decoded Body Size", None)
)
if not (encoded_body_size and decoded_body_size and transfer_size):
return

Expand Down
12 changes: 6 additions & 6 deletions tests/sentry/utils/performance_issues/test_large_http_payload_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def test_detects_large_http_payload_issue(self):
"GET /api/0/organizations/endpoint1",
"hash1",
data={
"Transfer Size": 50_000_000,
"Encoded Body Size": 50_000_000,
"Decoded Body Size": 50_000_000,
"http.transfer_size": 50_000_000,
"http.response_content_length": 50_000_000,
"http.decoded_response_content_length": 50_000_000,
},
)
]
Expand Down Expand Up @@ -70,9 +70,9 @@ def test_does_not_issue_if_url_is_an_asset(self):
desc="https://s1.sentry-cdn.com/_static/dist/sentry/entrypoints/app.js",
duration=1000.0,
data={
"Transfer Size": 50_000_000,
"Encoded Body Size": 50_000_000,
"Decoded Body Size": 50_000_000,
"http.transfer_size": 50_000_000,
"http.response_content_length": 50_000_000,
"http.decoded_response_content_length": 50_000_000,
},
)
]
Expand Down
Loading