WIP

DataDog · Oct 14, 2024 · f154c5c · f154c5c
1 parent 5daf5db
commit f154c5c
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 17 deletions.
diff --git a/tracer/build/_build/Build.ExplorationTests.cs b/tracer/build/_build/Build.ExplorationTests.cs
@@ -186,7 +186,7 @@ Target RunSnapshotExplorationTests
                         return;
                     }
 
-                    FileSystemTasks.EnsureCleanDirectory(TestLogsDirectory);
+                    // FileSystemTasks.EnsureCleanDirectory(TestLogsDirectory);
                     try
                     {
                         RunSnapshotExplorationTestsInternal();

diff --git a/tracer/build/_build/Build.SnapshotExplorationTest.cs b/tracer/build/_build/Build.SnapshotExplorationTest.cs
@@ -15,6 +15,7 @@ partial class Build
     const string SnapshotExplorationEnabledKey = "DD_INTERNAL_SNAPSHOT_EXPLORATION_TEST_ENABLED";
     const string SnapshotExplorationProbesPathKey = "DD_INTERNAL_SNAPSHOT_EXPLORATION_TEST_PROBES_PATH";
     const string SnapshotExplorationReportPathKey = "DD_INTERNAL_SNAPSHOT_EXPLORATION_TEST_REPORT_PATH";
+    const char SpecialSeparator = '#';
 
     void RunSnapshotExplorationTestsInternal()
     {
@@ -147,11 +148,37 @@ void ProcessNestedScopes(List<IDictionary<string, object>> scopes, string typeNa
                         isStatic = (int.Parse(annotations[0], NumberStyles.HexNumber) & 0x0010) > 0;
                     }
 
-                    var returnType = ls?.GetType().GetProperty("ReturnType")?.GetValue(ls)?.ToString();
-                    csvBuilder.AppendLine($"{typeName},{scope["Name"]},{GetMethodSignature(returnType, (List<IDictionary<string, object>>)scope["Symbols"])},{Guid.NewGuid()},{isStatic}");
+                    var returnType = ls?.GetType().GetProperty("ReturnType", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(ls)?.ToString();
+                    if (TryGetLine(typeName, scope["Name"].ToString(), returnType, (List<IDictionary<string, object>>)scope["Symbols"], Guid.NewGuid(), isStatic, out var line))
+                    {
+                        csvBuilder.AppendLine(line);
+                    }
+                    else
+                    {
+                        Logger.Warning($"Error to add probe info for: {line}");
+                    }
                 }
             }
         }
+    }
+
+    bool TryGetLine(string type, string method, string returnType, List<IDictionary<string, object>> methodParameters, Guid guid, bool isStatic, out string line)
+    {
+        try
+        {
+            var typeName = SanitiseName(type);
+            var methodName = SanitiseName(method);
+            var methodSignature = GetMethodSignature(returnType, methodParameters);
+            line = $"{typeName},{methodName},{SanitiseName(methodSignature)},{Guid.NewGuid()},{isStatic}";
+            return !string.IsNullOrEmpty(typeName) && !string.IsNullOrEmpty(methodName) && !string.IsNullOrEmpty(returnType);
+        }
+        catch (Exception e)
+        {
+            line = $"Type: {type}, Method: {method}";
+            return false;
+        }
+
+        string SanitiseName(string name) => name == null ? string.Empty : name.Replace(',', SpecialSeparator);
 
         string GetMethodSignature(string returnType, List<IDictionary<string, object>> symbols)
         {
@@ -160,14 +187,12 @@ string GetMethodSignature(string returnType, List<IDictionary<string, object>> s
                 return string.Empty;
             }
 
-            const char parametersSeparator = '#';
-
             var parameterTypes =
                 (from symbol in symbols
                  where symbol["SymbolType"].ToString() == "Arg"
                  select symbol["Type"].ToString())
                .ToList();
-            return $"{returnType} ({string.Join(parametersSeparator, parameterTypes)})";
+            return $"{returnType} ({string.Join(SpecialSeparator, parameterTypes)})";
         }
     }
 

diff --git a/tracer/build/_build/BuildVariables.cs b/tracer/build/_build/BuildVariables.cs
@@ -15,13 +15,7 @@ public void AddDebuggerEnvironmentVariables(Dictionary<string, string> envVars,
 
         envVars.Add("DD_DYNAMIC_INSTRUMENTATION_ENABLED", "1");
         envVars.Add("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL", "1");
-
-        if (description.LineProbesEnabled)
-        {
-            envVars.Add("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL_LINES", "1");
-            var testRootPath = description.GetTestTargetPath(ExplorationTestsDirectory, framework, BuildConfiguration);
-            envVars.Add("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL_LINES_PATH", Path.Combine(testRootPath, LineProbesFileName));
-        }
+        // envVars.Add("DD_INTERNAL_WAIT_FOR_DEBUGGER_ATTACH", "1");
 
         if (description.IsSnapshotScenario)
         {
@@ -30,6 +24,12 @@ public void AddDebuggerEnvironmentVariables(Dictionary<string, string> envVars,
             envVars.Add(SnapshotExplorationProbesPathKey, Path.Combine(testRootPath, SnapshotExplorationTestProbesFileName));
             envVars.Add(SnapshotExplorationReportPathKey, Path.Combine(testRootPath, SnapshotExplorationTestReportFileName));
         }
+        else if (description.LineProbesEnabled)
+        {
+            envVars.Add("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL_LINES", "1");
+            var testRootPath = description.GetTestTargetPath(ExplorationTestsDirectory, framework, BuildConfiguration);
+            envVars.Add("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL_LINES_PATH", Path.Combine(testRootPath, LineProbesFileName));
+        }
 
         envVars.Add("COMPlus_DbgEnableMiniDump", "1");
         envVars.Add("COMPlus_DbgMiniDumpType", "4");

diff --git a/tracer/src/Datadog.Trace/ClrProfiler/Instrumentation.cs b/tracer/src/Datadog.Trace/ClrProfiler/Instrumentation.cs
@@ -24,6 +24,7 @@
 using Datadog.Trace.ServiceFabric;
 using Datadog.Trace.Telemetry;
 using Datadog.Trace.Telemetry.Metrics;
+using Datadog.Trace.Util;
 
 namespace Datadog.Trace.ClrProfiler
 {
@@ -548,13 +549,20 @@ private static void InitLiveDebugger(Tracer tracer)
 
             if (debuggerSettings.IsSnapshotExplorationTestEnabled)
             {
+                var liveDebugger = LiveDebuggerFactory.Create(new DiscoveryServiceMock(), RcmSubscriptionManager.Instance, settings, serviceName, tracer.TracerManager.Telemetry, debuggerSettings, tracer.TracerManager.GitMetadataTagsProvider);
+                Log.Debug("Initializing live debugger for snapshot exploration test.");
+                liveDebugger.WithProbesFromFile();
                 Task.Run(
                     async () =>
                     {
-                        var liveDebugger = LiveDebuggerFactory.Create(new DiscoveryServiceMock(), RcmSubscriptionManager.Instance, settings, serviceName, tracer.TracerManager.Telemetry, debuggerSettings, tracer.TracerManager.GitMetadataTagsProvider);
-                        Log.Debug("Initializing live debugger for snapshot exploration test.");
-                        liveDebugger.WithProbesFromFile();
-                        await liveDebugger.InitializeAsync().ConfigureAwait(false);
+                        try
+                        {
+                            await liveDebugger.InitializeAsync().ConfigureAwait(false);
+                        }
+                        catch (Exception ex)
+                        {
+                            Log.Error(ex, "Error initializing live debugger.");
+                        }
                     });
             }
             else