Skip to content

Commit

Permalink
Merge pull request #1659 from spacemeshos/fix_sentry
Browse files Browse the repository at this point in the history 
Fix sentry
  • Loading branch information
@brusherru
brusherru authored Feb 5, 2024
2 parents 2100a9b + a94eb98 commit bca62bb
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 59 deletions.
2 changes: 1 addition & 1 deletion app/components/common/Feedback.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ const FeedbackButton = () => {

const formData = {
event_id: captureReactMessage(`
Report: ${userData.title} By: ${userData.name} email: ${userData.email},
User Reported: ${userData.title} By: ${userData.name} email: ${userData.email},
`),
...userData,
};
Expand Down
4 changes: 2 additions & 2 deletions app/sentry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
captureUserFeedback,
reactRouterV5Instrumentation,
} from '@sentry/react';
import { BrowserTracing } from '@sentry/tracing';
import { BrowserTracing } from '@sentry/browser';
import { matchPath } from 'react-router-dom';
import { RouteConfig } from '@sentry/react/types/reactrouter';
import { Primitive } from '@sentry/types';
Expand Down Expand Up @@ -37,7 +37,7 @@ export const init = (history) =>
],
async beforeSend(event, hint) {
const isFeedbackFormMessage = (event?.message || '').includes(
'User has submitted an issue and asked to check it.'
'User Reported: '
);

if (!isFeedbackFormMessage) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@
"@grpc/grpc-js": "1.8.14",
"@grpc/proto-loader": "0.6.2",
"@reduxjs/toolkit": "^1.9.5",
"@sentry/browser": "^7.99.0",
"@sentry/electron": "4.5.0",
"@sentry/react": "7.49.0",
"@sentry/tracing": "7.49.0",
"@sentry/react": "^7.49.0",
"@spacemesh/address-wasm": "^0.2.0",
"@spacemesh/ed25519-bip32": "^0.1.0",
"@spacemesh/sm-codec": "^0.4.1",
Expand Down
119 changes: 65 additions & 54 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,25 @@
redux-thunk "^2.4.2"
reselect "^4.1.8"

"@sentry-internal/[email protected]":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.99.0.tgz#c3fec1500cb24c9a5e09479d478fddca909477da"
integrity sha512-exIO1o+bE0MW4z30FxC0cYzJ4ZHSMlDPMHCBDPzU+MWGQc/fb8s58QUrx5Dnm6HTh9G3H+YlroCxIo9u0GSwGQ==
dependencies:
"@sentry/core" "7.99.0"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"

"@sentry-internal/[email protected]":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.99.0.tgz#d6ba7eec7ab2f7210a7deb6daa4dd82f7b1e9e29"
integrity sha512-PoIkfusToDq0snfl2M6HJx/1KJYtXxYhQplrn11kYadO04SdG0XGXf4h7wBTMEQ7LDEAtQyvsOu4nEQtTO3YjQ==
dependencies:
"@sentry/core" "7.99.0"
"@sentry/replay" "7.99.0"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"

"@sentry-internal/[email protected]":
version "7.48.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.48.0.tgz#d0c1eac1c046fda5c79d16dc1c918fee3bae3e9d"
Expand All @@ -2527,15 +2546,14 @@
"@sentry/utils" "7.48.0"
tslib "^1.9.3"

"@sentry-internal/tracing@7.49.0":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.49.0.tgz#f589de565370884b9a13f82c98463de9b2d25dcd"
integrity sha512-ESh3+ZneQk/3HESTUmIPNrW5GVPu/HrRJU+eAJJto74vm+6vP7zDn2YV2gJ1w18O/37nc7W/bVCgZJlhZ3cwew==
"@sentry-internal/tracing@7.99.0":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.99.0.tgz#ad13f8343444ecf7323a4220d4e57a55166565d7"
integrity sha512-z3JQhHjoM1KdM20qrHwRClKJrNLr2CcKtCluq7xevLtXHJWNAQQbafnWD+Aoj85EWXBzKt9yJMv2ltcXJ+at+w==
dependencies:
"@sentry/core" "7.49.0"
"@sentry/types" "7.49.0"
"@sentry/utils" "7.49.0"
tslib "^1.9.3"
"@sentry/core" "7.99.0"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"

"@sentry/[email protected]":
version "7.48.0"
Expand All @@ -2549,17 +2567,18 @@
"@sentry/utils" "7.48.0"
tslib "^1.9.3"

"@sentry/browser@7.49.0":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.49.0.tgz#5ce1cdb8d883c129d9a4e313c08a54c5ada4661b"
integrity sha512-x2DekKkQoY7/dhBzE4J25mdQ978NtPBTVQb+uZqlF/t5mp4K44TAszmPqy8lC/CmVHkp7qcpRGSCIzeboUL4KA==
"@sentry/browser@7.99.0", "@sentry/browser@^7.99.0":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.99.0.tgz#3e78beb490d141c988038ea902689a1e9171c6cf"
integrity sha512-bgfoUv3wkwwLgN5YUOe0ibB3y268ZCnamZh6nLFqnY/UBKC1+FXWFdvzVON/XKUm62LF8wlpCybOf08ebNj2yg==
dependencies:
"@sentry-internal/tracing" "7.49.0"
"@sentry/core" "7.49.0"
"@sentry/replay" "7.49.0"
"@sentry/types" "7.49.0"
"@sentry/utils" "7.49.0"
tslib "^1.9.3"
"@sentry-internal/feedback" "7.99.0"
"@sentry-internal/replay-canvas" "7.99.0"
"@sentry-internal/tracing" "7.99.0"
"@sentry/core" "7.99.0"
"@sentry/replay" "7.99.0"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"

"@sentry/cli@^1.75.1":
version "1.75.2"
Expand Down Expand Up @@ -2593,14 +2612,13 @@
"@sentry/utils" "7.48.0"
tslib "^1.9.3"

"@sentry/core@7.49.0":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.49.0.tgz#340d059f5efeff1a3359fef66d0c8e34e79ac992"
integrity sha512-AlSnCYgfEbvK8pkNluUkmdW/cD9UpvOVCa+ERQswXNRkAv5aDGCL6Ihv6fnIajE++BYuwZh0+HwZUBVKTFzoZg==
"@sentry/core@7.99.0":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.99.0.tgz#6881aae5ac1436637b3d88e0b12df4ab56016c5f"
integrity sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==
dependencies:
"@sentry/types" "7.49.0"
"@sentry/utils" "7.49.0"
tslib "^1.9.3"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"

"@sentry/[email protected]":
version "4.5.0"
Expand Down Expand Up @@ -2629,16 +2647,16 @@
lru_map "^0.3.3"
tslib "^1.9.3"

"@sentry/[email protected]":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.49.0.tgz#9a31808d4232d3010019e09d7c706b3d4fe54960"
integrity sha512-s+ROJr1tP9zVBmoOn94JM+fu2TuoJKxkSXTEUOKoQ9P6P5ROzpDqTzHRGk6u4OjZTy5tftRyEqBGM2Iaf9Y+UA==
"@sentry/react@^7.49.0":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.99.0.tgz#5adab8f0e3314ad12a128ae6a79f587c46b32243"
integrity sha512-RtHwgzMHJhzJfSQpVG0SDPQYMTGDX3Q37/YWI59S4ALMbSW4/F6n/eQAvGVYZKbh2UCSqgFuRWaXOYkSZT17wA==
dependencies:
"@sentry/browser" "7.49.0"
"@sentry/types" "7.49.0"
"@sentry/utils" "7.49.0"
"@sentry/browser" "7.99.0"
"@sentry/core" "7.99.0"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"
hoist-non-react-statics "^3.3.2"
tslib "^1.9.3"

"@sentry/[email protected]":
version "7.48.0"
Expand All @@ -2649,23 +2667,17 @@
"@sentry/types" "7.48.0"
"@sentry/utils" "7.48.0"

"@sentry/replay@7.49.0":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.49.0.tgz#c7f16bc3ca0c5911f641738f8894eb596c5da00d"
integrity sha512-UY3bHoBDPOu4Dpq3m3oxNjLrq09NiFVYUfrTN4QOq1Am2SA04XbuCj/YZ+jNVy/NrFtoz9cTovK6oQbNw53jog==
"@sentry/replay@7.99.0":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.99.0.tgz#c63f2bd79a791538ba54bcd91f02379dc4d5c1cc"
integrity sha512-gyN/I2WpQrLAZDT+rScB/0jnFL2knEVBo8U8/OVt8gNP20Pq8T/rDZKO/TG0cBfvULDUbJj2P4CJryn2p/O2rA==
dependencies:
"@sentry/core" "7.49.0"
"@sentry/types" "7.49.0"
"@sentry/utils" "7.49.0"
"@sentry-internal/tracing" "7.99.0"
"@sentry/core" "7.99.0"
"@sentry/types" "7.99.0"
"@sentry/utils" "7.99.0"

"@sentry/[email protected]":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.49.0.tgz#1ebb6da9b763420e605444511a203e38b6304136"
integrity sha512-RtyTt1DvX7s1M2ca9qnevOkuwn8HjbKXrSVHtMbQYoT3uGvjT8Pm71D5WtWMWH2QLpFgcqQq/1ifZBUAG4Y7qA==
dependencies:
"@sentry-internal/tracing" "7.49.0"

"@sentry/[email protected]", "@sentry/[email protected]", "@sentry/types@^7.49.0":
"@sentry/[email protected]", "@sentry/[email protected]", "@sentry/types@^7.49.0":
version "7.73.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.73.0.tgz#6d811bbe413d319df0a592a672d6d72a94a8e716"
integrity sha512-/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg==
Expand All @@ -2678,13 +2690,12 @@
"@sentry/types" "7.48.0"
tslib "^1.9.3"

"@sentry/utils@7.49.0":
version "7.49.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.49.0.tgz#b1b3a2af52067dd27e660c7c3062a31cdf4b94f9"
integrity sha512-JdC9yGnOgev4ISJVwmIoFsk8Zx0psDZJAj2DV7x4wMZsO6QK+YjC7G3mUED/S5D5lsrkBZ/3uvQQhr8DQI4UcQ==
"@sentry/utils@7.99.0":
version "7.99.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.99.0.tgz#ef96c3b59e23c79f3ef500db508234a48fa1cfbe"
integrity sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==
dependencies:
"@sentry/types" "7.49.0"
tslib "^1.9.3"
"@sentry/types" "7.99.0"

"@sentry/[email protected]":
version "1.20.1"
Expand Down

0 comments on commit bca62bb

Please sign in to comment.