From b99deeabe0082049a7f02d5fa964c6c4c5034bb8 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Fri, 16 May 2025 18:46:02 +0200 Subject: [PATCH 1/2] Merge debugger tests Windows. [LANGPLAT-403] --- .azure-pipelines/ultimate-pipeline.yml | 25 +++++++++++++++++-- .../build/_build/Build.VariableGenerations.cs | 4 +-- .../Datadog.Trace/Debugger/LiveDebugger.cs | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index ca77a91c54c8..a831d772f143 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -1728,8 +1728,29 @@ stages: - template: steps/restore-working-directory.yml - - script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType $(debugType) --Optimize $(optimize) --code-coverage-enabled $(CodeCoverageEnabled) - displayName: Run integration tests + - script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType portable --Optimize true --code-coverage-enabled $(CodeCoverageEnabled) + displayName: Run integration tests Portable Optimize(true) + env: + DD_LOGGER_DD_API_KEY: $(ddApiKey) + Filter: $(IntegrationTestFilter) + SampleName: $(IntegrationTestSampleName) + + - script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType portable --Optimize false --code-coverage-enabled $(CodeCoverageEnabled) + displayName: Run integration tests Portable Optimize(false) + env: + DD_LOGGER_DD_API_KEY: $(ddApiKey) + Filter: $(IntegrationTestFilter) + SampleName: $(IntegrationTestSampleName) + + - script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType full --Optimize true --code-coverage-enabled $(CodeCoverageEnabled) + displayName: Run integration tests Full Optimize(true) + env: + DD_LOGGER_DD_API_KEY: $(ddApiKey) + Filter: $(IntegrationTestFilter) + SampleName: $(IntegrationTestSampleName) + + - script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType full --Optimize false --code-coverage-enabled $(CodeCoverageEnabled) + displayName: Run integration tests Full Optimize(false) env: DD_LOGGER_DD_API_KEY: $(ddApiKey) Filter: $(IntegrationTestFilter) diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs index a85e13c891f1..2a44c10a60ac 100644 --- a/tracer/build/_build/Build.VariableGenerations.cs +++ b/tracer/build/_build/Build.VariableGenerations.cs @@ -184,13 +184,11 @@ void GenerateIntegrationTestsDebuggerWindowsMatrix() { foreach (var optimize in optimizations) { - matrix.Add($"{targetPlatform}_{framework}_{debugType}_{optimize}", + matrix.Add($"{targetPlatform}_{framework}", new { framework = framework, targetPlatform = targetPlatform, - debugType = debugType, - optimize = optimize }); } } diff --git a/tracer/src/Datadog.Trace/Debugger/LiveDebugger.cs b/tracer/src/Datadog.Trace/Debugger/LiveDebugger.cs index 74fcedb2221b..44546978b81b 100644 --- a/tracer/src/Datadog.Trace/Debugger/LiveDebugger.cs +++ b/tracer/src/Datadog.Trace/Debugger/LiveDebugger.cs @@ -139,7 +139,7 @@ public async Task InitializeAsync() try { - Log.Information("Live Debugger initialization started"); + Log.Information("Live Debugger initialization started."); _subscriptionManager.SubscribeToChanges(_subscription); DebuggerSnapshotSerializer.SetConfig(Settings); From 7b0ebb64cb05eb2133965b3a2c86fac9572a7755 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Mon, 19 May 2025 10:59:49 +0200 Subject: [PATCH 2/2] Fix. --- .../build/_build/Build.VariableGenerations.cs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs index 2a44c10a60ac..8ba3b8aa63fb 100644 --- a/tracer/build/_build/Build.VariableGenerations.cs +++ b/tracer/build/_build/Build.VariableGenerations.cs @@ -179,19 +179,12 @@ void GenerateIntegrationTestsDebuggerWindowsMatrix() // fails on CI with error "apphost.exe" not found. continue; } - - foreach (var debugType in debugTypes) - { - foreach (var optimize in optimizations) - { - matrix.Add($"{targetPlatform}_{framework}", - new - { - framework = framework, - targetPlatform = targetPlatform, - }); - } - } + matrix.Add($"{targetPlatform}_{framework}", + new + { + framework = framework, + targetPlatform = targetPlatform, + }); } }