feat: publish Linux OTel contexts

.gitlab/build-sidecar.sh

@@ -21,4 +21,5 @@ fi
 
 SHARED=1 PROFILE=tracer-release host_os="${HOST_OS}" ./compile_rust.sh
 cp -v "${CARGO_TARGET_DIR:-target}/tracer-release/libdatadog_php.a" "libdatadog_php_$(uname -m)${suffix}.a"
-objcopy --compress-debug-sections "${CARGO_TARGET_DIR:-target}/tracer-release/libdatadog_php.so" "libdatadog_php_$(uname -m)${suffix}.so"
+output="libdatadog_php_$(uname -m)${suffix}.so"
+objcopy --compress-debug-sections "${CARGO_TARGET_DIR:-target}/tracer-release/libdatadog_php.so" "${output}"

.gitlab/compile_extension.sh

@@ -25,5 +25,10 @@ make -j static &
 wait
 
 # Link extension
-sed -i 's/-export-symbols .*\/datadog\.sym/-Wl,--retain-symbols-file=datadog.sym/g' ${EXTENSION_DIR}/ddtrace.ldflags
+if [ "$(uname -s)" = "Linux" ]; then
+  export_symbols_file="datadog-linux.sym"
+else
+  export_symbols_file="datadog.sym"
+fi
+sed -i -E "s#-export-symbols [^ ]+#-Wl,--retain-symbols-file=${export_symbols_file}#g" "${EXTENSION_DIR}/ddtrace.ldflags"
 cc -shared -Wl,-whole-archive ${MODULES_DIR}/ddtrace.a -Wl,-no-whole-archive $(cat ${EXTENSION_DIR}/ddtrace.ldflags) ${CARGO_TARGET_DIR}/debug/libdatadog_php.a -Wl,-soname -Wl,ddtrace.so -o ${MODULES_DIR}/ddtrace.so

.gitlab/link-tracing-extension.sh

@@ -3,7 +3,11 @@ set -e -o pipefail
 
 suffix="${1:-}"
 
