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 memory dumps on artifact tests #4906

Merged
merged 10 commits into from
Dec 1, 2023
Merged

Fix memory dumps on artifact tests #4906

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b943972
Fix memory dumps on artifact tests
kevingosse Nov 21, 2023
2e2c158
Update tracer/test/Datadog.Trace.TestHelpers/CustomTestFramework.cs
andrewlock Nov 22, 2023
e67c1ee
Fix styling issue
kevingosse Nov 27, 2023
869f023
Try generating a single dump
kevingosse Nov 27, 2023
8eb31f8
Modify the right test ._.
kevingosse Nov 27, 2023
81d707f
Fix dump path
kevingosse Nov 27, 2023
cf749e4
Add diagnostic messages
kevingosse Nov 30, 2023
85dffdd
Capture the memory dump before disposing
kevingosse Nov 30, 2023
9a1947c
Remove the fake crash
kevingosse Nov 30, 2023
c838d83
Fix the code to move the dumps
kevingosse Nov 30, 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
16 changes: 16 additions & 0 deletions .azure-pipelines/ultimate-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3396,6 +3396,12 @@ stages:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
enable_crash_dumps: true

- publish: tracer/build_data
displayName: Uploading tool_artifacts_tests_windows logs
artifact: _$(System.StageName)_$(Agent.JobName)_logs_$(System.JobAttempt)
condition: succeededOrFailed()
continueOnError: true

- task: PublishTestResults@2
displayName: publish test results
inputs:
Expand Down Expand Up @@ -3500,6 +3506,16 @@ stages:
baseImage: $(baseImage)
command: "BuildAndRunDdDotnetArtifactTests --framework net7.0"

- script: |
sudo chmod -R 644 tracer/build_data/dumps/* || true
displayName: Make dumps uploadable to AzDo
condition: succeededOrFailed()

- publish: tracer/build_data
artifact: _$(System.StageName)_$(Agent.JobName)_logs_$(System.JobAttempt)
condition: succeededOrFailed()
continueOnError: true

- task: PublishTestResults@2
displayName: publish test results
inputs:
Expand Down
16 changes: 16 additions & 0 deletions tracer/test/Datadog.Trace.TestHelpers/CustomTestFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ public CustomTestFramework(IMessageSink messageSink)
: base(messageSink)
{
FluentAssertions.Formatting.Formatter.AddFormatter(new DiffPaneModelFormatter());

Task memoryDumpTask = null;
andrewlock marked this conversation as resolved.
Show resolved Hide resolved

if (bool.Parse(Environment.GetEnvironmentVariable("enable_crash_dumps") ?? "false"))
{
var progress = new Progress<string>(message => messageSink.OnMessage(new DiagnosticMessage(message)));

try
{
MemoryDumpHelper.InitializeAsync(progress).GetAwaiter().GetResult();
}
catch (Exception ex)
{
messageSink.OnMessage(new DiagnosticMessage($"MemoryDumpHelper initialization failed: {ex}"));
}
}
}

public CustomTestFramework(IMessageSink messageSink, Type typeTestedAssembly)
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/CustomTestFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Xunit;
using Xunit.Abstractions;

[assembly: TestFramework("Datadog.Trace.Tools.Runner.ArtifactTests.CustomTestFramework", "Datadog.Trace.Tools.Runner.ArtifactTests")]
[assembly: TestFramework("Datadog.Trace.Tools.dd_dotnet.ArtifactTests.CustomTestFramework", "Datadog.Trace.Tools.dd_dotnet.ArtifactTests")]

namespace Datadog.Trace.Tools.dd_dotnet.ArtifactTests;

Expand Down
2 changes: 2 additions & 0 deletions tracer/test/test-applications/integrations/Samples.Console/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ internal static class Program
{
private static async Task Main(string[] args)
{
Thread.Sleep(Timeout.Infinite); // Look Ma I'm frozen!

Copy link
Member

Choose a reason for hiding this comment

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

Don't forget to remove this afterwards 😅

Suggested change
Thread.Sleep(Timeout.Infinite); // Look Ma I'm frozen!

// Just to make extra sure that the tracer is loaded, if properly configured
_ = WebRequest.CreateHttp("http://localhost");
await Task.Yield();
Expand Down
Loading