diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 950771a97513..0494443444ab 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -1719,8 +1719,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 2aee8878a7ef..fcdb353f026d 100644 --- a/tracer/build/_build/Build.VariableGenerations.cs +++ b/tracer/build/_build/Build.VariableGenerations.cs @@ -250,21 +250,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}_{debugType}_{optimize}", - new - { - framework = framework, - targetPlatform = targetPlatform, - debugType = debugType, - optimize = optimize - }); - } - } + matrix.Add($"{targetPlatform}_{framework}", + new + { + framework = framework, + targetPlatform = targetPlatform, + }); } } 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);