Skip to content

[Crashtracker] Add module path to frames #7642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −4
Open

[Crashtracker] Add module path to frames #7642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd14c49
Add module path to frames
gleocadie Oct 10, 2025
5e300de
Update test
gleocadie Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CrashReportingLinux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ std::vector<StackFrame> CrashReportingLinux::GetThreadFrames(int32_t tid, Resolv
stackFrame.isSuspicious = false;

stackFrame.buildId = module->build_id;
stackFrame.modulePath = module->path;

fs::path modulePath(module->path);

Expand Down
1 change: 1 addition & 0 deletions profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/CrashReportingWindows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ std::vector<StackFrame> CrashReportingWindows::GetThreadFrames(int32_t tid, Reso
{
stackFrame.moduleAddress = module->startAddress;
stackFrame.buildId = module->buildId;
stackFrame.modulePath = module->path;

std::ostringstream methodName;
methodName << module->path << "!<unknown>+" << std::hex << (nativeStackFrame.AddrPC.Offset - module->startAddress);
Expand Down
8 changes: 6 additions & 2 deletions profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,15 @@ int32_t CrashReporting::ResolveStacks(int32_t crashingThreadId, ResolveManagedCa
CHECK_RESULT(ddog_crasht_StackFrame_with_sp(&frame, currentFrame.sp));
CHECK_RESULT(ddog_crasht_StackFrame_with_module_base_address(&frame, currentFrame.moduleAddress));
CHECK_RESULT(ddog_crasht_StackFrame_with_relative_address(&frame, relativeAddress));

CHECK_RESULT(ddog_crasht_StackFrame_with_symbol_address(&frame, currentFrame.symbolAddress));

if (!currentFrame.modulePath.empty())
{
CHECK_RESULT(ddog_crasht_StackFrame_with_path(&frame, {currentFrame.modulePath.data(), currentFrame.modulePath.size()}));
}

auto buildId = currentFrame.buildId;
if (buildId.size() != 0)
if (!buildId.empty())
{
CHECK_RESULT(ddog_crasht_StackFrame_with_build_id(&frame, {buildId.data(), buildId.size()}));
#ifdef _WINDOWS
Expand Down
1 change: 1 addition & 0 deletions profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ struct StackFrame
uint64_t moduleAddress;
bool isSuspicious;
std::string_view buildId;
std::string_view modulePath;
};

struct Tag
Expand Down
10 changes: 8 additions & 2 deletions tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/CreatedumpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,9 +630,15 @@ void ValidateStacktrace(JToken callstack)

foreach (var frame in frames)
{
var moduleName = frame["function"].Value<string>().Split('!').First();
string moduleName = null;

if (moduleName.Length > 0 && !moduleName.StartsWith("<") && Path.IsPathRooted(moduleName))
// we do not set the path for managed assemblies.
if (frame.ContainsKey("path"))
{
moduleName = frame["path"].Value<string>();
}

if (!string.IsNullOrEmpty(moduleName) && !moduleName.StartsWith("<") && Path.IsPathRooted(moduleName))
{
if (!validatedModules.Add(moduleName))
{
Expand Down
Loading