Merge branch 'master' into fix/apms-20099-global-coverage-memory

Author: tonyredondo

.azure-pipelines/ultimate-pipeline.yml

@@ -154,7 +154,7 @@ variables:
   DD_LOGGER_DD_TAGS: test.configuration.job:$(System.JobDisplayName)
   DD_LOGGER_ENABLED: true
   DD_COLLECTOR_CPU_USAGE: true
-  ToolVersion: 3.50.0
+  ToolVersion: 3.51.0
   # .NET SDK performance optimization variables
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1

.gitlab-ci.yml

@@ -2,7 +2,9 @@ stages:
   - build
   - publish
   - package
-  - shared-pipeline
+  - shared-pipeline-build
+  - shared-pipeline-test
+  - shared-pipeline-publish
   - publish
   - benchmarks
   # These benchmarks are running in parallel with the legacy ones
@@ -108,10 +110,72 @@ build:
         exit 1
       }
     - |
-      docker run --rm -m 10240M `
+      try {
+        $computerSystem = Get-CimInstance Win32_ComputerSystem
+        $operatingSystem = Get-CimInstance Win32_OperatingSystem
+        Write-Output ("Runner memory: {0:N1} GB total, {1:N1} GB free" -f ($computerSystem.TotalPhysicalMemory / 1GB), ($operatingSystem.FreePhysicalMemory * 1KB / 1GB))
+        Write-Output "Runner logical processors: $($computerSystem.NumberOfLogicalProcessors)"
+      } catch {
+        Write-Warning "Unable to retrieve runner information: $_"
+      }
+
+      $containerName = "dd-trace-build-$env:CI_JOB_ID"
+      $containerMemoryLimit = 20GB
+      $dockerPath = (Get-Command docker).Source
+      $statsJob = Start-Job -ArgumentList $containerName, $containerMemoryLimit, $dockerPath -ScriptBlock {
+        param($name, $memoryLimit, $docker)
+
+        function ConvertTo-Bytes([string] $value) {
+          if ($value -notmatch '^\s*([0-9]+(?:\.[0-9]+)?)\s*([KMGT]?i?B)\s*$') {
+            return $null
+          }
+
+          $factors = @{
+            B   = 1
+            KB  = 1KB
+            KiB = 1KB
+            MB  = 1MB
+            MiB = 1MB
+            GB  = 1GB
+            GiB = 1GB
+            TB  = 1TB
+            TiB = 1TB
+          }
+
+          return [double]$Matches[1] * $factors[$Matches[2]]
+        }
+
+        $containerSeen = $false
+        $peakBytes = 0.0
+        $peakUsage = "unknown"
+
+        while ($true) {
+          $stats = & $docker stats $name --no-stream --format "{{.MemUsage}}" 2>$null
+          if ($LASTEXITCODE -eq 0 -and $stats) {
+            $containerSeen = $true
+            $usage = ($stats -split '/', 2)[0].Trim()
+            $usageBytes = ConvertTo-Bytes $usage
+            if ($null -ne $usageBytes -and $usageBytes -gt $peakBytes) {
+              $peakBytes = $usageBytes
+              $peakUsage = $usage
+            }
+          } elseif ($containerSeen) {
+            break
+          }
+
+          Start-Sleep -Seconds 5
+        }
+
+        $peakPercent = 100 * $peakBytes / $memoryLimit
+        Write-Output ("Peak container memory: {0} ({1:N1}% of limit)" -f $peakUsage, $peakPercent)
+      }
+
+      # Enable MSVC /MP, capped at the runner's logical processor count.
+      docker run --name $containerName --rm -m 20480M `
         -v "$(Get-Location):c:\mnt" `
         -e CI_JOB_ID=${CI_JOB_ID} `
-        -e ENABLE_MULTIPROCESSOR_COMPILATION=false `
+        -e ENABLE_MULTIPROCESSOR_COMPILATION=true `
+        -e CL_MPCount=16 `
         -e WINDOWS_BUILDER=true `
         -e AWS_NETWORKING=true `
         -e SIGN_WINDOWS=true `
@@ -121,6 +185,19 @@ build:
         -e CI_JOB_NAME_SLUG `
         $env:WINDOWS_BUILD_IMAGE `
         Info Clean BuildTracerHome BuildProfilerHome BuildNativeLoader BuildDdDotnet PublishFleetInstaller PackageTracerHome ZipSymbols SignDlls SignMsi DownloadWinSsiTelemetryForwarder
+      $buildExitCode = $LASTEXITCODE
+
+      Wait-Job $statsJob -Timeout 15 | Out-Null
+      if ($statsJob.State -eq 'Running') {
+        Stop-Job $statsJob
+      }
+
+      Receive-Job $statsJob
+      Remove-Job $statsJob -Force
+
+      if ($buildExitCode -ne 0) {
+        throw "Docker build container exited with code $buildExitCode"
+      }
     - mkdir artifacts-out
     - xcopy /e/s build-out\${CI_JOB_ID}\*.* artifacts-out
     - remove-item -recurse -force build-out\${CI_JOB_ID}
@@ -377,4 +454,4 @@ update_central_configurations_version_range_v2:
   variables:
     LOCAL_CONFIG_PATH: $SUPPORTED_CONFIG_PATH
     LANGUAGE_NAME: "dotnet"
