Use libdatadog for dotnet (#8186)

NachoEchevarria · claude · web-flow · commit 73f52542943c · 2026-06-18T16:42:08.000+02:00
## Summary of changes Migrate native dependency from DataDog/libdatadog to DataDog/libdatadog-dotnet v1.3.5. ## Reason for change libdatadog-dotnet is a .NET-specific distribution of libdatadog with a minimal feature preset tailored to the needs of the .NET tracer (`profiling`, `crashtracker`, `symbolizer`, `library-config`), resulting in smaller binaries and a more focused build. It drops the FFI modules the tracer doesn't use (`data-pipeline`, `log`, `telemetry`, `ddsketch`, `ffe`). ## Implementation details - Updated build/cmake/FindLibdatadog.cmake: version, download URLs, and SHA256 hashes for all 6 Linux/macOS platform variants - Updated build/vcpkg_local_ports/libdatadog/portfile.cmake: download URL and SHA512 hashes for both Windows variants (x64, x86) - Updated build/vcpkg_local_ports/libdatadog/vcpkg.json: version string to 1.3.5 All download URLs changed from github.com/DataDog/libdatadog to github.com/DataDog/libdatadog-dotnet. ## Test coverage No test changes — this is a dependency version/source update. Existing CI builds and native profiler tests validate the binary compatibility. The v1.3.5 artifacts were additionally verified against official libdatadog v32.0.0 across all 8 platforms: identical package layout and headers, and the exported symbol set is a strict subset (only the intentionally-dropped feature symbols differ — no profiling/crashtracker/library-config/common symbol is missing). ## Other details   --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
diff --git a/.claude/skills/bump-libdatadog/SKILL.md b/.claude/skills/bump-libdatadog/SKILL.md
@@ -9,14 +9,25 @@ description: >-
 
 ## Overview
 
-libdatadog is consumed as prebuilt native binaries from GitHub releases. There are **two independent version pins** that may need updating:
+The native library is consumed as prebuilt binaries from GitHub releases of
+[**`DataDog/libdatadog-dotnet`**](https://github.com/DataDog/libdatadog-dotnet) — the .NET-specific
+distribution of libdatadog (a minimal feature preset: `profiling`, `crashtracker`, `symbolizer`,
+`library-config`). This is **not** upstream `DataDog/libdatadog`.
+
+> **Version scheme:** the pinned version is libdatadog-dotnet's **own** release version (e.g. `v1.3.5`),
+> which is distinct from the upstream libdatadog version it is built from (tracked by `LIBDATADOG_VERSION`
+> in that repo — e.g. libdatadog-dotnet `v1.3.5` is built from upstream libdatadog `v32.0.0`). Pin the
+> **libdatadog-dotnet** version here, not the upstream one.
+
+There are **two version pins** to update, both from the same libdatadog-dotnet release:
 
 | Platform | File | Hash type | Version format |
 |----------|------|-----------|----------------|
 | Linux/macOS | `build/cmake/FindLibdatadog.cmake` | SHA-256 | `v<MAJOR>.<MINOR>.<PATCH>` |
 | Windows | `build/vcpkg_local_ports/libdatadog/vcpkg.json` + `portfile.cmake` | SHA-512 | `<MAJOR>.<MINOR>.<PATCH>` (no `v` prefix) |
 
-These versions can differ (Windows may lag behind Linux/macOS). Confirm with the user which platforms to update.
+A libdatadog-dotnet release builds all 8 platform artifacts together, so the two pins should normally
+move to the **same** version in lockstep. Confirm with the user if they intend otherwise.
 
 ## Files to Modify
 
@@ -55,21 +66,21 @@ Artifact filenames:
 
 Ask the user for the target version, or check the latest release:
 ```
-https://github.com/DataDog/libdatadog/releases
+https://github.com/DataDog/libdatadog-dotnet/releases
 ```
 
 ### Step 2: Get hashes from the release page
 
 SHA-256 and SHA-512 checksums are published directly in the GitHub release notes. Either:
 
-1. Visit `https://github.com/DataDog/libdatadog/releases/tag/v<VERSION>` and copy from the checksums sections, or
+1. Visit `https://github.com/DataDog/libdatadog-dotnet/releases/tag/v<VERSION>` and copy from the checksums sections, or
 2. Run the helper script which fetches them via the GitHub API:
 
 ```bash
 bash .claude/skills/bump-libdatadog/scripts/fetch-release-hashes.sh <VERSION>
 ```
 
-Where `<VERSION>` is without the `v` prefix (e.g. `33.0.0`).
+Where `<VERSION>` is without the `v` prefix (e.g. `1.3.5`).
 
 The release notes contain:
 - **SHA256 checksums** section → for `FindLibdatadog.cmake` (6 Linux/macOS artifacts)
@@ -110,10 +121,16 @@ These don't contain version strings but may need refreshing after a bump if the
 
 CI will fail if the symbol list changes — re-run the Alpine symbol validation step and accept the new snapshot.
 
+Because libdatadog-dotnet ships a reduced feature set (no `data-pipeline`, `log`, `telemetry`,
+`ddsketch`, or `ffe`), its exported symbols are a strict subset of upstream libdatadog — so these
+snapshots reflect that smaller set. The glibc cap in `Build.Profiler.Steps.cs`
+(`libdatadog_profiling` ≤ 2.15 on x64, ≤ 2.17 on arm64) still applies and is unchanged by the source
+switch — libdatadog-dotnet x64 builds are capped at GLIBC 2.15, same as upstream.
+
 ## Optional Updates (doc-comment SHAs)
 
-Several files under `tracer/src/Datadog.Trace/LibDatadog/` have XML doc comments linking to a specific libdatadog git SHA (e.g. `60583218a8de6768f67d04fcd5bc6443f67f516b`). These are informational only and can be updated for traceability:
-- `VecU8.cs`, `ByteSlice.cs`, `CharSlice.cs`, `Error.cs`
+Several files under `tracer/src/Datadog.Trace/LibDatadog/` have XML doc comments linking to a specific upstream libdatadog git SHA (e.g. `60583218a8de6768f67d04fcd5bc6443f67f516b`). These are informational only and can be updated for traceability (use the upstream SHA the libdatadog-dotnet release was built from):
+- `VecU8.cs`, `CharSlice.cs`, `Error.cs`
 - `ServiceDiscovery/ResultTag.cs`, `ServiceDiscovery/TracerMemfdHandleResult.cs`
 
 ## Related Files (no changes needed, but useful context)
@@ -127,7 +144,7 @@ Several files under `tracer/src/Datadog.Trace/LibDatadog/` have XML doc comments
 
 ## Important Notes
 
-- The CMake file uses **SHA-256** hashes; the vcpkg portfile uses **SHA-512** hashes. Both are published in the GitHub release notes.
-- The CMake version has a `v` prefix (`v32.0.0`); vcpkg does not (`30.0.0`).
+- The CMake file uses **SHA-256** hashes; the vcpkg portfile uses **SHA-512** hashes. Both are published in the libdatadog-dotnet GitHub release notes (under `## Checksums`).
+- The CMake version has a `v` prefix (`v1.3.5`); vcpkg does not (`1.3.5`).
 - If a release doesn't have all platform artifacts, the bump may need to wait or be partial.
 - After bumping, CI will validate the hashes on all platforms. Hash mismatches cause clear build failures.
diff --git a/.claude/skills/bump-libdatadog/scripts/fetch-release-hashes.sh b/.claude/skills/bump-libdatadog/scripts/fetch-release-hashes.sh
@@ -1,31 +1,39 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Fetches SHA-256 and SHA-512 checksums from a libdatadog GitHub release page.
+# Fetches SHA-256 and SHA-512 checksums from a libdatadog-dotnet GitHub release.
 # Usage: ./fetch-release-hashes.sh <VERSION>
-# Example: ./fetch-release-hashes.sh 33.0.0
+# Example: ./fetch-release-hashes.sh 1.3.5
 #
 # The version should NOT include the 'v' prefix.
 # Checksums are published in the release notes — no need to download artifacts.
+#
+# NOTE: dd-trace-dotnet consumes the .NET-specific distribution
+# DataDog/libdatadog-dotnet, NOT upstream DataDog/libdatadog. The release
+# version here (e.g. 1.3.5) is libdatadog-dotnet's own version, which is
+# distinct from the upstream libdatadog version it is built from.
 
-VERSION="${1:?Usage: $0 <VERSION> (e.g. 33.0.0)}"
-RELEASE_URL="https://api.github.com/repos/DataDog/libdatadog/releases/tags/v${VERSION}"
+VERSION="${1:?Usage: $0 <VERSION> (e.g. 1.3.5)}"
+RELEASE_URL="https://api.github.com/repos/DataDog/libdatadog-dotnet/releases/tags/v${VERSION}"
 
 echo "============================================"
-echo "libdatadog v${VERSION} — Fetching checksums"
+echo "libdatadog-dotnet v${VERSION} — Fetching checksums"
 echo "============================================"
 echo ""
 
 BODY=$(curl -fsSL "$RELEASE_URL" | jq -r '.body')
 
+# The release body lists both SHA256 and SHA512 checksums. Rather than depend on
+# the exact section headings, split by hash length: SHA-256 is 64 hex chars,
+# SHA-512 is 128. This is robust to release-note formatting changes.
 echo ">>> SHA-256 checksums (for build/cmake/FindLibdatadog.cmake) <<<"
 echo ""
-echo "$BODY" | sed -n '/^## SHA256 checksums/,/^## /{/^```$/d;/^## /d;/^$/d;p}'
+echo "$BODY" | grep -E '^[0-9a-f]{64} libdatadog-' || echo "(none found — check release notes format)"
 echo ""
 
 echo ">>> SHA-512 checksums (for build/vcpkg_local_ports/libdatadog/portfile.cmake) <<<"
 echo ""
-echo "$BODY" | sed -n '/^## SHA512 checksums/,/^---/{/^```$/d;/^---/d;/^## /d;/^$/d;p}'
+echo "$BODY" | grep -E '^[0-9a-f]{128} libdatadog-' || echo "(none found — check release notes format)"
 echo ""
 
 echo "============================================"
diff --git a/build/cmake/FindLibdatadog.cmake b/build/cmake/FindLibdatadog.cmake
@@ -4,18 +4,18 @@ endif()
 
 include(FetchContent)
 
-set(LIBDATADOG_VERSION "v32.0.0" CACHE STRING "libdatadog version")
+set(LIBDATADOG_VERSION "v1.3.5" CACHE STRING "libdatadog version")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     # For Darwin, we'll download both architectures and combine them
-    set(SHA256_LIBDATADOG_ARM64 "3f87294f613290c4946899f02a3944f75d6b6077f156d105bb1a90bbbfeffa9d" CACHE STRING "libdatadog arm64 sha256")
-    set(SHA256_LIBDATADOG_X86_64 "55cd1ccf175aff19380a60b96ff2ce55ff6fb5ceabf15d81de595e9b0c7a9425" CACHE STRING "libdatadog x86_64 sha256")
+    set(SHA256_LIBDATADOG_ARM64 "fee0ed78f0314beb8cecbca1bdfb2d8725d4464dfdfe3a40bad2b4c68ad6f0a7" CACHE STRING "libdatadog arm64 sha256")
+    set(SHA256_LIBDATADOG_X86_64 "66723a9ea8ced3e55c4220a97c6db97693c69b68704b6c85c742d99283cb6650" CACHE STRING "libdatadog x86_64 sha256")
     set(FILE_TO_DOWNLOAD_ARM64 libdatadog-aarch64-apple-darwin.tar.gz)
     set(FILE_TO_DOWNLOAD_X86_64 libdatadog-x86_64-apple-darwin.tar.gz)
 
     # Download ARM64 version
     FetchContent_Declare(libdatadog-install-arm64
-        URL https://github.com/DataDog/libdatadog/releases/download/${LIBDATADOG_VERSION}/${FILE_TO_DOWNLOAD_ARM64}
+        URL https://github.com/DataDog/libdatadog-dotnet/releases/download/${LIBDATADOG_VERSION}/${FILE_TO_DOWNLOAD_ARM64}
         URL_HASH SHA256=${SHA256_LIBDATADOG_ARM64}
         SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libdatadog-install-arm64
     )
@@ -25,7 +25,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 
     # Download x86_64 version
     FetchContent_Declare(libdatadog-install-x86_64
-        URL https://github.com/DataDog/libdatadog/releases/download/${LIBDATADOG_VERSION}/${FILE_TO_DOWNLOAD_X86_64}
+        URL https://github.com/DataDog/libdatadog-dotnet/releases/download/${LIBDATADOG_VERSION}/${FILE_TO_DOWNLOAD_X86_64}
         URL_HASH SHA256=${SHA256_LIBDATADOG_X86_64}
         SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libdatadog-install-x86_64
     )
@@ -62,24 +62,24 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 else()
     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
         if(DEFINED ENV{IsAlpine} AND "$ENV{IsAlpine}" MATCHES "true")
-            set(SHA256_LIBDATADOG "0b9ff32bde3d7f49b2882dd9d1f61d3a1a3b13382e83578b06ec19e38b7a6de0" CACHE STRING "libdatadog sha256")
+            set(SHA256_LIBDATADOG "670236a83e56f45a1b01589656d71d2981bb284dd29f6c62c52cafe6c4733adf" CACHE STRING "libdatadog sha256")
             set(FILE_TO_DOWNLOAD libdatadog-aarch64-alpine-linux-musl.tar.gz)
         else()
-            set(SHA256_LIBDATADOG "9b7a0551ff9161983635d5890558d3e5ad4eaa9910f92fa850872c9e80d84a8f" CACHE STRING "libdatadog sha256")
+            set(SHA256_LIBDATADOG "2f0b603751b0633c0c012dcfb04361ac1e338c495098d846e35eaa41d823dc5a" CACHE STRING "libdatadog sha256")
             set(FILE_TO_DOWNLOAD libdatadog-aarch64-unknown-linux-gnu.tar.gz)
         endif()
     else()
         if(DEFINED ENV{IsAlpine} AND "$ENV{IsAlpine}" MATCHES "true")
-            set(SHA256_LIBDATADOG "297125a1632a975147951d17735574975e9a6c0904454eb71d24142f2616ab30" CACHE STRING "libdatadog sha256")
+            set(SHA256_LIBDATADOG "0937a1fdcc34b309386be8d05eef8faed0e0b3f5fb71549d4b7d2c55de17d6ec" CACHE STRING "libdatadog sha256")
             set(FILE_TO_DOWNLOAD libdatadog-${CMAKE_SYSTEM_PROCESSOR}-alpine-linux-musl.tar.gz)
         else()
-            set(SHA256_LIBDATADOG "83a347fd2050cc485a9b3112707867085d27522efe5051fb3a2fb1fef18d5fd3" CACHE STRING "libdatadog sha256")
+            set(SHA256_LIBDATADOG "7e8d9639f3b82ae31deadce2b3ce0a080eff5c4d0b1660f49a7d84b0243d3456" CACHE STRING "libdatadog sha256")
             set(FILE_TO_DOWNLOAD libdatadog-${CMAKE_SYSTEM_PROCESSOR}-unknown-linux-gnu.tar.gz)
         endif()
     endif()
 
     FetchContent_Declare(libdatadog-install
-        URL https://github.com/DataDog/libdatadog/releases/download/${LIBDATADOG_VERSION}/${FILE_TO_DOWNLOAD}
+        URL https://github.com/DataDog/libdatadog-dotnet/releases/download/${LIBDATADOG_VERSION}/${FILE_TO_DOWNLOAD}
         URL_HASH SHA256=${SHA256_LIBDATADOG}
         SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libdatadog-install
     )
diff --git a/build/vcpkg_local_ports/libdatadog/portfile.cmake b/build/vcpkg_local_ports/libdatadog/portfile.cmake
@@ -3,19 +3,19 @@ set(LIBDATADOG_VERSION ${VERSION})
 if(TARGET_TRIPLET STREQUAL "x64-windows" OR
    TARGET_TRIPLET STREQUAL "x64-windows-static")
     set(PLATFORM "x64")
-    set(LIBDATADOG_HASH "ac9020f33f227544f0e66ab40ab854104d7c27459ca02c5e9afb566fc0721e63f36c61f1e9de8f0ba203898b5e75e58b3f3a200e17e23341c41ba6e8744e5c25")
+    set(LIBDATADOG_HASH "3d469fe5cb8b58d9acc7af1ecb378300191cccf3260c60ec35b3fbcf58f2746dda579bbe20500f389ac26496a8b4fa54036850bfb40a3acdeba6153f593cbf37")
 elseif(TARGET_TRIPLET STREQUAL "x86-windows" OR
        TARGET_TRIPLET STREQUAL "x86-windows-static")
     set(PLATFORM "x86")
-    set(LIBDATADOG_HASH "f8853437a2e70f003bab4abede8bed5ac0c1e98134b59d7af7f7ef8e466fccb9e070be887fc915850765fc0a1868bed748b6610fbd52791bf06ddf008d0a898c")
+    set(LIBDATADOG_HASH "eb867dd50d6d9080d73840c12bf9791efa8e1b5999fc117525b8adf0b629d50b55719cc07693a98986a1506321612288e996bf9d5272d53545f9750fecb6c02d")
 else()
     message(FATAL_ERROR "Unsupported triplet: ${TARGET_TRIPLET}")
 endif()
 
 # Define the version and download URL for the prebuilt binaries
 set(LIBDATADOG_FILENAME "libdatadog-${PLATFORM}-windows")
 set(LIBDATADOG_ARTIFACT "${LIBDATADOG_FILENAME}.zip")
-set(LIBDATADOG_URL "https://github.com/DataDog/libdatadog/releases/download/v${LIBDATADOG_VERSION}/${LIBDATADOG_ARTIFACT}")
+set(LIBDATADOG_URL "https://github.com/DataDog/libdatadog-dotnet/releases/download/v${LIBDATADOG_VERSION}/${LIBDATADOG_ARTIFACT}")
 
 # Download and extract the prebuilt binaries
 vcpkg_download_distfile(ARCHIVE
diff --git a/build/vcpkg_local_ports/libdatadog/vcpkg.json b/build/vcpkg_local_ports/libdatadog/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "libdatadog",
-    "version-string": "32.0.0",
+    "version-string": "1.3.5",
     "description": "Package providing libdatadog prebuilt binaries for Windows only.",
     "dependencies": []
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "libdatadog",`
`3`		`- "version-string": "32.0.0",`
	`3`	`+ "version-string": "1.3.5",`
`4`	`4`	`"description": "Package providing libdatadog prebuilt binaries for Windows only.",`
`5`	`5`	`"dependencies": []`
`6`	`6`	`}`