Skip to content

gh-103956: fix trace output in case of missing source line - #103958

Merged
serhiy-storchaka merged 8 commits into
python:mainfrom
chgnrdv:trace-fix-lacking-newlines
May 9, 2024
Merged

gh-103956: fix trace output in case of missing source line#103958
serhiy-storchaka merged 8 commits into
python:mainfrom
chgnrdv:trace-fix-lacking-newlines

Conversation

@chgnrdv

@chgnrdvchgnrdv commented Apr 27, 2023•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

@chgnrdv
Fix Trace.localtrace_trace* output in case of missing source line
589f22f
check if call to `linecache.getline` returns non-empty string
otherwise print only filename with lineno
@bedevere-botbedevere-bot mentioned this pull request Apr 27, 2023
Closed
@chgnrdv

chgnrdv commented Apr 27, 2023

Copy link
Copy Markdown
ContributorAuthor

With this fix the output for frames with missing source files will look like this:

 --- modulename: example, funcname: <module>
example.py(2): import signal
--- modulename: _bootstrap, funcname: _find_and_load
<frozen importlib._bootstrap>(1299)
<frozen importlib._bootstrap>(1300)
<frozen importlib._bootstrap>(1302)
--- modulename: _bootstrap, funcname: __init__
<frozen importlib._bootstrap>(325)
<frozen importlib._bootstrap>(326)
--- modulename: _bootstrap, funcname: __enter__
<frozen importlib._bootstrap>(329)
--- modulename: _bootstrap, funcname: _get_module_lock
<frozen importlib._bootstrap>(344)
<frozen importlib._bootstrap>(345)
<frozen importlib._bootstrap>(346)
<frozen importlib._bootstrap>(347)
<frozen importlib._bootstrap>(348)
<frozen importlib._bootstrap>(349)
<frozen importlib._bootstrap>(351)
<frozen importlib._bootstrap>(352)
<frozen importlib._bootstrap>(355)
--- modulename: _bootstrap, funcname: __init__
<frozen importlib._bootstrap>(165)
<frozen importlib._bootstrap>(166)
<frozen importlib._bootstrap>(169)
<frozen importlib._bootstrap>(173)
<frozen importlib._bootstrap>(184)
<frozen importlib._bootstrap>(198)
<frozen importlib._bootstrap>(357)
<frozen importlib._bootstrap>(368)
<frozen importlib._bootstrap>(370)
<frozen importlib._bootstrap>(372)
<frozen importlib._bootstrap>(330)
--- modulename: _bootstrap, funcname: acquire
<frozen importlib._bootstrap>(222)
<frozen importlib._bootstrap>(223)
--- modulename: _bootstrap, funcname: __init__
<frozen importlib._bootstrap>(71)
<frozen importlib._bootstrap>(72)
--- modulename: _bootstrap, funcname: __enter__
<frozen importlib._bootstrap>(82)
<frozen importlib._bootstrap>(83)
<frozen importlib._bootstrap>(224)
<frozen importlib._bootstrap>(228)
<frozen importlib._bootstrap>(229)
<frozen importlib._bootstrap>(236)
<frozen importlib._bootstrap>(237)
<frozen importlib._bootstrap>(238)
<frozen importlib._bootstrap>(228)
<frozen importlib._bootstrap>(223)
--- modulename: _bootstrap, funcname: __exit__
<frozen importlib._bootstrap>(87)
<frozen importlib._bootstrap>(1303)
<frozen importlib._bootstrap>(1304)
<frozen importlib._bootstrap>(1305)
--- modulename: _bootstrap, funcname: _find_and_load_unlocked
<frozen importlib._bootstrap>(1250)
<frozen importlib._bootstrap>(1251)
<frozen importlib._bootstrap>(1252)
<frozen importlib._bootstrap>(1253)
<frozen importlib._bootstrap>(1267)
--- modulename: _bootstrap, funcname: _find_spec
<frozen importlib._bootstrap>(1185)
<frozen importlib._bootstrap>(1186)
<frozen importlib._bootstrap>(1191)
<frozen importlib._bootstrap>(1197)
<frozen importlib._bootstrap>(1198)
<frozen importlib._bootstrap>(1199)
--- modulename: _bootstrap, funcname: __enter__
<frozen importlib._bootstrap>(1157)
<frozen importlib._bootstrap>(1200)
<frozen importlib._bootstrap>(1201)
<frozen importlib._bootstrap>(1207)

