Skip to content

Commit 849bfdd

Browse files
sentrivanasentrivana
committed
Only mark frame as in_app if explicitly set by user
1 parent 48d6368 commit 849bfdd

File tree

2 files changed

+2
-85
lines changed

2 files changed

+2
-85
lines changed

‎sentry_sdk/utils.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,19 +1076,6 @@ def set_in_app_in_frames(frames, in_app_exclude, in_app_include, project_root=No
10761076
frame["in_app"] = False
10771077
continue
10781078

1079-
# if frame has no abs_path, skip further checks
1080-
abs_path = frame.get("abs_path")
1081-
if abs_path is None:
1082-
continue
1083-
1084-
if _is_external_source(abs_path):
1085-
frame["in_app"] = False
1086-
continue
1087-
1088-
if _is_in_project_root(abs_path, project_root):
1089-
frame["in_app"] = True
1090-
continue
1091-
10921079
return frames
10931080

10941081

‎tests/utils/test_general.py‎

Lines changed: 2 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,14 @@ def test_parse_invalid_dsn(dsn):
121121

122122

123123
@pytest.mark.parametrize(
124-
"frame,in_app_include,in_app_exclude,project_root,resulting_frame",
124+
"frame,in_app_include,in_app_exclude,resulting_frame",
125125
[
126126
[
127127
{
128128
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
129129
},
130130
None,
131131
None,
132-
None,
133132
{
134133
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
135134
"in_app": False,
@@ -142,7 +141,6 @@ def test_parse_invalid_dsn(dsn):
142141
},
143142
None,
144143
None,
145-
None,
146144
{
147145
"module": "fastapi.routing",
148146
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
@@ -157,7 +155,6 @@ def test_parse_invalid_dsn(dsn):
157155
},
158156
None,
159157
None,
160-
None,
161158
{
162159
"module": "fastapi.routing",
163160
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
@@ -170,7 +167,6 @@ def test_parse_invalid_dsn(dsn):
170167
},
171168
None,
172169
None,
173-
None,
174170
{
175171
"abs_path": "C:\\Users\\winuser\\AppData\\Roaming\\Python\\Python35\\site-packages\\fastapi\\routing.py",
176172
"in_app": False,
@@ -183,7 +179,6 @@ def test_parse_invalid_dsn(dsn):
183179
},
184180
None,
185181
None,
186-
None,
187182
{
188183
"module": "fastapi.routing",
189184
"abs_path": "/usr/lib/python2.7/dist-packages/fastapi/routing.py",
@@ -196,7 +191,6 @@ def test_parse_invalid_dsn(dsn):
196191
},
197192
None,
198193
None,
199-
None,
200194
{
201195
"abs_path": "/home/ubuntu/fastapi/main.py",
202196
},
@@ -208,7 +202,6 @@ def test_parse_invalid_dsn(dsn):
208202
},
209203
None,
210204
None,
211-
None,
212205
{
213206
"module": "main",
214207
"abs_path": "/home/ubuntu/fastapi/main.py",
@@ -221,7 +214,6 @@ def test_parse_invalid_dsn(dsn):
221214
},
222215
["fastapi"],
223216
None,
224-
None,
225217
{
226218
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
227219
"in_app": False, # because there is no module set
@@ -234,7 +226,6 @@ def test_parse_invalid_dsn(dsn):
234226
},
235227
["fastapi"],
236228
None,
237-
None,
238229
{
239230
"module": "fastapi.routing",
240231
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
@@ -249,7 +240,6 @@ def test_parse_invalid_dsn(dsn):
249240
},
250241
["fastapi"],
251242
None,
252-
None,
253243
{
254244
"module": "fastapi.routing",
255245
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
@@ -262,7 +252,6 @@ def test_parse_invalid_dsn(dsn):
262252
},
263253
["fastapi"],
264254
None,
265-
None,
266255
{
267256
"abs_path": "C:\\Users\\winuser\\AppData\\Roaming\\Python\\Python35\\site-packages\\fastapi\\routing.py",
268257
"in_app": False, # because there is no module set
@@ -275,7 +264,6 @@ def test_parse_invalid_dsn(dsn):
275264
},
276265
["fastapi"],
277266
None,
278-
None,
279267
{
280268
"module": "fastapi.routing",
281269
"abs_path": "/usr/lib/python2.7/dist-packages/fastapi/routing.py",
@@ -288,7 +276,6 @@ def test_parse_invalid_dsn(dsn):
288276
},
289277
["fastapi"],
290278
None,
291-
None,
292279
{
293280
"abs_path": "/home/ubuntu/fastapi/main.py",
294281
},
@@ -300,7 +287,6 @@ def test_parse_invalid_dsn(dsn):
300287
},
301288
["fastapi"],
302289
None,
303-
None,
304290
{
305291
"module": "main",
306292
"abs_path": "/home/ubuntu/fastapi/main.py",
@@ -313,7 +299,6 @@ def test_parse_invalid_dsn(dsn):
313299
},
314300
None,
315301
["main"],
316-
None,
317302
{
318303
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
319304
"in_app": False,
@@ -326,7 +311,6 @@ def test_parse_invalid_dsn(dsn):
326311
},
327312
None,
328313
["main"],
329-
None,
330314
{
331315
"module": "fastapi.routing",
332316
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
@@ -341,7 +325,6 @@ def test_parse_invalid_dsn(dsn):
341325
},
342326
None,
343327
["main"],
344-
None,
345328
{
346329
"module": "fastapi.routing",
347330
"abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py",
@@ -354,7 +337,6 @@ def test_parse_invalid_dsn(dsn):
354337
},
355338
None,
356339
["main"],
357-
None,
358340
{
359341
"abs_path": "C:\\Users\\winuser\\AppData\\Roaming\\Python\\Python35\\site-packages\\fastapi\\routing.py",
360342
"in_app": False,
@@ -367,7 +349,6 @@ def test_parse_invalid_dsn(dsn):
367349
},
368350
None,
369351
["main"],
370-
None,
371352
{
372353
"module": "fastapi.routing",
373354
"abs_path": "/usr/lib/python2.7/dist-packages/fastapi/routing.py",
@@ -380,7 +361,6 @@ def test_parse_invalid_dsn(dsn):
380361
},
381362
None,
382363
["main"],
383-
None,
384364
{
385365
"abs_path": "/home/ubuntu/fastapi/main.py",
386366
},
@@ -392,7 +372,6 @@ def test_parse_invalid_dsn(dsn):
392372
},
393373
None,
394374
["main"],
395-
None,
396375
{
397376
"module": "main",
398377
"abs_path": "/home/ubuntu/fastapi/main.py",
@@ -405,7 +384,6 @@ def test_parse_invalid_dsn(dsn):
405384
},
406385
None,
407386
None,
408-
None,
409387
{
410388
"module": "fastapi.routing",
411389
},
@@ -416,7 +394,6 @@ def test_parse_invalid_dsn(dsn):
416394
},
417395
["fastapi"],
418396
None,
419-
None,
420397
{
421398
"module": "fastapi.routing",
422399
"in_app": True,
@@ -428,65 +405,18 @@ def test_parse_invalid_dsn(dsn):
428405
},
429406
None,
430407
["fastapi"],
431-
None,
432408
{
433409
"module": "fastapi.routing",
434410
"in_app": False,
435411
},
436412
],
437-
# with project_root set
438-
[
439-
{
440-
"module": "main",
441-
"abs_path": "/home/ubuntu/fastapi/main.py",
442-
},
443-
None,
444-
None,
445-
"/home/ubuntu/fastapi",
446-
{
447-
"module": "main",
448-
"abs_path": "/home/ubuntu/fastapi/main.py",
449-
"in_app": True,
450-
},
451-
],
452-
[
453-
{
454-
"module": "main",
455-
"abs_path": "/home/ubuntu/fastapi/main.py",
456-
},
457-
["main"],
458-
None,
459-
"/home/ubuntu/fastapi",
460-
{
461-
"module": "main",
462-
"abs_path": "/home/ubuntu/fastapi/main.py",
463-
"in_app": True,
464-
},
465-
],
466-
[
467-
{
468-
"module": "main",
469-
"abs_path": "/home/ubuntu/fastapi/main.py",
470-
},
471-
None,
472-
["main"],
473-
"/home/ubuntu/fastapi",
474-
{
475-
"module": "main",
476-
"abs_path": "/home/ubuntu/fastapi/main.py",
477-
"in_app": False,
478-
},
479-
],
480413
],
481414
)
482-
def test_set_in_app_in_frames(
483-
frame, in_app_include, in_app_exclude, project_root, resulting_frame
484-
):
415+
def test_set_in_app_in_frames(frame, in_app_include, in_app_exclude, resulting_frame):
485416
new_frames = set_in_app_in_frames(
486417
[frame],
487418
in_app_include=in_app_include,
488419
in_app_exclude=in_app_exclude,
489-
project_root=project_root,
490420
)
491421

492422
assert new_frames[0] == resulting_frame

0 commit comments

Comments
 (0)