From fc2ef23db366de9a95cd799a8431339e85fbaf27 Mon Sep 17 00:00:00 2001 From: Richard Propst Date: Thu, 17 Dec 2020 16:47:46 -0800 Subject: [PATCH 1/6] Initial config --- Makefile | 2 +- react/Makefile | 2 +- release-config.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7589128..bfa7676 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SENTRY_ORG=testorg-az -SENTRY_PROJECT=fe-react +SENTRY_PROJECT=r2r-tracing-react RELEASE=`sentry-cli releases propose-version` PREFIX=static/js diff --git a/react/Makefile b/react/Makefile index d275a1c..4e62874 100644 --- a/react/Makefile +++ b/react/Makefile @@ -2,7 +2,7 @@ # Following variable must be passed in # SENTRY_AUTH_TOKEN SENTRY_ORG=testorg-az -SENTRY_PROJECT=will-frontend-react +SENTRY_PROJECT=r2r-tracing-react RELEASE=`sentry-cli releases propose-version` PREFIX=static/js diff --git a/release-config.sh b/release-config.sh index 0ee41c7..ca93d80 100755 --- a/release-config.sh +++ b/release-config.sh @@ -19,8 +19,8 @@ RELEASE="$month.$week" echo $release # SENTRY_AUTH_TOKEN defined in shell profile -SENTRY_PROJECT1=da-react -SENTRY_PROJECT2=da-flask +SENTRY_PROJECT1=r2r-tracing-react +SENTRY_PROJECT2=r2r-tracing-flask SENTRY_ORG=testorg-az PREFIX=static/js From fd30bd4a91d87ffbb249b03facd8cd0aa4414ff5 Mon Sep 17 00:00:00 2001 From: Richard Propst Date: Thu, 21 Jan 2021 16:11:21 -0800 Subject: [PATCH 2/6] Adding RRWeb to Tracing demo --- react/package-lock.json | 154 +++++++++++++++++++++++++--------------- react/package.json | 4 +- react/src/index.js | 4 +- 3 files changed, 104 insertions(+), 58 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index ee2ba69..c45415b 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -39,59 +39,59 @@ } }, "@sentry/browser": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.27.3.tgz", - "integrity": "sha512-vczS+XTW4Nk2A7TIpAw8IVFHpp+NK6mV9euBG2I61Bs2QbQY9yKLfbjiln/yH2Q8X4THX6MKa0GuiPoCEeq3uw==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.30.0.tgz", + "integrity": "sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw==", "requires": { - "@sentry/core": "5.27.3", - "@sentry/types": "5.27.3", - "@sentry/utils": "5.27.3", + "@sentry/core": "5.30.0", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", "tslib": "^1.9.3" }, "dependencies": { "@sentry/core": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.27.3.tgz", - "integrity": "sha512-yqepQO88jSt5hy0awpk61AxI4oHB09LjVbUEk4nJDg+1YXuND23cuZvH+Sp2jCZX2vrsw2tefwflToYfA8/U2w==", - "requires": { - "@sentry/hub": "5.27.3", - "@sentry/minimal": "5.27.3", - "@sentry/types": "5.27.3", - "@sentry/utils": "5.27.3", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz", + "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==", + "requires": { + "@sentry/hub": "5.30.0", + "@sentry/minimal": "5.30.0", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", "tslib": "^1.9.3" } }, "@sentry/hub": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.27.3.tgz", - "integrity": "sha512-icEH3hr6NVQkpowXZcPOs9IgJZP5lMKtvud4mVioSpkd+NxtRdKrGEX4eF2TCviOJc9Md0mV4K+aL5Au7hxggQ==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz", + "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==", "requires": { - "@sentry/types": "5.27.3", - "@sentry/utils": "5.27.3", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", "tslib": "^1.9.3" } }, "@sentry/minimal": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.27.3.tgz", - "integrity": "sha512-ng01cM0rsE1RMjqVTpPLN0ZVkTo0I675usM1krkpQe8ddW6tfQ6EJWpt02/BrpQZRQzTtfWp6/RyB1KFXg6icg==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz", + "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==", "requires": { - "@sentry/hub": "5.27.3", - "@sentry/types": "5.27.3", + "@sentry/hub": "5.30.0", + "@sentry/types": "5.30.0", "tslib": "^1.9.3" } }, "@sentry/types": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.27.3.tgz", - "integrity": "sha512-PkWhMArFMxBb1g3HtMEL8Ea9PYae2MU0z9CMIWiqzerFy2ZpKG98IU3pt8ic4JkmKQdwB8hDiZpRPMHhW0WYwQ==" + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz", + "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==" }, "@sentry/utils": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.27.3.tgz", - "integrity": "sha512-R9WvFrRBALZvCzu/9BsuXBCfkNxz4MwdBNSXaBsJo4afQw1ljkjIc9DpHzlL9S9goIwXo81Buwmr5gGDO6aH+Q==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz", + "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==", "requires": { - "@sentry/types": "5.27.3", + "@sentry/types": "5.30.0", "tslib": "^1.9.3" } } @@ -142,54 +142,59 @@ } }, "@sentry/react": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/react/-/react-5.27.3.tgz", - "integrity": "sha512-p7E+djSUVKz02HoRVDX+zamjV8+RL4bqoPnS9JQESweB0sRTYlpvi+CqWLYWNWnamWQWOl97hOw/lLDpo4kUSA==", - "requires": { - "@sentry/browser": "5.27.3", - "@sentry/minimal": "5.27.3", - "@sentry/types": "5.27.3", - "@sentry/utils": "5.27.3", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/react/-/react-5.30.0.tgz", + "integrity": "sha512-dvn4mqCgbeEuUXEGp5P9PaW5j4GWTFUSdx/yG8f9IxNZv5zM+7otjog9ukrubFZvlxVxD/PrIxK0MhadfFY/Dw==", + "requires": { + "@sentry/browser": "5.30.0", + "@sentry/minimal": "5.30.0", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", "hoist-non-react-statics": "^3.3.2", "tslib": "^1.9.3" }, "dependencies": { "@sentry/hub": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.27.3.tgz", - "integrity": "sha512-icEH3hr6NVQkpowXZcPOs9IgJZP5lMKtvud4mVioSpkd+NxtRdKrGEX4eF2TCviOJc9Md0mV4K+aL5Au7hxggQ==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz", + "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==", "requires": { - "@sentry/types": "5.27.3", - "@sentry/utils": "5.27.3", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", "tslib": "^1.9.3" } }, "@sentry/minimal": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.27.3.tgz", - "integrity": "sha512-ng01cM0rsE1RMjqVTpPLN0ZVkTo0I675usM1krkpQe8ddW6tfQ6EJWpt02/BrpQZRQzTtfWp6/RyB1KFXg6icg==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz", + "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==", "requires": { - "@sentry/hub": "5.27.3", - "@sentry/types": "5.27.3", + "@sentry/hub": "5.30.0", + "@sentry/types": "5.30.0", "tslib": "^1.9.3" } }, "@sentry/types": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.27.3.tgz", - "integrity": "sha512-PkWhMArFMxBb1g3HtMEL8Ea9PYae2MU0z9CMIWiqzerFy2ZpKG98IU3pt8ic4JkmKQdwB8hDiZpRPMHhW0WYwQ==" + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz", + "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==" }, "@sentry/utils": { - "version": "5.27.3", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.27.3.tgz", - "integrity": "sha512-R9WvFrRBALZvCzu/9BsuXBCfkNxz4MwdBNSXaBsJo4afQw1ljkjIc9DpHzlL9S9goIwXo81Buwmr5gGDO6aH+Q==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz", + "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==", "requires": { - "@sentry/types": "5.27.3", + "@sentry/types": "5.30.0", "tslib": "^1.9.3" } } } }, + "@sentry/rrweb": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@sentry/rrweb/-/rrweb-0.2.0.tgz", + "integrity": "sha512-tNvCZ8zdoSyTu+zn81xBEf78bS7HTZvjp9gca6pVzHjemsU0yTREbEGBsvKnq23dK6wJ6VJf76z4/X4tmQPDtQ==" + }, "@sentry/tracing": { "version": "5.27.3", "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.27.3.tgz", @@ -252,6 +257,16 @@ "tslib": "^1.9.3" } }, + "@types/css-font-loading-module": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@types/css-font-loading-module/-/css-font-loading-module-0.0.4.tgz", + "integrity": "sha512-ENdXf7MW4m9HeDojB2Ukbi7lYMIuQNBHVf98dbzaiG4EEJREBd6oleVAjrLRCrp7dm6CK1mmdmU9tcgF61acbw==" + }, + "@xstate/fsm": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.5.2.tgz", + "integrity": "sha512-l2l7ztpLw/0EomJcvl86F8M6cLeMXhSEOtmI89fg34DbDMaatUKfiiAQpZpdcRqWHMjZYPAfC8EqmnHbmIlyEg==" + }, "@zeit/schemas": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.6.0.tgz", @@ -4044,6 +4059,11 @@ } } }, + "fflate": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz", + "integrity": "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==" + }, "figures": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", @@ -7203,6 +7223,11 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, + "mitt": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", + "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==" + }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -10305,6 +10330,23 @@ "inherits": "^2.0.1" } }, + "rrweb": { + "version": "0.9.14", + "resolved": "https://registry.npmjs.org/rrweb/-/rrweb-0.9.14.tgz", + "integrity": "sha512-nm2rrVNoyWFPrbGQmcvTTlA7XjbbgPIgO7qsW0Zyr5iOURIFJDGPHFmOVLRyLpWiriVtEoXh6a+x+D1sj+qwWg==", + "requires": { + "@types/css-font-loading-module": "0.0.4", + "@xstate/fsm": "^1.4.0", + "fflate": "^0.4.4", + "mitt": "^1.1.3", + "rrweb-snapshot": "^1.0.3" + } + }, + "rrweb-snapshot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/rrweb-snapshot/-/rrweb-snapshot-1.0.3.tgz", + "integrity": "sha512-trlsCGkqBaxwe7ty6QAgK0qtcueW7P3ruWyzauEW7imUQGL8WeKQTJMn8cPQOL3u4JGFl1YgvDJyNBzMoDEa8w==" + }, "run-async": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", diff --git a/react/package.json b/react/package.json index 84a5b29..f41a104 100644 --- a/react/package.json +++ b/react/package.json @@ -5,7 +5,8 @@ "dependencies": { "@sentry/apm": "^5.20.1", "@sentry/cli": "^1.37.0", - "@sentry/react": "^5.27.3", + "@sentry/react": "^5.30.0", + "@sentry/rrweb": "^0.2.0", "@sentry/tracing": "^5.27.3", "history": "^1.17.0", "material-ui": "^0.18.7", @@ -20,6 +21,7 @@ "redux": "^4.0.5", "redux-logger": "^3.0.6", "request": "^2.88.0", + "rrweb": "^0.9.14", "serve": "^10.1.1", "snapdragon": "^0.12.0", "snapdragon-node": "^3.0.0", diff --git a/react/src/index.js b/react/src/index.js index ecf081e..b40129c 100644 --- a/react/src/index.js +++ b/react/src/index.js @@ -11,6 +11,7 @@ import App from './components/App'; import registerServiceWorker from './registerServiceWorker'; import { Integrations } from '@sentry/tracing'; import * as Sentry from '@sentry/react' +import SentryRRWeb from '@sentry/rrweb' import { render } from 'react-dom' import { Provider } from 'react-redux' import { createStore, applyMiddleware, compose } from 'redux' @@ -26,7 +27,7 @@ const tracingOrigins = [ console.log('tracingOrigins', tracingOrigins) Sentry.init({ - dsn: process.env.REACT_APP_DSN || 'https://0d52d5f4e8a64f5ab2edce50d88a7626@sentry.io/1428657', + dsn: process.env.REACT_APP_DSN || 'https://751ddf8c1ce74da3b5309fa2c8fd5a40@o87286.ingest.sentry.io/5518825', release: process.env.REACT_APP_RELEASE, environment: "prod", debug: true, @@ -40,6 +41,7 @@ Sentry.init({ new Integrations.BrowserTracing({ tracingOrigins: tracingOrigins }), + new SentryRRWeb(), ], tracesSampleRate: 1.0, autoSessionTracking: true, From 3e56afd4ac9c586d465356c7373be5162a2b727e Mon Sep 17 00:00:00 2001 From: Richard Propst Date: Thu, 21 Jan 2021 16:22:24 -0800 Subject: [PATCH 3/6] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bfa7676..7589128 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SENTRY_ORG=testorg-az -SENTRY_PROJECT=r2r-tracing-react +SENTRY_PROJECT=fe-react RELEASE=`sentry-cli releases propose-version` PREFIX=static/js From 8631d8395aa0d662167e9df523759f123d687ce7 Mon Sep 17 00:00:00 2001 From: Richard Propst Date: Thu, 21 Jan 2021 16:22:49 -0800 Subject: [PATCH 4/6] Update Makefile --- react/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react/Makefile b/react/Makefile index 4e62874..d275a1c 100644 --- a/react/Makefile +++ b/react/Makefile @@ -2,7 +2,7 @@ # Following variable must be passed in # SENTRY_AUTH_TOKEN SENTRY_ORG=testorg-az -SENTRY_PROJECT=r2r-tracing-react +SENTRY_PROJECT=will-frontend-react RELEASE=`sentry-cli releases propose-version` PREFIX=static/js From 0bc8ef3f2583d7502714fca1ad39d2c218aed048 Mon Sep 17 00:00:00 2001 From: Richard Propst Date: Thu, 21 Jan 2021 16:23:38 -0800 Subject: [PATCH 5/6] Update index.js --- react/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react/src/index.js b/react/src/index.js index b40129c..3c2564b 100644 --- a/react/src/index.js +++ b/react/src/index.js @@ -27,7 +27,7 @@ const tracingOrigins = [ console.log('tracingOrigins', tracingOrigins) Sentry.init({ - dsn: process.env.REACT_APP_DSN || 'https://751ddf8c1ce74da3b5309fa2c8fd5a40@o87286.ingest.sentry.io/5518825', + dsn: process.env.REACT_APP_DSN || 'https://0d52d5f4e8a64f5ab2edce50d88a7626@sentry.io/1428657', release: process.env.REACT_APP_RELEASE, environment: "prod", debug: true, From 54c672158038d2389895e814582f5a378be03956 Mon Sep 17 00:00:00 2001 From: Richard Propst Date: Thu, 21 Jan 2021 16:24:05 -0800 Subject: [PATCH 6/6] Update release-config.sh --- release-config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-config.sh b/release-config.sh index ca93d80..0ee41c7 100755 --- a/release-config.sh +++ b/release-config.sh @@ -19,8 +19,8 @@ RELEASE="$month.$week" echo $release # SENTRY_AUTH_TOKEN defined in shell profile -SENTRY_PROJECT1=r2r-tracing-react -SENTRY_PROJECT2=r2r-tracing-flask +SENTRY_PROJECT1=da-react +SENTRY_PROJECT2=da-flask SENTRY_ORG=testorg-az PREFIX=static/js