diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py index 0fead48377..7b73800f0e 100644 --- a/sentry_sdk/utils.py +++ b/sentry_sdk/utils.py @@ -1076,19 +1076,6 @@ def set_in_app_in_frames(frames, in_app_exclude, in_app_include, project_root=No frame["in_app"] = False continue - # if frame has no abs_path, skip further checks - abs_path = frame.get("abs_path") - if abs_path is None: - continue - - if _is_external_source(abs_path): - frame["in_app"] = False - continue - - if _is_in_project_root(abs_path, project_root): - frame["in_app"] = True - continue - return frames diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py index f60bedc846..d5f896dcc8 100644 --- a/tests/integrations/aws_lambda/test_aws.py +++ b/tests/integrations/aws_lambda/test_aws.py @@ -219,7 +219,7 @@ def test_handler(event, context): assert frame1["abs_path"] == "/var/task/test_lambda.py" assert frame1["function"] == "test_handler" - assert frame1["in_app"] is True + assert "in_app" not in frame1 assert exception["mechanism"]["type"] == "aws_lambda" assert not exception["mechanism"]["handled"] diff --git a/tests/new_scopes_compat/test_new_scopes_compat_event.py b/tests/new_scopes_compat/test_new_scopes_compat_event.py index db1e5fec4b..fb315a7bea 100644 --- a/tests/new_scopes_compat/test_new_scopes_compat_event.py +++ b/tests/new_scopes_compat/test_new_scopes_compat_event.py @@ -66,7 +66,6 @@ def create_expected_error_event(trx, span): "vars": { "ex": mock.ANY, }, - "in_app": True, } ] }, diff --git a/tests/utils/test_general.py b/tests/utils/test_general.py index 1b689ec735..e18c707f2f 100644 --- a/tests/utils/test_general.py +++ b/tests/utils/test_general.py @@ -121,7 +121,7 @@ def test_parse_invalid_dsn(dsn): @pytest.mark.parametrize( - "frame,in_app_include,in_app_exclude,project_root,resulting_frame", + "frame,in_app_include,in_app_exclude,resulting_frame", [ [ { @@ -129,10 +129,8 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", - "in_app": False, }, ], [ @@ -142,11 +140,9 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "module": "fastapi.routing", "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", - "in_app": False, }, ], [ @@ -157,7 +153,6 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "module": "fastapi.routing", "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", @@ -170,10 +165,8 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "abs_path": "C:\\Users\\winuser\\AppData\\Roaming\\Python\\Python35\\site-packages\\fastapi\\routing.py", - "in_app": False, }, ], [ @@ -183,11 +176,9 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "module": "fastapi.routing", "abs_path": "/usr/lib/python2.7/dist-packages/fastapi/routing.py", - "in_app": False, }, ], [ @@ -196,7 +187,6 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "abs_path": "/home/ubuntu/fastapi/main.py", }, @@ -208,7 +198,6 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "module": "main", "abs_path": "/home/ubuntu/fastapi/main.py", @@ -221,10 +210,8 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", - "in_app": False, # because there is no module set }, ], [ @@ -234,7 +221,6 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "module": "fastapi.routing", "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", @@ -249,7 +235,6 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "module": "fastapi.routing", "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", @@ -262,10 +247,8 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "abs_path": "C:\\Users\\winuser\\AppData\\Roaming\\Python\\Python35\\site-packages\\fastapi\\routing.py", - "in_app": False, # because there is no module set }, ], [ @@ -275,7 +258,6 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "module": "fastapi.routing", "abs_path": "/usr/lib/python2.7/dist-packages/fastapi/routing.py", @@ -288,7 +270,6 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "abs_path": "/home/ubuntu/fastapi/main.py", }, @@ -300,7 +281,6 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "module": "main", "abs_path": "/home/ubuntu/fastapi/main.py", @@ -313,10 +293,8 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", - "in_app": False, }, ], [ @@ -326,11 +304,9 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "module": "fastapi.routing", "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", - "in_app": False, }, ], [ @@ -341,7 +317,6 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "module": "fastapi.routing", "abs_path": "/home/ubuntu/fastapi/.venv/lib/python3.10/site-packages/fastapi/routing.py", @@ -354,10 +329,8 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "abs_path": "C:\\Users\\winuser\\AppData\\Roaming\\Python\\Python35\\site-packages\\fastapi\\routing.py", - "in_app": False, }, ], [ @@ -367,11 +340,9 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "module": "fastapi.routing", "abs_path": "/usr/lib/python2.7/dist-packages/fastapi/routing.py", - "in_app": False, }, ], [ @@ -380,7 +351,6 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "abs_path": "/home/ubuntu/fastapi/main.py", }, @@ -392,7 +362,6 @@ def test_parse_invalid_dsn(dsn): }, None, ["main"], - None, { "module": "main", "abs_path": "/home/ubuntu/fastapi/main.py", @@ -405,7 +374,6 @@ def test_parse_invalid_dsn(dsn): }, None, None, - None, { "module": "fastapi.routing", }, @@ -416,7 +384,6 @@ def test_parse_invalid_dsn(dsn): }, ["fastapi"], None, - None, { "module": "fastapi.routing", "in_app": True, @@ -428,65 +395,18 @@ def test_parse_invalid_dsn(dsn): }, None, ["fastapi"], - None, { "module": "fastapi.routing", "in_app": False, }, ], - # with project_root set - [ - { - "module": "main", - "abs_path": "/home/ubuntu/fastapi/main.py", - }, - None, - None, - "/home/ubuntu/fastapi", - { - "module": "main", - "abs_path": "/home/ubuntu/fastapi/main.py", - "in_app": True, - }, - ], - [ - { - "module": "main", - "abs_path": "/home/ubuntu/fastapi/main.py", - }, - ["main"], - None, - "/home/ubuntu/fastapi", - { - "module": "main", - "abs_path": "/home/ubuntu/fastapi/main.py", - "in_app": True, - }, - ], - [ - { - "module": "main", - "abs_path": "/home/ubuntu/fastapi/main.py", - }, - None, - ["main"], - "/home/ubuntu/fastapi", - { - "module": "main", - "abs_path": "/home/ubuntu/fastapi/main.py", - "in_app": False, - }, - ], ], ) -def test_set_in_app_in_frames( - frame, in_app_include, in_app_exclude, project_root, resulting_frame -): +def test_set_in_app_in_frames(frame, in_app_include, in_app_exclude, resulting_frame): new_frames = set_in_app_in_frames( [frame], in_app_include=in_app_include, in_app_exclude=in_app_exclude, - project_root=project_root, ) assert new_frames[0] == resulting_frame