Add support for thread names stack artifacts. #2941
Merged
Conversation
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
wiktork
added
the
update-release-notes
kkeirstead
reviewed
Nov 30, 2022
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/StacksTests.cs
Show resolved
Hide resolved
jander-msft
reviewed
Nov 30, 2022
wiktork
force-pushed
the
dev/wiktork/threadNames
branch
from
51cfb8a to
5ac1855
Compare
jander-msft
previously approved these changes
Dec 1, 2022
jander-msft
reviewed
Dec 1, 2022
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/StacksFormatter.cs
Outdated
Show resolved
Hide resolved
jander-msft
previously approved these changes
Dec 1, 2022
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/StacksTests.cs
Outdated
Show resolved
Hide resolved
…tter.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
wiktork
force-pushed
the
dev/wiktork/threadNames
branch
from
d41b31b to
d76292c
Compare
jander-msft
approved these changes
Dec 2, 2022
wiktork
added
the
servicing-minor
Member
Author
|
/backport to release/7.x |
Contributor
|
Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/3598533708 |
Contributor
|
@wiktork backporting to release/7.x failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/1e0b9f4adce7222327ea033d55478d36384fb330.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/1e0b9f4adce7222327ea033d55478d36384fb330.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Applying: Add support for thread names stack artifacts. (#2941)
Using index info to reconstruct a base tree...
A src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/SpeedScopeStacksFormatter.cs
M src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/StacksFormatter.cs
M src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/TextStacksFormatter.cs
M src/MonitorProfiler/CMakeLists.txt
M src/MonitorProfiler/MainProfiler/MainProfiler.cpp
M src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/StacksTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/StacksTests.cs
CONFLICT (content): Merge conflict in src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/StacksTests.cs
Auto-merging src/MonitorProfiler/MainProfiler/MainProfiler.cpp
Auto-merging src/MonitorProfiler/CMakeLists.txt
CONFLICT (content): Merge conflict in src/MonitorProfiler/CMakeLists.txt
Auto-merging src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/TextStacksFormatter.cs
Auto-merging src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/StacksFormatter.cs
CONFLICT (modify/delete): src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/SpeedScopeStacksFormatter.cs deleted in HEAD and modified in Add support for thread names stack artifacts. (#2941). Version Add support for thread names stack artifacts. (#2941) of src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/SpeedScopeStacksFormatter.cs left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for thread names stack artifacts. (#2941)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 |
Member
Author
|
/backport to release/7.x |
Contributor
|
Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/3603587041 |
github-actions bot
added a commit
that referenced
this pull request
Dec 2, 2022
* Add support for thread names stack artifacts. * Pr feedback * Fix formatting for empty names * Skip unstable test. * Update src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/StacksFormatter.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
wiktork
added a commit
that referenced
this pull request
Dec 2, 2022
* Add support for thread names stack artifacts. * Pr feedback * Fix formatting for empty names * Skip unstable test. * Update src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/StacksFormatter.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Wiktor Kopec <wiktork@microsoft.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
jander-msft
removed
the
servicing-minor
jander-msft
added
the
experimental-feature
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary
Add support for thread names in the callstack artifact.
Release Notes Entry