Merge remote-tracking branch 'origin/master' into glopes/helper-rust

Author: cataphract

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   # Only clone libdatadog submodule by default
   GIT_SUBMODULE_PATHS: libdatadog
-  DOWNSTREAM_REL_BRANCH:
+  RELIABILITY_ENV_BRANCH:
     value: "master"
     description: "Run a specific datadog-reliability-env branch downstream"
   SYSTEM_TESTS_LIBRARY: php
@@ -94,3 +94,4 @@ package-trigger:
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID
     GIT_SUBMODULE_PATHS: libdatadog appsec/third_party/cpp-base64 appsec/third_party/libddwaf appsec/third_party/msgpack-c
     NIGHTLY_BUILD: $NIGHTLY_BUILD
+    RELIABILITY_ENV_BRANCH: $RELIABILITY_ENV_BRANCH

.gitlab/benchmarks.yml

@@ -33,8 +33,10 @@ workflow:
     interruptible: true
   - if: $CI_COMMIT_REF_NAME == "master"
     when: manual
+    allow_failure: true
     interruptible: false
   - when: manual
+    allow_failure: true
     interruptible: true
 
 .benchmarks-appsec-rules: &benchmarks-appsec-rules
@@ -54,8 +56,10 @@ workflow:
     interruptible: true
   - if: $CI_COMMIT_REF_NAME == "master"
     when: manual
+    allow_failure: true
     interruptible: false
   - when: manual
+    allow_failure: true
     interruptible: true
 
 .benchmarks-tracer-rules: &benchmarks-tracer-rules
@@ -67,8 +71,10 @@ workflow:
     interruptible: true
   - if: $CI_COMMIT_REF_NAME == "master"
     when: manual
+    allow_failure: true
     interruptible: false
   - when: manual
+    allow_failure: true
     interruptible: true
 
 .on-master-or-nightly-benchmarks-or-release-always-and-not-interruptible: &on-master-or-nightly-benchmarks-or-release-always-and-not-interruptible
@@ -79,6 +85,7 @@ workflow:
 .macrobenchmarks-rules: &macrobenchmarks-rules
   - <<: *on-master-or-nightly-benchmarks-or-release-always-and-not-interruptible
   - when: manual
+    allow_failure: true
     interruptible: true
 
 .pre-release-performance-quality-gates-rules: &pre-release-performance-quality-gates-rules

.gitlab/ci-images.yml

@@ -12,6 +12,7 @@ CentOS:
   stage: ci-build
   rules:
     - when: manual
+      allow_failure: true
   needs: []
   tags: ["arch:amd64"]
   timeout: 4h
@@ -40,6 +41,7 @@ Alpine:
   stage: ci-build
   rules:
     - when: manual
+      allow_failure: true
   needs: []
   tags: ["arch:amd64"]
   timeout: 4h
@@ -68,6 +70,7 @@ Bookworm:
   stage: ci-build
   rules:
     - when: manual
+      allow_failure: true
   needs: []
   tags: ["arch:amd64"]
   timeout: 4h
@@ -98,6 +101,7 @@ Buster:
   stage: ci-build
   rules:
     - when: manual
+      allow_failure: true
   needs: []
   tags: ["arch:amd64"]
   timeout: 4h

.gitlab/generate-appsec.php

@@ -433,6 +433,7 @@
       - ARCH: ["amd64", "arm64"]
   rules:
     - when: manual
+      allow_failure: true
   needs: []
   script:
     - cd appsec/tests/integration

.gitlab/generate-common.php

