Check ping file

Author: gleocadie

tracer/src/Datadog.Trace.Tools.dd_dotnet/CreatedumpCommand.cs

@@ -832,17 +832,17 @@ private unsafe bool SendPing(ICrashReport crashReport, ClrRuntime runtime)
 
                 try
                 {
-                    var filename = Path.GetFileNameWithoutExtension(outputFile);
-                    var directory = Path.GetDirectoryName(outputFile);
-                    var pingFile = $"{filename}-ping.json";
-                    if (directory == null)
-                    {
-                        outputFile = pingFile;
-                    }
-                    else
-                    {
-                        outputFile = Path.Combine(directory, pingFile);
-                    }
+                    Uri? uri;
+                    var hasScheme = Uri.TryCreate(outputFile, UriKind.Absolute, out uri);
+                    var pathToModify = hasScheme ? uri!.LocalPath : outputFile;
+
+                    var directory = Path.GetDirectoryName(pathToModify);
+                    var filename = Path.GetFileNameWithoutExtension(pathToModify);
+                    var pingPath = Path.Combine(directory ?? string.Empty, $"{filename}-ping.json");
+
+                    outputFile = hasScheme
+                        ? new UriBuilder(uri!) { Path = pingPath }.Uri.AbsoluteUri
+                        : pingPath;
 
                     DebugPrint($"Writing crash ping to {outputFile}...");
                     path = Marshal.StringToHGlobalAnsi(outputFile);

tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/CreatedumpTests.cs

@@ -375,7 +375,10 @@ public async Task NativeCrash()
             helper.StandardOutput.Should().Contain(CrashReportExpectedOutput);
         }
 
+        using var pingFile = reportFile.GetPingFile();
+        Output.WriteLine(pingFile.Url);
         File.Exists(reportFile.Path).Should().BeTrue();
+        File.Exists(pingFile.Path).Should().BeTrue();
     }
 
     [SkippableFact]
@@ -426,6 +429,9 @@ public async Task CheckThreadName()
             helper.StandardOutput.Should().Contain(CrashReportExpectedOutput);
         }
 
+        using var pingFile = reportFile.GetPingFile();
+        Output.WriteLine(pingFile.Url);
+        File.Exists(pingFile.Path).Should().BeTrue();
         File.Exists(reportFile.Path).Should().BeTrue();
     }
 
@@ -496,14 +502,19 @@ public async Task OptionallyDoNotReportNonDatadogCrashes(bool mainThread)
 
         await helper.Task;
 
+        using var pingFile = reportFile.GetPingFile();
+        Output.WriteLine(pingFile.Url);
+
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         {
             helper.StandardOutput.Should()
               .NotContain(CrashReportExpectedOutput)
               .And.EndWith("Crashing...\n"); // Making sure there is no additional output
         }
 
-        // TODO check for ping file
+        // Ping should always be present, even if the crash is not reported
+        File.Exists(pingFile.Path).Should().BeTrue();
+        pingFile.GetContent().Should().BeEmpty();
         File.Exists(reportFile.Path).Should().BeFalse();
     }
 
@@ -527,6 +538,8 @@ public async Task ReportNonDatadogCrashes()
             helper.StandardOutput.Should().Contain(CrashReportUnfilteredExpectedOutput);
         }
 
+        using var pingFile = reportFile.GetPingFile();
+        File.Exists(pingFile.Path).Should().BeTrue();
         File.Exists(reportFile.Path).Should().BeTrue();
     }
 
@@ -550,6 +563,9 @@ public async Task MakeSureNonDatadogCrashesAreReportedByDefault()
             helper.StandardOutput.Should().Contain(CrashReportUnfilteredExpectedOutput);
         }
 
+        using var pingFile = reportFile.GetPingFile();
+        Output.WriteLine(pingFile.Url);
+        File.Exists(pingFile.Path).Should().BeTrue();
         File.Exists(reportFile.Path).Should().BeTrue();
     }
 
@@ -568,10 +584,12 @@ public async Task ReportedStacktrace()
 
         await helper.Task;
 
+        using var pingFile = reportFile.GetPingFile();
+        Output.WriteLine(pingFile.Url);
         File.Exists(reportFile.Path).Should().BeTrue();
+        File.Exists(pingFile.Path).Should().BeTrue();
 
         var reader = new StringReader(helper.StandardOutput);
-
         int? mainThreadId = null;
         var expectedCallstack = new List<string>();
 
@@ -597,11 +615,18 @@ public async Task ReportedStacktrace()
         expectedCallstack.Should().HaveCountGreaterOrEqualTo(2);
 
         var report = JObject.Parse(reportFile.GetContent());
+        using var reportAssertionScope = new AssertionScope();
+        reportAssertionScope.AddReportable("Report", report.ToString());
+        ValidateStacktrace(report["error"]["stack"]);
 
-        using var assertionScope = new AssertionScope();
-        assertionScope.AddReportable("Report", report.ToString());
+        using var pingAssertionScope = new AssertionScope();
+        pingAssertionScope.AddReportable("Ping", pingFile.GetContent());
+        var pingFileContent = pingFile.GetContent();
+        var ping = JObject.Parse(pingFileContent);
+        ping["type"].Value<string>().Should().Be("Crash ping");
+        ping["crash_uuid"].Value<string>().Should().NotBeNull();
 
-        ValidateStacktrace(report["error"]["stack"]);
+        pingFileContent.Should().BeEmpty();
 
         void ValidateStacktrace(JToken callstack)
         {
@@ -744,6 +769,11 @@ public TemporaryFile()
             File.Delete(Path);
         }
 
+        private TemporaryFile(string filePath)
+        {
+            Path = filePath;
+        }
+
         public string Path { get; }
 
         public string Url => $"file://{Path}";
@@ -756,5 +786,19 @@ public void Dispose()
         {
             File.Delete(Path);
         }
+
+        public TemporaryFile GetPingFile()
+        {
+            var filename = System.IO.Path.GetFileNameWithoutExtension(Path);
+            var directory = System.IO.Path.GetDirectoryName(Path);
+            var pingFile = $"{filename}-ping.json";
+
+            if (directory == null)
+            {
+                return new TemporaryFile(pingFile);
+            }
+
+            return new TemporaryFile(System.IO.Path.Combine(directory, pingFile));
+        }
     }
 }