diff --git a/package.json b/package.json index 1f0aa13..0dcbe90 100644 --- a/package.json +++ b/package.json @@ -40,14 +40,14 @@ }, "peerDependencies": { "@apollo/client": "^3.2.3", - "@sentry/browser": "^7.41.0", + "@sentry/browser": "^8.0.0", "graphql": "15 - 16" }, "devDependencies": { "@apollo/client": "^3.5.6", "@semantic-release/changelog": "^6.0.2", "@semantic-release/git": "^10.0.1", - "@sentry/browser": "^7.41.0", + "@sentry/browser": "^8.0.0", "@types/jest": "^27.0.3", "@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/parser": "^5.7.0", diff --git a/src/sentry.ts b/src/sentry.ts index 962efdd..f50dd2f 100644 --- a/src/sentry.ts +++ b/src/sentry.ts @@ -1,10 +1,5 @@ import { Operation } from '@apollo/client/core'; -import { - addBreadcrumb, - configureScope, - Breadcrumb, - Scope, -} from '@sentry/browser'; +import { Breadcrumb, addBreadcrumb, getCurrentScope } from '@sentry/browser'; import { GraphQLBreadcrumb } from './breadcrumb'; import { extractDefinition } from './operation'; @@ -16,9 +11,7 @@ export function setTransaction(operation: Operation): void { const name = definition.name; if (name) { - configureScope((scope: Scope) => { - scope.setTransactionName(name.value); - }); + getCurrentScope().setTransactionName(name.value); } } @@ -29,9 +22,7 @@ export function setFingerprint(operation: Operation): void { const name = definition.name; if (name) { - configureScope((scope: Scope) => { - scope.setFingerprint([DEFAULT_FINGERPRINT, name.value]); - }); + getCurrentScope().setFingerprint([DEFAULT_FINGERPRINT, name.value]); } } diff --git a/tests/SentryLink.test.ts b/tests/SentryLink.test.ts index e830163..bb3367d 100644 --- a/tests/SentryLink.test.ts +++ b/tests/SentryLink.test.ts @@ -29,11 +29,9 @@ describe('SentryLink', () => { beforeEach(() => { testkit.reset(); - Sentry.configureScope((scope) => { - scope.clearBreadcrumbs(); - scope.setTransactionName(); - scope.setFingerprint([]); - }); + Sentry.getIsolationScope().clearBreadcrumbs(); + Sentry.getCurrentScope().setTransactionName(); + Sentry.getCurrentScope().setFingerprint([]); }); it('should attach a sentry breadcrumb for an apolloOperation', (done) => { diff --git a/yarn.lock b/yarn.lock index c8e565c..0f2f826 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1081,47 +1081,76 @@ lodash "^4.17.4" read-pkg-up "^7.0.0" -"@sentry/browser@^7.41.0": - version "7.41.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.41.0.tgz#f4e789417e3037cbc9cd15f3a000064b1873b964" - integrity sha512-ZEtgTXPOHZ9/Qn42rr9ZAPTKCV6fAjyDC4FFWMGP4HoUqJqr2woRddP9O5n1jvjsoIPAFOmGzbCuZwFrPVVnpQ== - dependencies: - "@sentry/core" "7.41.0" - "@sentry/replay" "7.41.0" - "@sentry/types" "7.41.0" - "@sentry/utils" "7.41.0" - tslib "^1.9.3" - -"@sentry/core@7.41.0": - version "7.41.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.41.0.tgz#a4a8291ef4e65f40c28fc38318e7dae721d5d609" - integrity sha512-yT3wl3wMfPymstIZRWNjuov4xhieIEPD0z9MIW9VmoemqkD5BEZsgPuvGaVIyQVMyx61GsN4H4xd0JCyNqNvLg== - dependencies: - "@sentry/types" "7.41.0" - "@sentry/utils" "7.41.0" - tslib "^1.9.3" - -"@sentry/replay@7.41.0": - version "7.41.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.41.0.tgz#73168d659b0e78ca58574831a6672a77ce9727ee" - integrity sha512-/vxuO17AysCoBbCl9wCwjsCFBD4lEbYgfC1GJm8ayWwPU1uhvZcEx6reUwi0rEFpWYGHSHh3+gi+QsOcY/EmnQ== - dependencies: - "@sentry/core" "7.41.0" - "@sentry/types" "7.41.0" - "@sentry/utils" "7.41.0" - -"@sentry/types@7.41.0": - version "7.41.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.41.0.tgz#3d53432a3d7693a31b606d3083ab9203c56f5aec" - integrity sha512-4z9VdObynwd64i0VHCqkeIAHmsFzapL21qN41Brzb7jY/eGxjn/0rxInDGH+vkoE9qacGqiYfWj4vRNPLsC/bw== - -"@sentry/utils@7.41.0": - version "7.41.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.41.0.tgz#54224dba668dd8c8feb0ff1b4f39938b8fdefd3b" - integrity sha512-SL+MGitvkakbkrOTb48rDuJp9GYx/veB6EOzYygh49+zwz4DGM7dD4/rvf/mVlgmXUzPgdGDgkVmxgX3nT7I7g== - dependencies: - "@sentry/types" "7.41.0" - tslib "^1.9.3" +"@sentry-internal/browser-utils@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.0.0.tgz#69bd216abf78d9eef2e6fcdf99d7c281986508d7" + integrity sha512-dzmoDK7mzP7MvNt/jjs9a4OQ18H/8NyhDiKoJakVZnvk8ComGIv01vOOxDhrNmLyaJSq2KVNsiIJ+AkTmwcmyQ== + dependencies: + "@sentry/core" "8.0.0" + "@sentry/types" "8.0.0" + "@sentry/utils" "8.0.0" + +"@sentry-internal/feedback@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.0.0.tgz#94795aea2d7fb23e698e50032899e9b4f4d04a68" + integrity sha512-2Jj0B5xn1y5kiOwso7EWQDlLGRt1tGcnglIYqCIpwNQM38yqn+5NMwH/Df7TkBlxBerKo4MYZZ2yHNUpkTXQ7Q== + dependencies: + "@sentry/core" "8.0.0" + "@sentry/types" "8.0.0" + "@sentry/utils" "8.0.0" + +"@sentry-internal/replay-canvas@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.0.0.tgz#eb4da3ec5c8371ed9112ad69712d960c24ee28b5" + integrity sha512-jeE5YQ42groVRvbM41iL4rxvWuKOVnZ7UXacHDgWerR2S+C7OtN3Ydzr34rfRYTVagqFPDcDswFrxrcWuZD+Kw== + dependencies: + "@sentry-internal/replay" "8.0.0" + "@sentry/core" "8.0.0" + "@sentry/types" "8.0.0" + "@sentry/utils" "8.0.0" + +"@sentry-internal/replay@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.0.0.tgz#3ba2dea8df79d1e31e4ec0ce948dfbb994731b0f" + integrity sha512-lh0opJuhvKFgLK0TxeN2FDhnCc9qNdgBOpjA69hwpKl10kMxDoZy+oLxE4hx8j5RYKtM2o7mCv2rf1n0wK22Kg== + dependencies: + "@sentry-internal/browser-utils" "8.0.0" + "@sentry/core" "8.0.0" + "@sentry/types" "8.0.0" + "@sentry/utils" "8.0.0" + +"@sentry/browser@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.0.0.tgz#9c2f2d62f196a5b9b5a7174d0970c4f974722c98" + integrity sha512-HZt5bjujxz2XJA1iUqD51gEz/h8Ij+BYLu6D+qh6WpVtCSS1cfKoxJj8mQef7j5tIVVofxRtRr9PvAoFnehO0A== + dependencies: + "@sentry-internal/browser-utils" "8.0.0" + "@sentry-internal/feedback" "8.0.0" + "@sentry-internal/replay" "8.0.0" + "@sentry-internal/replay-canvas" "8.0.0" + "@sentry/core" "8.0.0" + "@sentry/types" "8.0.0" + "@sentry/utils" "8.0.0" + +"@sentry/core@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.0.0.tgz#fd5f94c9ef72ce386ae37de852f156106ea807d5" + integrity sha512-PgOqQPdlIbiLFOo0F6IBzMbvusiEQ86+yXd76pIsuqQ2tj+iFL5gdYOckF/FKVpAwhfzIx64GKin2C+535c1qQ== + dependencies: + "@sentry/types" "8.0.0" + "@sentry/utils" "8.0.0" + +"@sentry/types@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.0.0.tgz#5047dcbcff6a38699e4490acd941baffafb72f45" + integrity sha512-Dtd8dtFEq1XtdAntkguYHaL4tokzm4Aq5t0HP6Vl1P+MPImokDE1UcpKglkh0Z5aym/vF6e0qW9/CM7lAI5R/A== + +"@sentry/utils@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.0.0.tgz#24b2f3f24cf521c0180e4335da63a4c6e51fa7dd" + integrity sha512-oZex/dRKfkWHoK99W7QDQtr26IZrAD9EDd2+pwLmkFclApxVDGLLKNkmcbfj4LX1zMROxKWww/GTE7eo08tEKg== + dependencies: + "@sentry/types" "8.0.0" "@sinonjs/commons@^1.7.0": version "1.8.6" @@ -6686,7 +6715,7 @@ tsconfig-paths@^3.14.1: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^1.8.1, tslib@^1.9.3: +tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==