Skip to content

fix: APM React Profiler call #17370

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
merged 4 commits into from
Feb 28, 2020
Merged

fix: APM React Profiler call #17370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4613978
fix: Call pushActivity in profiler with timeout
HazAT Feb 28, 2020
a52fd74
ref: Add code comments
HazAT Feb 28, 2020
a2ec8ec
ref: Call with options
HazAT Feb 28, 2020
5926c33
chore: Bump JS SDK deps
HazAT Feb 28, 2020
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
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"@emotion/babel-preset-css-prop": "^10.0.27",
"@emotion/core": "^10.0.27",
"@emotion/styled": "^10.0.27",
"@sentry/apm": "5.12.4",
"@sentry/browser": "5.12.4",
"@sentry/integrations": "5.12.4",
"@sentry/apm": "5.13.0",
"@sentry/browser": "5.13.0",
"@sentry/integrations": "5.13.0",
"@sentry/release-parser": "^0.4.0",
"@sentry/rrweb": "^0.1.0",
"@sentry/utils": "5.12.4",
"@sentry/utils": "5.13.0",
"@types/classnames": "^2.2.0",
"@types/clipboard": "^2.0.1",
"@types/color": "^3.0.0",
Expand Down Expand Up @@ -133,7 +133,7 @@
},
"devDependencies": {
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
"@sentry/node": "^5.12.4",
"@sentry/node": "^5.13.0",
"@storybook/addon-a11y": "^5.3.3",
"@storybook/addon-actions": "^5.3.3",
"@storybook/addon-docs": "^5.3.3",
Expand Down
18 changes: 13 additions & 5 deletions src/sentry/static/sentry/app/utils/profiler.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,19 @@ export default function profiler() {
this.finishProfile();
}

activity = Integrations.Tracing.pushActivity(displayName, {
data: {},
op: 'react',
description: `<${displayName}>`,
});
activity = Integrations.Tracing.pushActivity(
displayName,
{
data: {},
op: 'react',
description: `<${displayName}>`,
},
{
autoPopAfter: 500, // After this timeout we'll pop this activity regardless
Copy link
Member

@dashed dashed Feb 28, 2020

Choose a reason for hiding this comment

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

@billyvg would this timeout be sufficient?

Copy link
Member

@billyvg billyvg Feb 28, 2020

Choose a reason for hiding this comment

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

@HazAT Does this mean if the react component is waiting for a request that takes longer than 500ms to finish before ending this span, it will automatically pop after 500ms?

Copy link
Member Author

@HazAT HazAT Mar 2, 2020

Choose a reason for hiding this comment

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

@billyvg Yes, exactly, so renders now never take longer than 500ms, and the span will be marked with the status Deadline_Exceeded.

One example when this occurred:
Sometimes when you navigation change into the project creation page in Sentry, the render activity was started but never ended, that's how we determined this "bug".
So I know this is not ideal but I had no idea how to debug why sometimes the profiler is not calling finish.

}
);
// For whatever reason it's not guaranteed that `finishProfile` will be called, that's why we need
// the previously described timeout to make sure our transaction will be finished.

finishProfile = () => {
if (!this.activity) {
Expand Down
98 changes: 49 additions & 49 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,76 +1526,76 @@
react-lifecycles-compat "^3.0.4"
warning "^3.0.0"

"@sentry/apm@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.12.4.tgz#b4b95b20766b1f8cda2e8e52a13bf62110ce7e5c"
integrity sha512-CpoGSPtZg1+9bDstnFReNQ80sgaxmacgYxoCafD++cQ61GxjM6oGl9TlTDGUwMHpFiTZHWIsswxEwD1Y1PWukw==
dependencies:
"@sentry/browser" "5.12.4"
"@sentry/hub" "5.12.4"
"@sentry/minimal" "5.12.4"
"@sentry/apm@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.13.0.tgz#ffc8ab476bb40ef92cde3d813718528564ef293a"
integrity sha512-hNYXjvjvaa/z+EGbkHyEHag4qGq9+snSRHV+C7cWvGDio01zSOdusHJDqH7S6GzJ0yRY4nbq3l6xc9STlmlthQ==
dependencies:
"@sentry/browser" "5.13.0"
"@sentry/hub" "5.13.0"
"@sentry/minimal" "5.13.0"
"@sentry/types" "5.12.4"
"@sentry/utils" "5.12.4"
"@sentry/utils" "5.13.0"
tslib "^1.9.3"

"@sentry/browser@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.12.4.tgz#6eb41ea1440161787f2312e4d2544167858c4cd7"
integrity sha512-D74LtB9sevPpYgczYsbKTcx7IdCxHPuv5JxD9YQfzNmpCzBiwlUGqr3u03SdVOwmdVrzfRLjxO+vYPe071zjbA==
"@sentry/browser@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.13.0.tgz#399b0a09d6603726d787b746bcc70659010bc50c"
integrity sha512-adiW9gG/gCrl6FQAA6Fk8osXMHxP3pYltszRK0mr55O7GcTC8RQNI3mEW/YuQV9IySUL8dFWQ0v8n0lfssHf/A==
dependencies:
"@sentry/core" "5.12.4"
"@sentry/core" "5.13.0"
"@sentry/types" "5.12.4"
"@sentry/utils" "5.12.4"
"@sentry/utils" "5.13.0"
tslib "^1.9.3"

"@sentry/core@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.12.4.tgz#d50cebe6af425be425ed5830b3b579de2b9c8251"
integrity sha512-n4ZQxqq78GhYMeY2hiP0pn9Z+/2/yNfXwxnh4o59qagD/NfUe5wj4l8cwMvzFn5I7gy0xmUp3BkJrwsZlAYfUw==
"@sentry/core@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.13.0.tgz#144beb2d48b53244774a7fd809f9b5b672920971"
integrity sha512-e0olbaHBmANO1RIBc7xynSkBZ6BsK7drycz0TawLUnx+0H3aEau3K9U2QVdbjwLNPdydcIS+UgYfTBtXfe0E+A==
dependencies:
"@sentry/hub" "5.12.4"
"@sentry/minimal" "5.12.4"
"@sentry/hub" "5.13.0"
"@sentry/minimal" "5.13.0"
"@sentry/types" "5.12.4"
"@sentry/utils" "5.12.4"
"@sentry/utils" "5.13.0"
tslib "^1.9.3"

"@sentry/hub@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.12.4.tgz#eba014c38670528fb9f48a3d71299a498795395e"
integrity sha512-x0IGqTXgjRQrrLbjkjYa2qbwSa6dFejM3F29cpwjD7yp87MVkmDy/S7LwFFsjThOzsHXsjQxmPlQB8nu4sIOXw==
"@sentry/hub@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.13.0.tgz#f48e3e4e273f40316391cd6190e22ea69cb20c7e"
integrity sha512-MeytooJ5g91zxq4/LU1LHj7KxpggAEn1dybEsWG31QVy67J4a40zIGfYgGGIVAFSv0WVlk5Ei5C159LhgW59/w==
dependencies:
"@sentry/types" "5.12.4"
"@sentry/utils" "5.12.4"
"@sentry/utils" "5.13.0"
tslib "^1.9.3"

"@sentry/integrations@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.12.4.tgz#d9dc70ea6ee84894eb2ef08809e0c1ae863537e2"
integrity sha512-44Rr+MIYSNE1uE4kbDP8gtAo1a/Fjl0fqQLNLEynxi4nNYRIQDoq4XOZK0mk2EvSua8Zlq/Uo4HKTozpnn/TXQ==
"@sentry/integrations@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.13.0.tgz#358e3225ff302353ea38214daa4a5eed1eb5d4aa"
integrity sha512-xfi3LyspqFxb2xaSKu5MMrA4kuN8waagbOjInAut48jrdqATLioMjCcUruU/aHILAUCCznPW9zsR42J1OmVoMw==
dependencies:
"@sentry/types" "5.12.4"
"@sentry/utils" "5.12.4"
"@sentry/utils" "5.13.0"
tslib "^1.9.3"

"@sentry/minimal@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.12.4.tgz#fde8ca4f6f52b49c676a66e42fc0d1ac6fad1d50"
integrity sha512-/cDkibXPIXYjboMZ4nSytJmpR/QIT1d0i9qxqlZh4vwsb2mrGdU9KxNvR6G3AXTQNybehm6TGewPo8rGz1GJQQ==
"@sentry/minimal@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.13.0.tgz#ee906191e3c2a1f7d0925fbfa0a4e96261013764"
integrity sha512-6D2Mu4TrmJmGlvb+z1Pp6yI2fUmdY1RvwK0MqmBP+QJdrd0as7cpGuwFSXgUs6CLUflDzlpn3n6WcgGV8oEDYA==
dependencies:
"@sentry/hub" "5.12.4"
"@sentry/hub" "5.13.0"
"@sentry/types" "5.12.4"
tslib "^1.9.3"

"@sentry/node@^5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.12.4.tgz#f0f88e28d0e34bc0f63a61594beb94cdd88d3e93"
integrity sha512-X8UxFt6g/MBAgy9OQL7arg2+r0l9Rr6iqDQmW+U32G50Dy3uh8i0U6zwMLUh2twNeQqsMldqXGacw2qxnOEVSQ==
"@sentry/node@^5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.13.0.tgz#3ac727ad3d585a1a1fe96dd4b6b0010b00410215"
integrity sha512-aT8mYy3hsnhueaOfPbTIMPruhnRlRNKI8tiqPE50KO9o8n1djSCf0/pxz3ErYaJOOfyFzvOL/sKtBXGLoNC+uA==
dependencies:
"@sentry/apm" "5.12.4"
"@sentry/core" "5.12.4"
"@sentry/hub" "5.12.4"
"@sentry/apm" "5.13.0"
"@sentry/core" "5.13.0"
"@sentry/hub" "5.13.0"
"@sentry/types" "5.12.4"
"@sentry/utils" "5.12.4"
"@sentry/utils" "5.13.0"
cookie "^0.3.1"
https-proxy-agent "^4.0.0"
lru_map "^0.3.3"
Expand All @@ -1616,10 +1616,10 @@
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.12.4.tgz#6e52639bc3b4e136e9a0da5385890f8f78bb7697"
integrity sha512-JoN3YIp7Z+uxUZArj2B6NcEoXFQDhd0kqO0QpfiHZyg4Dhx2/E2aHuVx0H6Fndk+60iEZSECaCBXe2MOPo4fqA==

"@sentry/utils@5.12.4":
version "5.12.4"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.12.4.tgz#f62491a90843cdd01f2ee197c11ca0a7c382c10a"
integrity sha512-7ISjK+AH676NXtW5n2/MHxEPS0Y2cpIXqJppg7ReVvCFNKHGovKmK4d5yXcP+AoEJt84in3A8D5Y3BONdpjWHQ==
"@sentry/utils@5.13.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.13.0.tgz#6463e53b6178dbbd3b90e671517cbca82744b055"
integrity sha512-BcmNQN+IfFbVWGnEwXHku69zqJc97sjBRYVxpStKMaO/4aLVIQcOJCMWxVJtVoSVAHQaigBZmFutWH7EJMRJxg==
dependencies:
"@sentry/types" "5.12.4"
tslib "^1.9.3"
Expand Down