Skip to content

Commit 33785e3

Browse files
Seluj78Seluj78
authored
Merge branch 'dev' into new-docker-names-and-tags
2 parents 1197eaf + 175cdd4 commit 33785e3

File tree

5 files changed

+129
-2
lines changed

5 files changed

+129
-2
lines changed

‎backend/PyMatcha/__init__.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import os
2222

2323
import pymysql
24+
import sentry_sdk
2425
from celery import Celery
2526
from dotenv import load_dotenv
2627
from flask import Flask
@@ -32,6 +33,9 @@
3233
from PyMatcha.utils.tables import create_tables
3334
from pymysql.cursors import DictCursor
3435
from redis import StrictRedis
36+
from sentry_sdk import configure_scope
37+
from sentry_sdk.integrations.flask import FlaskIntegration
38+
3539

3640
PYMATCHA_ROOT = os.path.join(os.path.dirname(__file__), "../..") # refers to application_top
3741
dotenv_path = os.path.join(PYMATCHA_ROOT, ".env")
@@ -79,6 +83,13 @@
7983
if ENABLE_LOGGING == "True":
8084
setup_logging()
8185

86+
sentry_sdk.init(
87+
dsn="https://bb17c14c99d448e2804bf2f105d4ec52@o450203.ingest.sentry.io/5434438",
88+
integrations=[FlaskIntegration()],
89+
traces_sample_rate=1.0,
90+
)
91+
92+
8293
application = Flask(__name__)
8394

