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

"Fix" timeouts in SSI run #6117

Merged
merged 2 commits into from
Oct 8, 2024
Merged

"Fix" timeouts in SSI run #6117

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
07daa30
Add check that the profiler library path is set and exists before cal…
andrewlock Oct 3, 2024
fe1605a
"fix" the issue
andrewlock Oct 4, 2024
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
5 changes: 4 additions & 1 deletion tracer/src/Datadog.Tracer.Native/cor_profiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,10 @@ HRESULT CorProfiler::TryRejitModule(ModuleID module_id, std::vector<ModuleID>& m
if (ShouldRewriteProfilerMaps())
{
auto profiler_library_path = shared::GetEnvironmentValue(WStr("DD_INTERNAL_PROFILING_NATIVE_ENGINE_PATH"));
RewritingPInvokeMaps(module_metadata, WStr("continuous profiler"), profiler_nativemethods_type, profiler_library_path);
if (!profiler_library_path.empty() && fs::exists(profiler_library_path))
{
RewritingPInvokeMaps(module_metadata, WStr("continuous profiler"), profiler_nativemethods_type, profiler_library_path);
}
}

if (IsVersionCompatibilityEnabled())
Expand Down
4 changes: 4 additions & 0 deletions tracer/test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ public void SetEnvironmentVariables(
// see https://github.com/DataDog/dd-trace-dotnet/pull/3579
environmentVariables["DD_INTERNAL_WORKAROUND_77973_ENABLED"] = "1";

// In some scenarios (.NET 6, SSI run enabled) enabling procdump makes
// grabbing a stack trace _crazy_ expensive (10s). Setting this "fixes" it.
environmentVariables["_NO_DEBUG_HEAP"] = "1";

// Set a canary variable that should always be ignored
// and check that it doesn't appear in the logs
environmentVariables["SUPER_SECRET_CANARY"] = "MySuperSecretCanary";
Expand Down
Loading