Merge remote-tracking branch 'origin/master' into glopes/sidecar-ffi-tel-metrics

Author: cataphract

.github/workflows/prof_correctness.yml

@@ -9,8 +9,9 @@ jobs:
   prof-correctness:
     runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
-        php-version: [8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
+        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
         phpts: [nts, zts]
         include:
           - phpts: zts
@@ -27,6 +28,7 @@ jobs:
         uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
         with:
           php-version: ${{ matrix.php-version }}
+          coverage: none
           extensions: ${{ matrix.extensions }}
         env:
           phpts: ${{ matrix.phpts }}
@@ -108,6 +110,26 @@ jobs:
           USE_ZEND_ALLOC=0 php -d extension=$PWD/target/profiler-release/libdatadog_php_profiling.so profiling/tests/correctness/allocations.php
           unset DD_PROFILING_ALLOCATION_SAMPLING_DISTANCE
 
+      - name: Run allocation_time_combined test (PHP 8.4+)
+        if: fromJSON(matrix.php-version) >= 8.4
+        run: |
+          export DD_PROFILING_LOG_LEVEL=trace
+          export DD_PROFILING_EXPERIMENTAL_FEATURES_ENABLED=1
+          export DD_PROFILING_EXPERIMENTAL_EXCEPTION_SAMPLING_DISTANCE=1
+          export DD_PROFILING_EXCEPTION_MESSAGE_ENABLED=1
+          php -v
+          php -d extension=target/profiler-release/libdatadog_php_profiling.so --ri datadog-profiling
+          mkdir -p profiling/tests/correctness/allocation_time_combined/
+          export DD_PROFILING_OUTPUT_PPROF=$PWD/profiling/tests/correctness/allocation_time_combined/test.pprof
+          export DD_PROFILING_ALLOCATION_ENABLED=yes
+          export DD_PROFILING_ALLOCATION_SAMPLING_DISTANCE=1
+          export DD_PROFILING_WALL_TIME_ENABLED=yes
+          export DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED=no
+          export DD_PROFILING_ENDPOINT_COLLECTION_ENABLED=no
+          export EXECUTION_TIME=5
+          php -d extension=$PWD/target/profiler-release/libdatadog_php_profiling.so profiling/tests/correctness/allocation_time_combined.php
+          unset DD_PROFILING_ALLOCATION_ENABLED DD_PROFILING_ALLOCATION_SAMPLING_DISTANCE DD_PROFILING_WALL_TIME_ENABLED DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED DD_PROFILING_ENDPOINT_COLLECTION_ENABLED EXECUTION_TIME
+
       - name: Run ZTS tests
         if: matrix.phpts == 'zts'
         run: |
@@ -159,6 +181,13 @@ jobs:
           expected_json: profiling/tests/correctness/timeline.json
           pprof_path: profiling/tests/correctness/timeline/
 
+      - name: Check profiler correctness for allocation_time_combined
+        if: fromJSON(matrix.php-version) >= 8.4
+        uses: Datadog/prof-correctness/analyze@main
+        with:
+          expected_json: profiling/tests/correctness/allocation_time_combined.json
+          pprof_path: profiling/tests/correctness/allocation_time_combined/
+
       - name: Check profiler correctness for exceptions ZTS
         if: matrix.phpts == 'zts'
         uses: Datadog/prof-correctness/analyze@main

.gitlab/dockerhub-login.sh

@@ -37,6 +37,25 @@ if ! command -v jq > /dev/null 2>&1; then
   export PATH="/tmp:${PATH}"
 fi
 
+# Install unzip if not already available
+if ! command -v unzip > /dev/null 2>&1; then
+  echo "Installing unzip..."
+  if command -v apt-get > /dev/null 2>&1; then
+    apt-get update -qq && apt-get install -y -qq unzip > /dev/null 2>&1 || {
+      echo "Warning: Failed to install unzip. Skipping Docker Hub authentication." >&2
+      exit 0
+    }
+  elif command -v apk > /dev/null 2>&1; then
+    apk add --no-cache unzip > /dev/null 2>&1 || {
+      echo "Warning: Failed to install unzip. Skipping Docker Hub authentication." >&2
+      exit 0
+    }
+  else
+    echo "Warning: No package manager found to install unzip. Skipping Docker Hub authentication." >&2
+    exit 0
+  fi
+fi
+
 # Install Vault if not already available
 vault_cmd="vault"
 if ! command -v vault > /dev/null 2>&1; then

.gitlab/generate-appsec.php

@@ -146,7 +146,7 @@
     - mkdir -p "${CI_PROJECT_DIR}/artifacts"
     - find appsec/tests/integration/build/test-results -name "*.xml" -exec cp --parents '{}' "${CI_PROJECT_DIR}/artifacts/" \;
     - cp -r appsec/tests/integration/build/test-logs "${CI_PROJECT_DIR}/artifacts/" 2>/dev/null || true
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:appsec"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:appsec"
   artifacts:
     reports:
       junit: "artifacts/**/test-results/**/TEST-*.xml"

.gitlab/generate-package.php

@@ -98,7 +98,7 @@
 # One pipeline job overrides
 configure_system_tests:
   variables:
-    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,lib-injection,lib-injection-profiling"
+    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,lib-injection,lib-injection-profiling,docker-ssi"
     ALLOW_MULTIPLE_CHILD_LEVELS: "false"
 
 package-oci:
@@ -998,7 +998,20 @@
     - sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
     - sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
     - sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-    - yum update -y
+    - |
+      # Retry yum update as vault.centos.org can be slow/unreliable
+      for i in 1 2 3; do
+        if yum update -y; then
+          echo "yum update succeeded on attempt $i"
+          break
+        fi
+        echo "yum update failed (attempt $i/3), retrying in 5 seconds..."
+        sleep 5
+        if [ $i -eq 3 ]; then
+          echo "yum update failed after 3 attempts, exiting"
+          exit 1
+        fi
+      done
 
 "verify debian":
   extends: .verify_job

.gitlab/generate-profiler.php

@@ -58,7 +58,7 @@
   after_script:
     - |
       if [ "${IMAGE_SUFFIX}" != "_centos-7" ]; then
-        .gitlab/upload-junit-to-datadog.sh "test.source.file:profiling"
+        .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:profiling"
       else
         echo "Skipping JUnit upload on CentOS 7 (old glibc/OpenSSL incompatible with datadog-ci)"
       fi

.gitlab/generate-shared.php

@@ -33,7 +33,7 @@
   after_script:
     - mkdir -p tmp/artifacts
     - cp tmp/build_php_components_asan/Testing/Temporary/LastTest.log tmp/artifacts/LastTestASan.log
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:components-rs"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:components-rs"
   artifacts:
     reports:
       junit: "artifacts/*-results.xml"
@@ -57,7 +57,7 @@
   after_script:
     - mkdir -p tmp/artifacts
     - cp tmp/build_php_components_ubsan/Testing/Temporary/LastTest.log tmp/artifacts/LastTestUBSan.log
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:components-rs"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:components-rs"
   artifacts:
     reports:
       junit: "artifacts/*-results.xml"
@@ -85,7 +85,7 @@
   after_script:
     - mkdir -p tmp/artifacts/
     - cp tmp/build-tea-${SWITCH_PHP_VERSION}/Testing/Temporary/LastTest.log tmp/artifacts/LastTest.log
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
   artifacts:
     reports:
       junit: "artifacts/*-results.xml"
@@ -107,7 +107,7 @@
   after_script:
     - mkdir -p tmp/artifacts
     - cp tmp/build*/Testing/Temporary/LastTest.log tmp/artifacts/LastTest.log
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
   artifacts:
     reports:
       junit: "artifacts/*-results.xml"

.gitlab/generate-tracer.php

@@ -23,7 +23,7 @@ function after_script($execute_dir = ".", $has_test_agent = false) {
     - .gitlab/check_test_agent.sh
 <?php endif; ?>
     - .gitlab/collect_artifacts.sh "<?= $execute_dir ?>"
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:src"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src"
 <?php
 }
 

.gitlab/silent-upload-junit-to-datadog.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+OUTFILE=/tmp/datadog-junit-upload.txt
+"$(dirname -- "${BASH_SOURCE[0]}")"/upload-junit-to-datadog.sh "$@" >$OUTFILE 2>&1
+if [[ $? -ne 0 ]]; then
+  cat $OUTFILE
+else
+  grep -E '^\* ' $OUTFILE
+fi

CHANGELOG.md

@@ -1,39 +1,59 @@
 Changelog for older versions can be found in our [release page](https://github.com/DataDog/dd-trace-php/releases).
 
 ## All products
-### Internal
-- bump tracing-core from 0.1.33 to 0.1.35 #3516
+### Fixed
+- Fix packaging apks for new alpine versions #3555
+- Fix http_response_header deprecation in installer #3553
 
 ## Tracer
-### Internal
-- Const-ify some logging thread-local variables #3513
+### Added
+- Support OpenTelemetry Metrics #3487
+- Adds process_tags to the first span of each tracing payload #3566
+- Distributed tracing header injection in HyperF/Swoole environments #3544
+- Stream context integration with HTTP method #3534
+
+### Changed
+- Enable http.endpoint calculation when appsec is explicitly enabled #3556
+
 ### Fixed
-- Avoid curl's `getenv` calls #3528
-- `code_origin_for_spans_enabled` naming inconsistency #3494
-- Add `NULL` guard clause in sidecar reconnect callback #3499
+- Fix panic after bailout in previous request #3537
+- Avoid curl_getenv for unix:// too #3540
+- Correct a bug on prepared statement regarding DBM correlation #3545
+- Fix onclose in cycle collected spans #3587
+- prefer poll() for channel DataDog/libdatadog#1443
+- AWS lambda also can return EACCESS for shm_open DataDog/libdatadog#1446
+
+### Internal
+- bump libdatadog to v25.0.0 #3568
 
 ## Profiler
-### Added
-- Detect parallel threads #3515
 ### Changed
-- Speedup hot path in allocator #3505
+- Optimise allocation profiling for PHP >= 8.4 #3550
+
 ### Fixed
-- Fixed asserting length of INI #3508
+- Fixed bindgen compatibility with PHP 8.5.1+ on macOS #3583
+- Fixed SystemSettings initialization #3579
+- Fixed UB and simplify SystemSettings #3578
+- Fixed crash in upload for DD_EXTERNAL_ENV #3576
+- Fixed crash in ddtrace_get_profiling_context #3563
+- Check long string before allocating #3561
+- Fixed incompatibility with ext-grpc #3542
+- Revert unsafe optimization in memory profiling #3541
+- Cap dependency name length to copied bytes #3538
+
+### Internal
+- Pre-reserve function name buffer #3445
+- Use cached heap in alloc_prof_orig_* functions #3547
 
 ## AppSec
 ### Added
-- Minify blocking json message #3502
-- Add Custom Data Classification #3524
-- Add metrics for extension connections #3527
+- Reduce cardinality of helper.connection_* #3586
+- Added fallback on http.endpoint for schema sampler #3557
+
 ### Fixed
-- Amend string on request abort #3506
-- Fix accessing to incorrectly hardcoded `$_GET` #3501
-- Amend issue where `security_response_id` is being release before displaying it #3493
-- AppSec helper: add send timeouts #3518
-- Minor fixes and improvements to file descriptor reclamation #3526
-- LaravelIntegration: be more defensive #3503
-- Fix `duration_ext` metric #3507
-- Fix segfault iterating mapping #3517
-- Fix double end hook run/segfault when blocking in PHP 7.x #3490
-- Fix `_iovec_writer_flush` and enforce limits on `$_POST` #3495
-- Clear `client_ip` on `request_init` #3496
+- Use abstract namespace on linux #3525
+- Fix spurious munmaps in ZTS mode #3590
+
+### Internal
+- Improvements for appsec libxml2 usage #3564
+- Improve xml parsing in appsec #3558

VERSION

@@ -1 +1 @@
-1.15.0
+1.16.0