[Dynamic Instrumentation] Fix line exploration tests (#6089)

## Summary of changes Line exploration tests should run for now only for protobuf
DataDog · Oct 25, 2024 · adc7e8b · adc7e8b
1 parent e448361
commit adc7e8b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml
@@ -3179,11 +3179,11 @@ stages:
 
     - template: steps/restore-working-directory.yml
 
-    - script: tracer\build.cmd SetupExplorationTests -ExplorationTestUseCase $(explorationTestUseCase) -ExplorationTestName $(explorationTestName)
+    - script: tracer\build.cmd SetupExplorationTests --ExplorationTestUseCase $(explorationTestUseCase) --ExplorationTestName $(explorationTestName)
       displayName: SetupExplorationTest $(explorationTestUseCase) $(explorationTestName)
 
-    - script: tracer\build.cmd RunExplorationTests -ExplorationTestUseCase $(explorationTestUseCase) -ExplorationTestName $(explorationTestName)
-      displayName: RunExplorationTest
+    - script: tracer\build.cmd RunExplorationTests --ExplorationTestUseCase $(explorationTestUseCase) --ExplorationTestName $(explorationTestName)
+      displayName: RunExplorationTest $(explorationTestUseCase) $(explorationTestName)
       env:
         DD_LOGGER_DD_API_KEY: $(ddApiKey)
 

diff --git a/tracer/build/_build/Build.ExplorationTests.cs b/tracer/build/_build/Build.ExplorationTests.cs
@@ -266,23 +266,25 @@ void Test(TargetFramework targetFramework, Dictionary<string, string> envVariabl
 
     private void CreateLineProbesIfNeeded()
     {
-        var testDescription = ExplorationTestDescription.GetExplorationTestDescription(global::ExplorationTestName.protobuf);
-
-        if (!testDescription.LineProbesEnabled)
-        {
-            Logger.Information($"Skip line probes creation. The test case '{ExplorationTestName.Value}' does not support line scenario at the moment");
-            return;
-        }
-
+        ExplorationTestDescription testDescription = null;
         if (ExplorationTestName.HasValue)
         {
-            Logger.Information($"Provided exploration test name is {ExplorationTestName}.");
+            testDescription = ExplorationTestDescription.GetExplorationTestDescription(ExplorationTestName.Value);
+            if (!testDescription.LineProbesEnabled)
+            {
+                Logger.Information($"Provided exploration test name is {ExplorationTestName}.");
+                return;
+            }
         }
         else
         {
-            Logger.Information("Exploration test name is not provided. Running protobuf test case");
+            testDescription = ExplorationTestDescription.GetExplorationTestDescription(global::ExplorationTestName.protobuf);
         }
 
+        Logger.Information($"Provided exploration test name is {testDescription.Name}.");
+
+        ExplorationTestDescription.GetAllExplorationTestDescriptions();
+
         var sw = new Stopwatch();
         sw.Start();
 
@@ -470,8 +472,7 @@ string GetTracerAssemblyPath(TargetFramework framework)
             throw new Exception("Can't determined the correct tracer framework version");
         }
 
-        var extension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "dll" : "so";
-        return MonitoringHomeDirectory / tracerFramework / "Datadog.Trace." + extension;
+        return MonitoringHomeDirectory / tracerFramework / "Datadog.Trace.dll";
     }
 
     static string[] GetAllTestAssemblies(string rootPath)

diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs
@@ -52,6 +52,7 @@ void GenerateConditionVariables()
                     "tracer/test/Datadog.Trace.Debugger.IntegrationTests",
                     "tracer/test/test-applications/debugger",
                     "tracer/build/_build/Build.Steps.Debugger.cs",
+                    "tracer/build/_build/Build.ExplorationTests.cs",
                 }, new string[] { });
                 GenerateConditionVariableBasedOnGitChange("isProfilerChanged", new[]
                 {
@@ -324,11 +325,10 @@ void GenerateExplorationTestMatrices()
                     useCases.Add(global::ExplorationTestUseCase.Tracer.ToString());
                 }
 
-                // Debugger exploration tests are currently all broken, so disabling
-                // if (isDebuggerChanged)
-                // {
-                //     useCases.Add(global::ExplorationTestUseCase.Debugger.ToString());
-                // }
+                if (isDebuggerChanged)
+                {
+                    useCases.Add(global::ExplorationTestUseCase.Debugger.ToString());
+                }
 
                 if (isProfilerChanged)
                 {
@@ -348,8 +348,8 @@ void GenerateExplorationTestsWindowsMatrix(IEnumerable<string> useCases)
                     foreach (var testDescription in testDescriptions)
                     {
                         matrix.Add(
-                            $"{explorationTestUseCase}_{testDescription.Name}",
-                            new { explorationTestUseCase = explorationTestUseCase, explorationTestName = testDescription.Name });
+                            $"{explorationTestUseCase}_{testDescription.Name.ToString()}",
+                            new { explorationTestUseCase = explorationTestUseCase, explorationTestName = testDescription.Name.ToString() });
                     }
                 }