8495
if os.getenv("FLASK_DEBUG", "false") == "true" or os.getenv("FLASK_DEBUG", "false") == "1":
@@ -183,6 +194,9 @@ def jwt_user_callback(identity):
183194
except NotFoundError:
184195
# The user who the server issues the token for was deleted in the db.
185196
return None
197+
198+
with configure_scope() as scope:
199+
scope.user = {"email": u.email, "id": u.id, "username": u.username}
186200
redis.set("online_user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
187201
return u
188202

‎backend/requirements.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ argon2-cffi==20.1.0
3333

3434
geopy==2.0.0
3535
fuzzywuzzy==0.18.0
36-
python-Levenshtein==0.12.0
36+
python-Levenshtein==0.12.0
37+
38+
sentry-sdk==0.17.6

‎frontend/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
"lint": "vue-cli-service lint"
99
},
1010
"dependencies": {
11+
"@sentry/browser": "^5.24.2",
12+
"@sentry/integrations": "^5.24.2",
13+
"@sentry/tracing": "^5.24.2",
1114
"core-js": "^3.6.5",
1215
"tailwindcss": "^1.8.10",
1316
"vee-validate": "^3.3.11",

‎frontend/src/main.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ import store from './store';
66
import validPassword from './validators/validPassword';
77
import './assets/css/tailwind.css';
88

9+
import * as Sentry from "@sentry/browser";
10+
import { Vue as VueIntegration } from "@sentry/integrations";
11+
import { Integrations } from "@sentry/tracing";
12+
13+
Sentry.init({
14+
dsn: "https://fc31e918801742e2b1e691067496e257@o450203.ingest.sentry.io/5434440",
15+
integrations: [
16+
new VueIntegration({
17+
Vue,
18+
tracing: true,
19+
}),
20+
new Integrations.BrowserTracing(),
21+
],
22+
tracesSampleRate: 1,
23+
});
24+
925
Vue.component('ValidationProvider', ValidationProvider);
1026
Vue.component('ValidationObserver', ValidationObserver);
1127
extend('validPassword', validPassword);

‎frontend/yarn.lock‎

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,79 @@
923923
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
924924
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
925925

926+
"@sentry/browser@^5.24.2":
927+
version "5.24.2"
928+
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.24.2.tgz#e2c2786dbf07699ee12f12babf0138d633abc494"
929+
integrity sha512-P/uZC/VrLRpU7MVEJnlZK5+AkEmuHu+mns5gC91Z4gjn7GamjR/CaXVedHGw/15ZrsQiAiwoWwuxpv4Ypd/+SA==
930+
dependencies:
931+
"@sentry/core" "5.24.2"
932+
"@sentry/types" "5.24.2"
933+
"@sentry/utils" "5.24.2"
934+
tslib "^1.9.3"
935+
936+
"@sentry/core@5.24.2":
937+
version "5.24.2"
938+
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.24.2.tgz#1724652855c0887a690c3fc6acd2519d4072b511"
939+
integrity sha512-nuAwCGU1l9hgMinl5P/8nIQGRXDP2FI9cJnq5h1qiP/XIOvJkJz2yzBR6nTyqr4vBth0tvxQJbIpDNGd7vHJLg==
940+
dependencies:
941+
"@sentry/hub" "5.24.2"
942+
"@sentry/minimal" "5.24.2"
943+
"@sentry/types" "5.24.2"
944+
"@sentry/utils" "5.24.2"
945+
tslib "^1.9.3"
946+
947+
"@sentry/hub@5.24.2":
948+
version "5.24.2"
949+
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.24.2.tgz#64a02fd487599945e488ae23aba4ce4df44ee79e"
950+
integrity sha512-xmO1Ivvpb5Qr9WgekinuZZlpl9Iw7iPETUe84HQOhUrXf+2gKO+LaUYMMsYSVDwXQEmR6/tTMyOtS6iavldC6w==
951+
dependencies:
952+
"@sentry/types" "5.24.2"
953+
"@sentry/utils" "5.24.2"
954+
tslib "^1.9.3"
955+
956+
"@sentry/integrations@^5.24.2":
957+
version "5.24.2"
958+
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.24.2.tgz#cfb14c64465d6acbb279994b8a87a8ef72776320"
959+
integrity sha512-b0upZS+xvONwxkLL6apSSgseR1e6dtq7wAGHefnPa5ckTwIoUkboL/dqiTNmFj1xXnWb87WDX1ZcIx7nfEqw6A==
960+
dependencies:
961+
"@sentry/types" "5.24.2"
962+
"@sentry/utils" "5.24.2"
963+
localforage "1.8.1"
964+
tslib "^1.9.3"
965+
966+
"@sentry/minimal@5.24.2":
967+
version "5.24.2"
968+
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.24.2.tgz#14e8b136842398a32987459f0574359b6dc57a1f"
969+
integrity sha512-biFpux5bI3R8xiD/Zzvrk1kRE6bqPtfWXmZYAHRtaUMCAibprTKSY9Ta8QYHynOAEoJ5Akedy6HUsEkK5DoZfA==
970+
dependencies:
971+
"@sentry/hub" "5.24.2"
972+
"@sentry/types" "5.24.2"
973+
tslib "^1.9.3"
974+
975+
"@sentry/tracing@^5.24.2":
976+
version "5.24.2"
977+
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-5.24.2.tgz#a36b4f9bf699c5e07e99a148360091c8e727c51f"
978+
integrity sha512-1uDgvGGVF8lb3hRXbhNnns+8DBUKjhRKOFR5Z3RExjrDFYTDbHmoNtV73Q12Ra+Iht9HTZnIBOqYD3oSZIbJ0w==
979+
dependencies:
980+
"@sentry/hub" "5.24.2"
981+
"@sentry/minimal" "5.24.2"
982+
"@sentry/types" "5.24.2"
983+
"@sentry/utils" "5.24.2"
984+
tslib "^1.9.3"
985+
986+
"@sentry/types@5.24.2":
987+
version "5.24.2"
988+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.24.2.tgz#e2c25d1e75d8dbec5dbbd9a309a321425b61c2ca"
989+
integrity sha512-HcOK00R0tQG5vzrIrqQ0jC28+z76jWSgQCzXiessJ5SH/9uc6NzdO7sR7K8vqMP2+nweCHckFohC8G0T1DLzuQ==
990+
991+
"@sentry/utils@5.24.2":
992+
version "5.24.2"
993+
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.24.2.tgz#90b7dff939bbbf4bb8edcac6aac2d04a0552af80"
994+
integrity sha512-oPGde4tNEDHKk0Cg9q2p0qX649jLDUOwzJXHKpd0X65w3A6eJByDevMr8CSzKV9sesjrUpxqAv6f9WWlz185tA==
995+
dependencies:
996+
"@sentry/types" "5.24.2"
997+
tslib "^1.9.3"
998+
926999
"@soda/friendly-errors-webpack-plugin@^1.7.1":
9271000
version "1.7.1"
9281001
resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d"
@@ -4654,6 +4727,11 @@ ignore@^4.0.3, ignore@^4.0.6:
46544727
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
46554728
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
46564729

4730+
immediate@~3.0.5:
4731+
version "3.0.6"
4732+
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
4733+
integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
4734+
46574735
import-cwd@^2.0.0:
46584736
version "2.1.0"
46594737
resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -5290,6 +5368,13 @@ levn@^0.3.0, levn@~0.3.0:
52905368
prelude-ls "~1.1.2"
52915369
type-check "~0.3.2"
52925370

5371+
lie@3.1.1:
5372+
version "3.1.1"
5373+
resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
5374+
integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
5375+
dependencies:
5376+
immediate "~3.0.5"
5377+
52935378
lines-and-columns@^1.1.6:
52945379
version "1.1.6"
52955380
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -5337,6 +5422,13 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4
53375422
emojis-list "^3.0.0"
53385423
json5 "^1.0.1"
53395424

5425+
localforage@1.8.1:
5426+
version "1.8.1"
5427+
resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.8.1.tgz#f6c0a24b41ab33b10e4dc84342dd696f6f3e3433"
5428+
integrity sha512-azSSJJfc7h4bVpi0PGi+SmLQKJl2/8NErI+LhJsrORNikMZnhaQ7rv9fHj+ofwgSHrKRlsDCL/639a6nECIKuQ==
5429+
dependencies:
5430+
lie "3.1.1"
5431+
53405432
locate-path@^2.0.0:
53415433
version "2.0.0"
53425434
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -8211,7 +8303,7 @@ tsconfig-paths@^3.9.0:
82118303
minimist "^1.2.0"
82128304
strip-bom "^3.0.0"
82138305

8214-
tslib@^1.9.0:
8306+
tslib@^1.9.0, tslib@^1.9.3:
82158307
version "1.13.0"
82168308
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
82178309
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==

0 commit comments

Comments
 (0)