Skip to content

Commit a302ac0

Browse files
HazATHazAT
authored
Revert "feat: Use new AM SDK API (#19041)" (#19059)
This reverts commit ffb8518.
1 parent ffb8518 commit a302ac0

File tree

4 files changed

+104
-90
lines changed

4 files changed

+104
-90
lines changed

‎build-utils/sentry-instrumentation.js

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SentryInstrumentation {
2424

2525
this.initialBuild = false;
2626
this.Sentry = require('@sentry/node');
27-
require('@sentry/apm'); // This is required to patch Sentry
27+
require('@sentry/apm');
2828

2929
this.Sentry.init({
3030
dsn: 'https://[email protected]/2053674',
@@ -46,6 +46,16 @@ class SentryInstrumentation {
4646
);
4747
}
4848

49+
/**
50+
* Waits for Sentry SDK to finish requests
51+
*/
52+
async sdkFinish() {
53+
const client = this.Sentry.getCurrentHub().getClient();
54+
if (client) {
55+
await client.flush();
56+
}
57+
}
58+
4959
/**
5060
* Measures the file sizes of assets emitted from the entrypoints
5161
*/
@@ -60,22 +70,20 @@ class SentryInstrumentation {
6070
const asset = compilation.assets[assetName];
6171
const sizeInKb = asset.size() / 1024;
6272

63-
// can also be written as this.Sentry.startTransaction
6473
const transaction = hub.startSpan({
6574
op: 'webpack-asset',
66-
name: assetName,
75+
transaction: assetName,
6776
description: `webpack bundle size for ${entrypointName} -> ${assetName}`,
6877
data: {
6978
entrypointName,
7079
file: assetName,
7180
size: `${Math.round(sizeInKb)} KB`,
7281
},
73-
trimEnd: true,
7482
});
7583

7684
const start = transaction.startTimestamp;
7785

78-
const span = transaction.startChild({
86+
const span = hub.startSpan({
7987
op: 'asset',
8088
startTimestamp: start,
8189
description: assetName,
@@ -85,8 +93,10 @@ class SentryInstrumentation {
8593
size: `${Math.round(sizeInKb)} KB`,
8694
},
8795
});
88-
span.finish(start + sizeInKb / 1000);
89-
transaction.finish();
96+
span.startTimestamp = start;
97+
span.finish();
98+
span.timestamp = start + sizeInKb / 1000;
99+
transaction.finish(true);
90100
})
91101
)
92102
);
@@ -96,18 +106,20 @@ class SentryInstrumentation {
96106
if (!this.Sentry) {
97107
return;
98108
}
109+
99110
const hub = this.Sentry.getCurrentHub();
100111

101-
// can also be written as this.Sentry.startTransaction
102-
const transaction = hub.startSpan({
103-
op: 'webpack-build',
104-
name: !this.initialBuild ? 'initial-build' : 'incremental-build',
105-
description: 'webpack build times',
106-
startTimestamp: startTime,
107-
trimEnd: true,
108-
});
112+
const transaction = hub.startSpan(
113+
{
114+
op: 'webpack-build',
115+
transaction: !this.initialBuild ? 'initial-build' : 'incremental-build',
116+
description: 'webpack build times',
117+
},
118+
true
119+
);
120+
transaction.startTimestamp = startTime;
109121

110-
const span = transaction.startChild({
122+
const span = transaction.child({
111123
op: 'build',
112124
description: 'webpack build',
113125
data: {
@@ -119,10 +131,12 @@ class SentryInstrumentation {
119131
: 'N/A',
120132
loadavg: os.loadavg(),
121133
},
122-
startTimestamp: startTime,
123134
});
124-
span.finish(endTime);
125-
transaction.finish();
135+
span.startTimestamp = startTime;
136+
span.finish();
137+
span.timestamp = endTime;
138+
139+
transaction.finish(true);
126140
}
127141

128142
apply(compiler) {
@@ -142,7 +156,7 @@ class SentryInstrumentation {
142156
}
143157

144158
this.initialBuild = true;
145-
await this.Sentry.flush();
159+
await this.sdkFinish();
146160
done();
147161
}
148162
);

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"@emotion/babel-preset-css-prop": "^10.0.27",
2121
"@emotion/core": "^10.0.27",
2222
"@emotion/styled": "^10.0.27",
23-
"@sentry/apm": "5.16.0-beta.4",
24-
"@sentry/browser": "5.16.0-beta.4",
25-
"@sentry/integrations": "5.16.0-beta.4",
23+
"@sentry/apm": "5.16.0-beta.3",
24+
"@sentry/browser": "5.16.0-beta.3",
25+
"@sentry/integrations": "5.16.0-beta.3",
2626
"@sentry/release-parser": "^0.5.0",
2727
"@sentry/rrweb": "^0.1.1",
28-
"@sentry/utils": "5.16.0-beta.4",
28+
"@sentry/utils": "5.16.0-beta.3",
2929
"@types/classnames": "^2.2.0",
3030
"@types/clipboard": "^2.0.1",
3131
"@types/color": "^3.0.0",
@@ -133,7 +133,7 @@
133133
"devDependencies": {
134134
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
135135
"@pmmmwh/react-refresh-webpack-plugin": "^0.3.1",
136-
"@sentry/node": "^5.16.0-beta.4",
136+
"@sentry/node": "^5.16.0-beta.3",
137137
"@storybook/addon-a11y": "^5.3.3",
138138
"@storybook/addon-actions": "^5.3.3",
139139
"@storybook/addon-docs": "^5.3.3",

‎src/sentry/static/sentry/app/bootstrap.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ Sentry.init({
8686
...window.__SENTRY__OPTIONS,
8787
integrations: getSentryIntegrations(hasReplays),
8888
tracesSampleRate,
89-
});
90-
91-
Sentry.addGlobalEventProcessor(async event => {
92-
return normalizeTransactionName(appRoutes, event);
89+
_experiments: {useEnvelope: true},
90+
async beforeSend(event) {
91+
return normalizeTransactionName(appRoutes, event);
92+
},
9393
});
9494

9595
if (window.__SENTRY__USER) {

‎yarn.lock

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,76 +1823,76 @@
18231823
react-lifecycles-compat "^3.0.4"
18241824
warning "^3.0.0"
18251825

1826-
"@sentry/[email protected].4":
1827-
version "5.16.0-beta.4"
1828-
resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.16.0-beta.4.tgz#285cc056668a7881e930ccb1197a8968ace659c4"
1829-
integrity sha512-hojFb1fxZIVpLbwsuDD1BdWEj1Ax33KBFohZ3kQ14Q5LeGIzMfbKNFlCrtNv+I6+Fe83y22shMXVWVssrIflcw==
1830-
dependencies:
1831-
"@sentry/browser" "5.16.0-beta.4"
1832-
"@sentry/hub" "5.16.0-beta.4"
1833-
"@sentry/minimal" "5.16.0-beta.4"
1834-
"@sentry/types" "5.16.0-beta.4"
1835-
"@sentry/utils" "5.16.0-beta.4"
1826+
"@sentry/[email protected].3":
1827+
version "5.16.0-beta.3"
1828+
resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.16.0-beta.3.tgz#e241cbd9a308e301a681c086e1096b47c04d225a"
1829+
integrity sha512-3PmDRh9Hsj+Wfnq5+eWq/RA7CvExlWHCEK2AJZ5pG1WjvWuQ9nj8MXiVNoIA7t2WGujCcEFoDJuUofsMTekdWA==
1830+
dependencies:
1831+
"@sentry/browser" "5.16.0-beta.3"
1832+
"@sentry/hub" "5.16.0-beta.3"
1833+
"@sentry/minimal" "5.16.0-beta.3"
1834+
"@sentry/types" "5.16.0-beta.3"
1835+
"@sentry/utils" "5.16.0-beta.3"
18361836
tslib "^1.9.3"
18371837

1838-
"@sentry/[email protected].4":
1839-
version "5.16.0-beta.4"
1840-
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.16.0-beta.4.tgz#6bdedeb7333de00f1641d7cb67992522c950a15b"
1841-
integrity sha512-aaSJOj32N8mG+mypMCjFv5wyaPbjx+VLt2z/QOiBpnC3WbV1lRUR0trvUIqq55L4CkcLXB8+6PBG2fS39+MpbA==
1838+
"@sentry/[email protected].3":
1839+
version "5.16.0-beta.3"
1840+
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.16.0-beta.3.tgz#176a0ed01e567c6c0fb59248801b9dcff97e3836"
1841+
integrity sha512-mHTrXBSRA9oCG9VukyrB2U6xiqQ2yK5oDsWdt1HDB8ApwOSdOZPfV5TbgfvNa6hEIbLhjbFC0AyQcRgkANveDg==
18421842
dependencies:
1843-
"@sentry/core" "5.16.0-beta.4"
1844-
"@sentry/types" "5.16.0-beta.4"
1845-
"@sentry/utils" "5.16.0-beta.4"
1843+
"@sentry/core" "5.16.0-beta.3"
1844+
"@sentry/types" "5.16.0-beta.3"
1845+
"@sentry/utils" "5.16.0-beta.3"
18461846
tslib "^1.9.3"
18471847

1848-
"@sentry/[email protected].4":
1849-
version "5.16.0-beta.4"
1850-
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.16.0-beta.4.tgz#680163ab88c02f1bbb532ac4bfd58e2ec16b6016"
1851-
integrity sha512-yhufues9ahGZi7lmB+C5EkORwmxcGXovaFVPvZxr7YgtT9xHwKB1SV0GnP14sQIs0VbiufWNVvHWtUQVN/fIwg==
1848+
"@sentry/[email protected].3":
1849+
version "5.16.0-beta.3"
1850+
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.16.0-beta.3.tgz#b2a60fb8a81c19f5321a9e3bb17d372aaed74a46"
1851+
integrity sha512-9owqHefHt2dv+2bxcic9inneOrji9El9PqkwbRNxIcsduO6+Tu6nFJokBlxUZFi1eKpuAoOjjp0loaYvStKfNw==
18521852
dependencies:
1853-
"@sentry/hub" "5.16.0-beta.4"
1854-
"@sentry/minimal" "5.16.0-beta.4"
1855-
"@sentry/types" "5.16.0-beta.4"
1856-
"@sentry/utils" "5.16.0-beta.4"
1853+
"@sentry/hub" "5.16.0-beta.3"
1854+
"@sentry/minimal" "5.16.0-beta.3"
1855+
"@sentry/types" "5.16.0-beta.3"
1856+
"@sentry/utils" "5.16.0-beta.3"
18571857
tslib "^1.9.3"
18581858

1859-
"@sentry/[email protected].4":
1860-
version "5.16.0-beta.4"
1861-
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.16.0-beta.4.tgz#ac436b901a6bd930973ee99df48ab2c6820784f6"
1862-
integrity sha512-QSbYdgr2mE/slPxL9JeXHtmWIybUbpQNlTiWt6gaQyc8H+DsKYzT19AwH32U/4+Z6HC9yk8H0UGpb4HewV1BFw==
1859+
"@sentry/[email protected].3":
1860+
version "5.16.0-beta.3"
1861+
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.16.0-beta.3.tgz#51c72daa459215654291f38cbdc7e8eb410cfd72"
1862+
integrity sha512-yGNnz4nafrjkk6XMDhpAcLwWUGPMShZKOOvYLrBa02Y7mOh+3mBcUaZmGnVA+X1M8idwE72LE1WRkJzBv6t9QA==
18631863
dependencies:
1864-
"@sentry/types" "5.16.0-beta.4"
1865-
"@sentry/utils" "5.16.0-beta.4"
1864+
"@sentry/types" "5.16.0-beta.3"
1865+
"@sentry/utils" "5.16.0-beta.3"
18661866
tslib "^1.9.3"
18671867

1868-
"@sentry/[email protected].4":
1869-
version "5.16.0-beta.4"
1870-
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.16.0-beta.4.tgz#31b99c9c7465e5f76b3c3020ea02f09b476037a7"
1871-
integrity sha512-K4o4QRw93+5AH/lXLWydnCiIhvIWGRd1U6LynJ9qXdHNCCR6E/OYEMnf3t7kOIQuZzFgqrqnr938fwU/edwQeQ==
1868+
"@sentry/[email protected].3":
1869+
version "5.16.0-beta.3"
1870+
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.16.0-beta.3.tgz#8ecc5018a35b2917225c78dfdcda2d406616336d"
1871+
integrity sha512-pC4I1PKK+/FORGElPGFXT7thH3A+xqyPi4QQ8lBLkzKBNn/STvXZhx33nqLGnf6OoihZqpn9GNAGzvGpo7AR2w==
18721872
dependencies:
1873-
"@sentry/types" "5.16.0-beta.4"
1874-
"@sentry/utils" "5.16.0-beta.4"
1873+
"@sentry/types" "5.16.0-beta.3"
1874+
"@sentry/utils" "5.16.0-beta.3"
18751875
tslib "^1.9.3"
18761876

1877-
"@sentry/[email protected].4":
1878-
version "5.16.0-beta.4"
1879-
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.16.0-beta.4.tgz#cd8e067c336f5d1ef98a121852f567dc80592d5c"
1880-
integrity sha512-qcTa1OafWylxhZIRiFVkh4P69BNB7h1syAStSt00o5wnlSSk5xP8u5CORibVVQSN1KbBWljlSyrWY2xKSDXU7A==
1877+
"@sentry/[email protected].3":
1878+
version "5.16.0-beta.3"
1879+
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.16.0-beta.3.tgz#9340b21e7259f015efbfa932b6f48f42cdf72c0a"
1880+
integrity sha512-YUksBXrUp8lRwE40fsWRu6B7YJ/f1d+klyFxyc4ECDCWtByTa80SOwmvwhrApADzFa4g9v/wGXC+KTYybGb3Tg==
18811881
dependencies:
1882-
"@sentry/hub" "5.16.0-beta.4"
1883-
"@sentry/types" "5.16.0-beta.4"
1882+
"@sentry/hub" "5.16.0-beta.3"
1883+
"@sentry/types" "5.16.0-beta.3"
18841884
tslib "^1.9.3"
18851885

1886-
"@sentry/node@^5.16.0-beta.4":
1887-
version "5.16.0-beta.4"
1888-
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.16.0-beta.4.tgz#b43fbdee7336108a6b70e38230cbc94bbaabc6aa"
1889-
integrity sha512-RiFm7YEJJ5lorqKMbpz/4vUgpNH8OSEJScMNiUTZ1gtysZ5/1YR0lQv536NZkNp2IwjJMThnxKgUrcydTnf2Qg==
1886+
"@sentry/node@^5.16.0-beta.3":
1887+
version "5.16.0-beta.3"
1888+
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.16.0-beta.3.tgz#5debe9c29dd9bbaf8acce9d665b2c1d48ab11b3c"
1889+
integrity sha512-69cIGhK+0H8PpWizJhvnpbFAoAsSvqGnHUk8tr3VjchdhgVqV1fZSPijqs2VIj/2RUN3r6Hl6XVGLr7Cu1gLmg==
18901890
dependencies:
1891-
"@sentry/apm" "5.16.0-beta.4"
1892-
"@sentry/core" "5.16.0-beta.4"
1893-
"@sentry/hub" "5.16.0-beta.4"
1894-
"@sentry/types" "5.16.0-beta.4"
1895-
"@sentry/utils" "5.16.0-beta.4"
1891+
"@sentry/apm" "5.16.0-beta.3"
1892+
"@sentry/core" "5.16.0-beta.3"
1893+
"@sentry/hub" "5.16.0-beta.3"
1894+
"@sentry/types" "5.16.0-beta.3"
1895+
"@sentry/utils" "5.16.0-beta.3"
18961896
cookie "^0.3.1"
18971897
https-proxy-agent "^4.0.0"
18981898
lru_map "^0.3.3"
@@ -1908,17 +1908,17 @@
19081908
resolved "https://registry.yarnpkg.com/@sentry/rrweb/-/rrweb-0.1.1.tgz#1e2ef7381d5c5725ea3bf3ac20987d50eee83dd1"
19091909
integrity sha512-bFzZ+NVaGFpkmBvSHsvM/Pc/wiy7UeP/ICofkY2iY5PwiRHpZCX5hLrLYA7o921VR847EKZB44fQYWZC1YFB1Q==
19101910

1911-
"@sentry/[email protected].4":
1912-
version "5.16.0-beta.4"
1913-
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.16.0-beta.4.tgz#cb59d32ee6f6ea0c4b700dfe8d877f4bbfdad711"
1914-
integrity sha512-1aUBt/kmHmB06BjyXFKRg2ra/x2tt/BTUtu4zuezpX8XvtzzBdHt27sxUpDsJCgal1hVyFMer5EaGAISVbNmIg==
1911+
"@sentry/[email protected].3":
1912+
version "5.16.0-beta.3"
1913+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.16.0-beta.3.tgz#0658562166aac515977b3a979ced9af01dca153c"
1914+
integrity sha512-UfIYazvDhOV/dcfFg8OvA8mR1mcOmRE3m2F6qn2jJiQbccKUSXKsaZRXdk/Dj2c0862VFY+wSxpVgG+Vjb0frQ==
19151915

1916-
"@sentry/[email protected].4":
1917-
version "5.16.0-beta.4"
1918-
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.16.0-beta.4.tgz#6b591bec35aec79bfbf4d9a056cd3fcccdbf6448"
1919-
integrity sha512-VZ2MSqBGEng2On9GywKuntby6JM4C6J+HUVNyBTk03K2GGjkV49bTQrUvbffXRcmvHcGZDic2kXTfV5m+A/hRA==
1916+
"@sentry/[email protected].3":
1917+
version "5.16.0-beta.3"
1918+
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.16.0-beta.3.tgz#8d40d2b88e46ad97ac9356f5e627ece23dcb08b0"
1919+
integrity sha512-PXFWvC5kSvOSVPlK6xylmPcILNEjBkcBBPmWmvSR8r2he70JmeFDGHkhNP9LaLydcCBZ/eH59bCQqD1sWgTbow==
19201920
dependencies:
1921-
"@sentry/types" "5.16.0-beta.4"
1921+
"@sentry/types" "5.16.0-beta.3"
19221922
tslib "^1.9.3"
19231923

19241924
"@storybook/addon-a11y@^5.3.3":

0 commit comments

Comments
 (0)