-sed -i 's/-export-symbols .*\/datadog\.sym/-Wl,--retain-symbols-file=datadog.sym/g' "ddtrace_$(uname -m)${suffix}.ldflags"
+export_symbols_file="datadog.sym"
+if [ "$(uname -s)" = "Linux" ]; then
+  export_symbols_file="datadog-linux.sym"
+fi
+sed -i -E "s#-export-symbols [^ ]+#-Wl,--retain-symbols-file=${export_symbols_file}#g" "ddtrace_$(uname -m)${suffix}.ldflags"
 pids=()
 for archive in extensions_$(uname -m)/*.a; do
   (

Cargo.toml

@@ -41,23 +41,30 @@ inherits = "release"
 # #2253 consolidated `anyhow`, `serde`, `tokio` and `tracing` to the workspace
 # level, so they are mirrored here too.
 [workspace.dependencies]
+allocator-api2 = { version = "0.2.21", default-features = false }
 anyhow = { version = "1.0", default-features = false }
-arc-swap = "1.7.1"
-hyper = { version = "1.6", features = [
-  "http1",
-  "client",
-], default-features = false }
-hyper-util = { version = "0.1.10", features = [
-  "http1",
-  "client",
-  "client-legacy",
-] }
+arc-swap = { version = "1.7.1", default-features = false }
+bolero = { version = "0.13.4", default-features = false }
+chrono = { version = "0.4.38", default-features = false }
+clap = { version = "4.3.21", default-features = false }
+criterion = { version = "0.5.1", default-features = true }
+cxx-build = { version = "1.0", default-features = false }
+elf = { version = "0.7", default-features = false }
+futures = { version = "0.3", default-features = false }
+hyper = { version = "1.6", default-features = false }
+hyper-util = { version = "0.1.10", default-features = false }
+io-lifetimes = { version = "1.0", default-features = false }
+libc = { version = "0.2", default-features = true }
 prost-build = { version = "0.14.1", default-features = false }
 protoc-bin-vendored = { version = "3.0.0", default-features = false }
+rustls = { version = "0.23", default-features = false }
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
+syn = { version = "^2", default-features = false }
+tempfile = { version = "3.13", default-features = false, features = ["getrandom"] }
 tokio = { version = "1.36", default-features = false }
 tracing = { version = "0.1", default-features = false }
+uuid = { version = "1.7.0", default-features = false }
 
 [workspace.lints]
 # empty for compat with libdatadog

Makefile

@@ -48,7 +48,7 @@ RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJ
 
 C_FILES = $(shell find components components-rs ext src/dogstatsd tracer zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_FILES = $(shell find tests/ext -name '*.php*' -o -name '*.inc' -o -name '*.json' -o -name '*.yaml' -o -name 'CONFLICTS' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
-RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,datadog-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,libdd-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
+RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,libdd-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,libdd-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-otel-thread-ctx,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
 ALL_OBJECT_FILES = $(C_FILES) $(RUST_FILES) $(BUILD_DIR)/Makefile
 TEST_OPCACHE_FILES = $(shell find tests/opcache -name '*.php*' -o -name '.gitkeep' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_STUB_FILES = $(shell find tests/ext -type d -name 'stubs' -exec find '{}' -type f \; | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
@@ -106,7 +106,7 @@ JUNIT_RESULTS_DIR := $(shell pwd)
 
 all: $(BUILD_DIR)/configure $(SO_FILE)
 
-$(BUILD_DIR)/configure: $(M4_FILES) $(BUILD_DIR)/datadog.sym $(BUILD_DIR)/VERSION
+$(BUILD_DIR)/configure: $(M4_FILES) $(BUILD_DIR)/datadog.sym $(BUILD_DIR)/datadog-linux.sym $(BUILD_DIR)/VERSION
 	$(Q) (cd $(BUILD_DIR); phpize && $(SED_I) 's/\/FAILED/\/\\bFAILED/' $(BUILD_DIR)/run-tests.php) # Fix PHP 5.4 exit code bug when running selected tests (FAILED vs XFAILED)
 
 $(BUILD_DIR)/run-tests.php: $(if $(ASSUME_COMPILED),, $(BUILD_DIR)/configure)

appsec/cmake/ddtrace.cmake

@@ -1,6 +1,12 @@
 include(ExternalProject)
 
-set(CARGO_BUILD_CMD "cargo build")
+if(DD_APPSEC_SSI)
+    set(CARGO_BUILD_CMD "cargo build")
+else()
+    # Only the static library is linked into ddtrace. Building the cdylib as well fails on macOS
+    # because it references symbols that are provided by the final ddtrace extension.
+    set(CARGO_BUILD_CMD "cargo rustc --lib --crate-type staticlib")
+endif()
 set(CARGO_BUILD_ENV "") # Initialize to empty
 
 
@@ -26,9 +32,9 @@ add_custom_target(libdatadog_stamp
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 set(EXPORTS_FILE "${CMAKE_BINARY_DIR}/ddtrace_exports.version")
 add_custom_target(ddtrace_exports
-    COMMAND bash -c "{ echo -e '{\\nglobal:'; sed 's/$/;/' '${CMAKE_SOURCE_DIR}'/../datadog.sym; echo -e 'local:\\n*;\\n};'; } > '${EXPORTS_FILE}'"
+    COMMAND bash -c "{ echo -e '{\\nglobal:'; sed 's/$/;/' '${CMAKE_SOURCE_DIR}'/../datadog-linux.sym; echo -e 'local:\\n*;\\n};'; } > '${EXPORTS_FILE}'"
     BYPRODUCTS ${EXPORTS_FILE}
-    DEPENDS ${CMAKE_SOURCE_DIR}/../datadog.sym
+    DEPENDS ${CMAKE_SOURCE_DIR}/../datadog-linux.sym
     VERBATIM
 )
 elseif(APPLE)
@@ -137,6 +143,9 @@ if (PhpConfig_VERNUM LESS 80100)
     list(REMOVE_ITEM FILES_DDTRACE "${CMAKE_SOURCE_DIR}/../tracer/handlers_fiber.c")
 endif()
 list(REMOVE_ITEM FILES_DDTRACE "${CMAKE_SOURCE_DIR}/../ext/crashtracking_windows.c")
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    list(REMOVE_ITEM FILES_DDTRACE "${CMAKE_SOURCE_DIR}/../tracer/otel_context.c")
+endif()
 
 find_package(CURL REQUIRED)
 message(STATUS "CURL version: ${CURL_VERSION_STRING}")
@@ -153,6 +162,14 @@ target_compile_options(ddtrace PRIVATE -fms-extensions -Wno-microsoft-anon-tag)
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     target_compile_definitions(ddtrace PRIVATE _GNU_SOURCE)
     target_link_options(ddtrace PRIVATE "-Wl,--version-script=${EXPORTS_FILE}")
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64)$")
+        include(CheckCCompilerFlag)
+        check_c_compiler_flag("-mtls-dialect=gnu2" COMPILER_HAS_GNU2_TLS_DIALECT)
+        if(NOT COMPILER_HAS_GNU2_TLS_DIALECT)
+            message(FATAL_ERROR "x86-64 Linux OTel context sharing requires compiler support for -mtls-dialect=gnu2")
+        endif()
+        target_compile_options(ddtrace PRIVATE -mtls-dialect=gnu2)
+    endif()
 elseif(APPLE)
     target_link_options(ddtrace PRIVATE "-exported_symbols_list" "${EXPORTS_FILE}")
 else()

appsec/src/helper/service.hpp

@@ -379,6 +379,8 @@ template <> struct fmt::formatter<ddog_MetricType> {
             return fmt::format_to(ctx.out(), "COUNT");
         case DDOG_METRIC_TYPE_DISTRIBUTION:
             return fmt::format_to(ctx.out(), "DISTRIBUTION");
+        case DDOG_METRIC_TYPE_RATE:
+            return fmt::format_to(ctx.out(), "RATE");
         }
         return fmt::format_to(ctx.out(), "UNKNOWN");
     }