Skip to content
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

Jump to bottom

[Profiler] Remove unneeded debug logs (to be replaced by frames related metrics) #4493

Merged
merged 2 commits into from
Sep 4, 2023
Merged

[Profiler] Remove unneeded debug logs (to be replaced by frames related metrics) #4493

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
0071867
Remove unneeded debug logs (to be replaced by frames related metrics)
chrisnas Aug 4, 2023
9be9027
Merge remote-tracking branch 'origin' into chrisnas/remove_debug_logs
chrisnas Sep 4, 2023
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
106 changes: 0 additions & 106 deletions profiler/src/ProfilerEngine/Datadog.Profiler.Native/StackSamplerLoop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,6 @@ void StackSamplerLoop::CollectOneThreadStackSample(

UpdateStatistics(hrCollectStack, countCollectedStackFrames);

LogEncounteredStackSnapshotResultStatistics(thisSampleTimestampNanosecs);

// Store stack-walk results into the results buffer:
PersistStackSnapshotResults(pStackSnapshotResult, pThreadInfo, profilingType);
}
Expand Down Expand Up @@ -544,110 +542,6 @@ int64_t StackSamplerLoop::ComputeWallTime(int64_t currentTimestampNs, int64_t pr
}
}

void StackSamplerLoop::LogEncounteredStackSnapshotResultStatistics(int64_t thisSampleTimestampNanosecs, bool useStdOutInsteadOfLog)
{
// TODO: clean-up all this...
//

if ((_lastStackSnapshotResultsStats_LogTimestampNS != 0) && (thisSampleTimestampNanosecs - _lastStackSnapshotResultsStats_LogTimestampNS < StackSamplerLoop_StackSnapshotResultsStats_LogPeriodNS))
{
return;
}

if (!(useStdOutInsteadOfLog || Log::IsDebugEnabled()))
{
return;
}

// We avoid printing the '%' char because every time we pipe the string through a formatter, it gets reduced.
constexpr const char* PercentWord = "Percent";

// Log total stacks collected:
uint64_t timeSinceLastLogMS = (0 == _lastStackSnapshotResultsStats_LogTimestampNS)
? 0
: (thisSampleTimestampNanosecs - _lastStackSnapshotResultsStats_LogTimestampNS) / 1000000;

_lastStackSnapshotResultsStats_LogTimestampNS = thisSampleTimestampNanosecs;

if (useStdOutInsteadOfLog)
{
std::cout << "Total Collected Stacks Count: " << _totalStacksCollectedCount << ". Time since last Stack Snapshot Result-Statistic Log: " << timeSinceLastLogMS << " ms.";
}
else
{
Log::Info("Total Collected Stacks Count: ", _totalStacksCollectedCount,
". Time since last Stack Snapshot Result-Statistic Log: ", timeSinceLastLogMS, " ms.");
}

// Order HResults by their frequency for easier-to-read output:
std::multimap<uint64_t, HRESULT> orderedStackSnapshotHRs;
uint64_t cumHrFreq = 0;
std::unordered_map<HRESULT, uint64_t>::iterator iterHRs = _encounteredStackSnapshotHRs.begin();
while (iterHRs != _encounteredStackSnapshotHRs.end())
{
orderedStackSnapshotHRs.insert(std::pair<uint64_t, HRESULT>(iterHRs->second, iterHRs->first));
cumHrFreq += iterHRs->second;
iterHRs++;
}

// Log Stack Collection HResult frequency distribution:
std::string outBuff;
auto iterOrderedHRs = orderedStackSnapshotHRs.rbegin();
while (iterOrderedHRs != orderedStackSnapshotHRs.rend())
{
uint64_t freq = iterOrderedHRs->first;
HRESULT hr = iterOrderedHRs->second;
std::stringstream builder;
builder << " " << HResultConverter::ToChars(hr) << " (0x" << std::hex << hr << "): " << std::dec << freq << " (" << std::setprecision(2) << (freq * 100.0 / cumHrFreq) << " %)\n";
outBuff.append(builder.str());
iterOrderedHRs++;
}

if (useStdOutInsteadOfLog)
{
std::cout << "Distribution of encountered stack snapshot collection HResults: \n"
<< outBuff.c_str();
}
else
{
Log::Info("Distribution of encountered stack snapshot collection HResults: \n", outBuff.c_str());
}

// Order stack depths by their frame counts for easier-to-read output:
decltype(_encounteredStackSnapshotDepths) orderedStackSnapshotDepths;
uint64_t cumDepthFreq = 0;
auto iterDepths = _encounteredStackSnapshotDepths.begin();
while (iterDepths != _encounteredStackSnapshotDepths.end())
{
orderedStackSnapshotDepths.insert(std::make_pair(iterDepths->first, iterDepths->second));
cumDepthFreq += iterDepths->second;
iterDepths++;
}

// Log Stack Depth frequency distribution:
outBuff.clear();
auto iterOrderedDepths = orderedStackSnapshotDepths.begin();
while (iterOrderedDepths != orderedStackSnapshotDepths.end())
{
auto freq = iterOrderedDepths->second;
auto depth = iterOrderedDepths->first;
std::stringstream builder;
builder << " " << std::setw(4) << depth << " frames: " << freq << " \t\t(" << std::setw(5) << std::setprecision(2) << (freq * 100.0 / cumDepthFreq) << " " << PercentWord << ")\n";
outBuff.append(builder.str());
iterOrderedDepths++;
}

if (useStdOutInsteadOfLog)
{
std::cout << "Distribution of encountered stack snapshot frame counts: \n"
<< outBuff.c_str();
}
else
{
Log::Info("Distribution of encountered stack snapshot frame counts: \n", outBuff.c_str());
}
}

void StackSamplerLoop::PersistStackSnapshotResults(
StackSnapshotResultBuffer const* pSnapshotResult,
std::shared_ptr<ManagedThreadInfo>& pThreadInfo,
Expand Down
1 change: 0 additions & 1 deletion profiler/src/ProfilerEngine/Datadog.Profiler.Native/StackSamplerLoop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ class StackSamplerLoop
int64_t thisSampleTimestampNanosecs,
int64_t duration,
PROFILING_TYPE profilingType);
void LogEncounteredStackSnapshotResultStatistics(int64_t thisSampleTimestampNanosecs, bool useStdOutInsteadOfLog = false);
int64_t ComputeWallTime(int64_t currentTimestampNs, int64_t prevTimestampNs);
static void UpdateSnapshotInfos(StackSnapshotResultBuffer* pStackSnapshotResult, int64_t representedDurationNanosecs, time_t currentUnixTimestamp);
void UpdateStatistics(HRESULT hrCollectStack, std::size_t countCollectedStackFrames);
Expand Down
Loading