@@ -200,7 +200,7 @@ function dockerhub_login() {
       MONGO_INITDB_ROOT_PASSWORD: test
 
   sqlsrv:
-    name: registry.ddbuild.io/images/mirror/sqlserver:2022-latest
+    name: registry.ddbuild.io/images/mirror/sqlserver:2019-CU15-ubuntu-20.04
     alias: sqlsrv-integration
     variables:
       ACCEPT_EULA: Y

.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,docker-ssi"
+    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,lib-injection,lib-injection-profiling,docker-ssi"
     ALLOW_MULTIPLE_CHILD_LEVELS: "false"
 
 package-oci:
@@ -488,18 +488,32 @@
     IMAGE: "<?= $image ?>"
     ABI_NO: "<?= $abi_no ?>"
     PHP_VERSION: "<?= $major_minor ?>"
-    GIT_STRATEGY: clone
-    GIT_CONFIG_COUNT: 2
-    GIT_CONFIG_KEY_0: core.longpaths
-    GIT_CONFIG_VALUE_0: true
-    GIT_CONFIG_KEY_1: core.symlinks
-    GIT_CONFIG_VALUE_1: true
+    GIT_STRATEGY: none
     CONTAINER_NAME: ${CI_JOB_NAME_SLUG}-${CI_JOB_ID}
   script: |
+    # Aggressive Git cleanup
+    Write-Host "Performing aggressive workspace cleanup with cmd.exe..."
+    cmd /c "if exist .git rmdir /s /q .git" 2>$null
+    cmd /c "for /d %d in (*) do @rmdir /s /q ""%d""" 2>$null
+    cmd /c "del /f /s /q *" 2>$null
+    Write-Host "Cleanup complete."
+
     # Make sure we actually fail if a command fails
     $ErrorActionPreference = 'Stop'
     $PSNativeCommandUseErrorActionPreference = $true
 
+    # Manual git clone with proper config
+    Write-Host "Cloning repository..."
+    git config --global core.longpaths true
+    git config --global core.symlinks true
+    git clone --branch $env:CI_COMMIT_REF_NAME $env:CI_REPOSITORY_URL .
+    git checkout $env:CI_COMMIT_SHA
+
+    # Initialize submodules
+    Write-Host "Initializing submodules..."
+    git submodule update --init --recursive
+    Write-Host "Git setup complete."
+
     mkdir extensions_x86_64
     mkdir extensions_x86_64_debugsymbols
 
@@ -1348,8 +1362,9 @@
   tags: [ "arch:amd64" ]
   rules:
     - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE != "schedule"
-      when: always
+      when: on_success
     - when: manual
+      allow_failure: true
   needs:
     - job: "prepare code"
       artifacts: true
@@ -1394,9 +1409,9 @@
   tags: [ "runner:main", "size:large" ]
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY
-      when: always
+      when: on_success
     - if: $CI_COMMIT_REF_NAME =~ /^ddtrace-/
-      when: always
+      when: on_success
     - when: manual
       allow_failure: true
   needs:
@@ -1422,6 +1437,7 @@
 
 deploy_to_reliability_env:
   stage: shared-pipeline
+  allow_failure: true
   needs:
     - job: "bundle for reliability env"
   rules:

.gitlab/generate-tracer.php

@@ -118,20 +118,33 @@ function before_script_steps($with_docker_auth = false) {
       - PHP_MAJOR_MINOR: <?= json_encode($windows_minor_major_targets) ?>
 
   variables:
-    GIT_CONFIG_COUNT: 2
-    GIT_CONFIG_KEY_0: core.longpaths
-    GIT_CONFIG_VALUE_0: true
-    GIT_CONFIG_KEY_1: core.symlinks
-    GIT_CONFIG_VALUE_1: true
     CONTAINER_NAME: $CI_JOB_NAME_SLUG
-    GIT_STRATEGY: clone
-    GIT_CLEAN_FLAGS: -ffdxq
+    GIT_STRATEGY: none
     IMAGE: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows"
   script: |
+    # Agressive Git cleanup
+    Write-Host "Performing aggressive workspace cleanup with cmd.exe..."
+    cmd /c "if exist .git rmdir /s /q .git" 2>$null
+    cmd /c "for /d %d in (*) do @rmdir /s /q ""%d""" 2>$null
+    cmd /c "del /f /s /q *" 2>$null
+    Write-Host "Cleanup complete."
+
     # Make sure we actually fail if a command fails
     $ErrorActionPreference = 'Stop'
     $PSNativeCommandUseErrorActionPreference = $true
 
+    # Manual git clone with proper config
+    Write-Host "Cloning repository..."
+    git config --global core.longpaths true
+    git config --global core.symlinks true
+    git clone --branch $env:CI_COMMIT_REF_NAME $env:CI_REPOSITORY_URL .
+    git checkout $env:CI_COMMIT_SHA
+
+    # Initialize submodules
+    Write-Host "Initializing submodules..."
+    git submodule update --init --recursive
+    Write-Host "Git setup complete."
+
     mkdir dumps
 
     $names = @('httpbin-integration','request-replayer', $env:CONTAINER_NAME)
@@ -492,7 +505,7 @@ function before_script_steps($with_docker_auth = false) {
     DD_TRACE_GIT_METADATA_ENABLED: "0"
     REPORT_EXIT_STATUS: "1"
     TEST_PHP_JUNIT: "${CI_PROJECT_DIR}/artifacts/tests/php-tests.xml"
-    SKIP_ONLINE_TEST: "1"
+    SKIP_ONLINE_TESTS: "1"
 <?php if (version_compare($major_minor, "7.2", ">=")): /* too expensive */ ?>
     DD_INSTRUMENTATION_TELEMETRY_ENABLED: 0
 <?php endif; ?>
@@ -607,6 +620,9 @@ function before_script_steps($with_docker_auth = false) {
     WAIT_FOR: zookeeper:2181 kafka-integration:9092
     CI_DEBUG_SERVICES: "true"
 <?php endif; ?>
+<?php if (str_contains($target, "sqlsrv")): ?>
+    WAIT_FOR: sqlsrv-integration:1433
+<?php endif; ?>
 <?php if (preg_match("(test_web_symfony_(2|30|33|40))", $target)): ?>
     COMPOSER_VERSION: 2.2
 <?php endif; ?>
@@ -751,3 +767,4 @@ function before_script_steps($with_docker_auth = false) {
     - if: $CI_COMMIT_REF_NAME == "master"
       when: always
     - when: manual
+      allow_failure: true

.gitlab/one-pipeline.locked.yml

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

.gitlab/wait-for-service-ready.sh

@@ -12,6 +12,7 @@ detect_service_type() {
     kafka*) echo "kafka" ;;
     redis*) echo "redis" ;;
     httpbin*) echo "httpbin" ;;
+    sqlsrv-integration) echo "sqlsrv" ;;
     *) echo "generic" ;;
   esac
 }
@@ -77,6 +78,14 @@ wait_for_single_service() {
           return 0
         fi
         ;;
+      sqlsrv)
+        # SQL Server readiness check
+        if timeout 5 bash -c "echo > /dev/tcp/${HOST}/${PORT}" 2>/dev/null; then
+          echo "SQL Server port ${HOST}:${PORT} is open"
+          sleep 5
+          return 0
+        fi
+        ;;
       generic|*)
         # For generic services, just verify port + HTTP 200/health endpoint
         if curl -sf "http://${HOST}:${PORT}/" > /dev/null 2>&1 || curl -sf "http://${HOST}:${PORT}/health" > /dev/null 2>&1; then