ref(derived_code_mappings): Pass frame filename to find_roots #85931
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
| CodeMapping, | ||
| CodeMappingTreesHelper, | ||
| FrameFilename, | ||
| NeedsExtension, | ||
| UnexpectedPathException, | ||
| UnsupportedFrameFilename, | ||
| convert_stacktrace_frame_path_to_source_path, | ||
|
|
@@ -26,7 +27,7 @@ | |
| from sentry.testutils.silo import assume_test_silo_mode | ||
| from sentry.utils.event_frames import EventFrame | ||
|
|
||
| SENTRY_FILES = [ | ||
| "bin/__init__.py", | ||
| "bin/example1.py", | ||
| "bin/example2.py", | ||
|
|
@@ -37,8 +38,6 @@ | |
| "src/sentry/wsgi.py", | ||
| "src/sentry_plugins/slack/client.py", | ||
| ] | ||
| UNSUPPORTED_FRAME_FILENAMES = [ | ||
| "async https://s1.sentry-cdn.com/_static/dist/sentry/entrypoints/app.js", | ||
| "/gtm.js", # Top source; starts with backslash | ||
|
|
@@ -47,20 +46,22 @@ | |
| "[native code]", | ||
| "O$t", | ||
| "async https://s1.sentry-cdn.com/_static/dist/sentry/entrypoints/app.js", | ||
| "README", # top level file | ||
| "ssl.py", | ||
| # XXX: The following will need to be supported | ||
| "initialization.dart", | ||
| "backburner.js", | ||
| ] | ||
| NO_EXTENSION_FRAME_FILENAMES = [ | ||
| "/foo/bar/baz", # no extension | ||
| ] | ||
|
|
||
|
|
||
| class TestRepoFiles(TestCase): | ||
| """These evaluate which files should be included as part of a repo.""" | ||
|
|
||
| def test_filter_source_code_files(self) -> None: | ||
| source_code_files = filter_source_code_files(SENTRY_FILES) | ||
|
|
||
| assert source_code_files.index("bin/__init__.py") == 0 | ||
| assert source_code_files.index("docs-ui/.eslintrc.js") == 3 | ||
|
|
@@ -109,19 +110,6 @@ def test_buckets_logic() -> None: | |
|
|
||
|
|
||
| class TestFrameFilename: | ||
| def test_frame_filename_repr(self) -> None: | ||
| path = "getsentry/billing/tax/manager.py" | ||
| assert FrameFilename({"filename": path}).__repr__() == f"FrameFilename: {path}" | ||
|
|
@@ -131,6 +119,11 @@ def test_raises_unsupported(self) -> None: | |
| with pytest.raises(UnsupportedFrameFilename): | ||
| FrameFilename({"filename": filepath}) | ||
|
|
||
| def test_raises_no_extension(self) -> None: | ||
| for filepath in NO_EXTENSION_FRAME_FILENAMES: | ||
| with pytest.raises(NeedsExtension): | ||
| FrameFilename({"filename": filepath}) | ||
|
|
||
| @pytest.mark.parametrize( | ||
| "frame_filename, prefix", | ||
| [ | ||
|
|
@@ -167,7 +160,7 @@ def setUp(self) -> None: | |
| self.bar_repo = RepoAndBranch("Test-Organization/bar", "main") | ||
| self.code_mapping_helper = CodeMappingTreesHelper( | ||
| { | ||
| self.foo_repo.name: RepoTree(self.foo_repo, files=SENTRY_FILES), | ||
| self.bar_repo.name: RepoTree(self.bar_repo, files=["sentry/web/urls.py"]), | ||
| } | ||
| ) | ||
|
|
@@ -303,52 +296,76 @@ def test_list_file_matches_multiple(self) -> None: | |
| assert matches == expected_matches | ||
|
|
||
| def test_find_roots_starts_with_period_slash(self) -> None: | ||
|
There was a problem hiding this comment. I don't know why I originally wrote the tests without a filename at the end of the path. It does not make sense to me. From looking at the calls, it is obvious that two full paths are used rather than base dirs: sentry/src/sentry/issues/auto_source_code_config/code_mapping.py Lines 159 to 163 in ed6ca20 |
||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "./app/foo.tsx"}), "static/app/foo.tsx" | ||
| ) | ||
| assert stacktrace_root == "./" | ||
| assert source_path == "static/" | ||
|
|
||
| def test_find_roots_starts_with_period_slash_no_containing_directory(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "./app/foo.tsx"}), "app/foo.tsx" | ||
| ) | ||
| assert stacktrace_root == "./" | ||
| assert source_path == "" | ||
|
|
||
| def test_find_roots_not_matching(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "sentry/foo.py"}), "src/sentry/foo.py" | ||
| ) | ||
| assert stacktrace_root == "sentry/" | ||
| assert source_path == "src/sentry/" | ||
|
|
||
| def test_find_roots_equal(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "source/foo.py"}), "source/foo.py" | ||
| ) | ||
| assert stacktrace_root == "" | ||
| assert source_path == "" | ||
|
|
||
| def test_find_roots_starts_with_period_slash_two_levels(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "./app/foo.tsx"}), "app/foo/app/foo.tsx" | ||
| ) | ||
| assert stacktrace_root == "./" | ||
| assert source_path == "app/foo/" | ||
|
|
||
| def test_find_roots_starts_with_app(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "app:///utils/foo.tsx"}), "utils/foo.tsx" | ||
| ) | ||
| assert stacktrace_root == "app:///" | ||
| assert source_path == "" | ||
|
|
||
| def test_find_roots_starts_with_multiple_dot_dot_slash(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "../../../../../../packages/foo.tsx"}), | ||
| "packages/foo.tsx", | ||
| ) | ||
| assert stacktrace_root == "../../../../../../" | ||
| assert source_path == "" | ||
|
|
||
| def test_find_roots_starts_with_app_dot_dot_slash(self) -> None: | ||
| stacktrace_root, source_path = find_roots( | ||
| FrameFilename({"filename": "app:///../services/foo.tsx"}), | ||
| "services/foo.tsx", | ||
| ) | ||
| assert stacktrace_root == "app:///../" | ||
| assert source_path == "" | ||
|
|
||
| def test_find_roots_bad_stack_path(self) -> None: | ||
| with pytest.raises(UnexpectedPathException): | ||
| find_roots( | ||
| FrameFilename({"filename": "https://yrurlsinyourstackpath.com/"}), | ||
| "sentry/something.py", | ||
| ) | ||
|
|
||
| def test_find_roots_bad_source_path(self) -> None: | ||
| with pytest.raises(UnexpectedPathException): | ||
| find_roots( | ||
| FrameFilename({"filename": "sentry/random.py"}), | ||
| "nothing/something.js", | ||
| ) | ||
|
|
||
|
|
||
| class TestConvertStacktraceFramePathToSourcePath(TestCase): | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A
FrameFilenamehas more information thanstack_path, thus, I can use it withinfind_roots.