-    SEND_ALIASES: true
+    SEND_ALIASES: true

.gitlab/one-pipeline.locked.yml

@@ -1,5 +1,5 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f9ee2fa697e8b0c440dc9762cc522cafbe295a9671d49067f38258fbee985c74/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.1.0/one-pipeline.yml
 

docs/CHANGELOG.md

@@ -51,6 +51,53 @@
 
 
 
+
+
+## [Release 3.50.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v3.50.0)
+
+## Summary
+
+- [Tracing] Add support for Serilog 4.4.0
+- [Test Optimization] Add support for MSTest 4.3.0
+- [ASM] Handle billing issues for standonly mode
+- [Dynamic Instrumentation] Redact sensitive values in expression dumps
+
+## Changes
+
+### Tracer
+* [OTLP] Removing the path with OtelTracesSpanMetricsEnabled (#8921)
+* Add support for Serilog 4.4.0 (#8917)
+
+### CI Visibility
+* fix(mstest): support ExecuteTestAsync in 4.3 (#8934)
+
+### ASM
+* [ASM] Set _dd.apm.enabled:0 on all spans (#8923)
+* [IAST] Exclude FSharp.* assemblies from dataflow (#8905)
+* [AppSec] Report agentic onboarding marker in configuration telemetry (RFC-1113) (#8920)
+
+### Continuous Profiler
+* [Profiler] Fix possible namepipe-related issues (#8821)
+
+### Debugger
+* [Debugger] Redact sensitive values in expression dumps (#8879)
+
+### Build / Test
+* Move TestOptimizationFeatureTests to TracerInstanceTestCollection (#8880)
+* [Debugger] Deflake instanceof assembly lookup tests (#8885)
+* chore(benchmarks): migrate benchmarking base image to :newest tag (#8924)
+* Mark CheckProfilesSentThroughNamedPipe Flaky (#8932)
+* Forward BP_EXTERNAL_S3_URL through benchmark CI triggers (#8882)
+* make sure parent env variables are not polluting the test env (#8883)
+* Attempt to fix more flake in System.Data.SqlClient (#8899)
+* Forward BP_EXTERNAL_S3_URL explicitly on benchmark triggers (#8908)
+* clean env variables in the correct place (#8918)
+* [Tests] Skip MySQL and Npgsql tests on database timeouts (#8922)
+* Exclude EndServerAsyncAdd from WCF legacy snapshots (#8927)
+* Fix Azure Service Bus sample restore (#8933)
+
+
+[Changes since 3.49.0](https://github.com/DataDog/dd-trace-dotnet/compare/v3.49.0...v3.50.0)
 
 ## [Release 3.49.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v3.49.0)
 

profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Project definition
 # ******************************************************
 
-project("Datadog.Linux.ApiWrapper" VERSION 3.50.0)
+project("Datadog.Linux.ApiWrapper" VERSION 3.51.0)
 
 # ******************************************************
 # Compiler options

profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Project definition
 # ******************************************************
 
-project("Datadog.Profiler.Native.Linux" VERSION 3.50.0)
+project("Datadog.Profiler.Native.Linux" VERSION 3.51.0)
 
 option(RUN_ASAN "Build with Clang Undefined-Behavior Sanitizer" OFF)
 option(RUN_UBSAN "Build with Clang Undefined-Behavior Sanitizer" OFF)
@@ -48,7 +48,12 @@ if (RUN_UBSAN)
 endif()
 
 if (RUN_TSAN)
-    add_compile_options(-fsanitize=thread -g -fno-omit-frame-pointer -DDD_SANITIZERS)
+    # DD_SANITIZE_THREAD (distinct from the general DD_SANITIZERS flag shared
+    # with ASAN/UBSAN) gates TSAN-only annotations (see SpinningMutex.hpp /
+    # ReaderWriterSpinningMutex.hpp) that call into libtsan's __tsan_mutex_* API.
+    # Those symbols only exist when actually linked with -fsanitize=thread, so
+    # this must NOT be defined under ASAN/UBSAN-only builds.
+    add_compile_options(-fsanitize=thread -g -fno-omit-frame-pointer -DDD_SANITIZERS -DDD_SANITIZE_THREAD)
 endif()
 
 if(ISLINUX)

profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc

@@ -62,8 +62,8 @@ END
 
 // ------- version info -------------------------------------------------------
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION             3,50,0,0
-PRODUCTVERSION          3,50,0,0
+FILEVERSION             3,51,0,0
+PRODUCTVERSION          3,51,0,0
 FILEFLAGSMASK           VS_FF_PRERELEASE
 FILEOS                  VOS_NT
 FILETYPE                VFT_DLL
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Datadog"
             VALUE "FileDescription", "Continuous Profiler for .NET Applications"
-            VALUE "FileVersion", "3.50.0.0"
+            VALUE "FileVersion", "3.51.0.0"
             VALUE "InternalName", "Native Profiler Engine"
             VALUE "LegalCopyright", "(c) Datadog 2020-2022"
             VALUE "OriginalFilename", "Datadog.Profiler.Native.dll"
             VALUE "ProductName", "Continuous Profiler for .NET Applications"
-            VALUE "ProductVersion", "3.50.0.0"
+            VALUE "ProductVersion", "3.51.0.0"
         END
     END
     BLOCK "VarFileInfo"