serhiy-storchaka
serhiy-storchaka reviewed Feb 2, 2024
View reviewed changes

@serhiy-storchakaserhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add some tests?

@chgnrdv

chgnrdv commented Feb 10, 2024

Copy link
Copy Markdown
ContributorAuthor

It turned out that line tracing isn't tested at all. I will open a separate issue to handle it.

serhiy-storchaka
serhiy-storchaka approved these changes Feb 12, 2024
View reviewed changes

@serhiy-storchakaserhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@serhiy-storchaka
serhiy-storchaka enabled auto-merge (squash) February 12, 2024 11:13
@serhiy-storchakaserhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Feb 12, 2024
@serhiy-storchaka
serhiy-storchaka merged commit 7c87ce7 into python:mainMay 9, 2024
@miss-islington-app

miss-islington-appBot commented May 9, 2024

Copy link
Copy Markdown

Thanks @chgnrdv for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
@chgnrdv@miss-islington
pythongh-103956: Fixtraceoutput in case of missing source line (p…
83f2830
…ythonGH-103958)
Print only filename with lineno if linecache.getline() returns an empty string.
(cherry picked from commit 7c87ce7)
Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
@chgnrdv@miss-islington
pythongh-103956: Fixtraceoutput in case of missing source line (p…
b1b724a
…ythonGH-103958)
Print only filename with lineno if linecache.getline() returns an empty string.
(cherry picked from commit 7c87ce7)
Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>
@bedevere-app

bedevere-appBot commented May 9, 2024

Copy link
Copy Markdown

GH-118832 is a backport of this pull request to the 3.12 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.12 only security fixes label May 9, 2024
@bedevere-app

bedevere-appBot commented May 9, 2024

Copy link
Copy Markdown

GH-118833 is a backport of this pull request to the 3.11 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.11 only security fixes label May 9, 2024
@serhiy-storchakaserhiy-storchaka added the needs backport to 3.13 bugs and security fixes label May 9, 2024
@miss-islington-app

miss-islington-appBot commented May 9, 2024

Copy link
Copy Markdown

Thanks @chgnrdv for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
@chgnrdv@miss-islington
pythongh-103956: Fixtraceoutput in case of missing source line (p…
46dd2a7
…ythonGH-103958)
Print only filename with lineno if linecache.getline() returns an empty string.
(cherry picked from commit 7c87ce7)
Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>
@bedevere-app

bedevere-appBot commented May 9, 2024

Copy link
Copy Markdown

GH-118834 is a backport of this pull request to the 3.13 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label May 9, 2024
@serhiy-storchaka

serhiy-storchaka commented May 9, 2024

Copy link
Copy Markdown
Member

It is too late for the 3.11 backport, but it should now be backported to 3.13.

serhiy-storchaka pushed a commit that referenced this pull request May 9, 2024
@miss-islington@chgnrdv
[3.12]gh-103956: Fixtraceoutput in case of missing source line (G…
0d62676
…H-103958) (GH-118832)
Print only filename with lineno if linecache.getline() returns an empty string.
(cherry picked from commit 7c87ce7)
Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>
serhiy-storchaka pushed a commit that referenced this pull request May 9, 2024
@miss-islington@chgnrdv
[3.13]gh-103956: Fixtraceoutput in case of missing source line (G…
c4b853f
…H-103958) (GH-118834)
Print only filename with lineno if linecache.getline() returns an empty string.
(cherry picked from commit 7c87ce7)
Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>
SonicField pushed a commit to SonicField/cpython that referenced this pull request May 9, 2024
@chgnrdv@SonicField
pythongh-103956: Fixtraceoutput in case of missing source line (p…
e570920
…ythonGH-103958)
Print only filename with lineno if linecache.getline() returns an empty string.
@JelleZijlstraJelleZijlstra mentioned this pull request May 28, 2024
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchakaserhiy-storchakaserhiy-storchaka approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

trace: line tracing output lacks newlines if source lines are not available

3 participants

@chgnrdv@serhiy-storchaka@bedevere-bot