Merge branch 'master' into ayan.khan/stable-session-id-headers

khanayan123 · web-flow · commit 07364ece0c3d · 2026-04-15T10:33:47.000-04:00
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
@@ -42,15 +42,16 @@ jobs:
   main:
     needs:
     - build
-    uses:  DataDog/system-tests/.github/workflows/system-tests.yml@main
+    uses:  DataDog/system-tests/.github/workflows/system-tests.yml@1e5d6b7096279ca43ce4826fda3cc805635b63c1
     secrets:
       DD_API_KEY: ${{ secrets.DD_API_KEY }}
       TEST_OPTIMIZATION_API_KEY: ${{ secrets.DD_API_KEY }}
     permissions:
       contents: read
-      packages: write
+      id-token: write
     with:
       library: cpp_nginx
+      ref: 1e5d6b7096279ca43ce4826fda3cc805635b63c1
       binaries_artifact: binaries
       desired_execution_time: 600  # 10 minutes
       scenarios_groups: ${{ (github.event_name == 'schedule' || github.event_name == 'push') && 'tracer_release' || 'appsec' }}
diff --git a/.gitlab/build-and-test-all.yml b/.gitlab/build-and-test-all.yml
@@ -57,6 +57,7 @@ build-nginx-all:
           - "1.29.6"
           - "1.29.7"
           - "1.29.8"
+          - "1.30.0"
         WAF: ["ON", "OFF"]
 
 build-nginx-rum-all:
@@ -97,6 +98,7 @@ build-nginx-rum-all:
           - "1.29.6"
           - "1.29.7"
           - "1.29.8"
+          - "1.30.0"
         WAF: ["OFF"]
 
 build-ingress-nginx-all:
@@ -301,6 +303,10 @@ test-nginx-all-bis:
         BASE_IMAGE: ["nginx:1.29.8", "nginx:1.29.8-alpine"]
         NGINX_VERSION: ["1.29.8"]
         WAF: ["ON", "OFF"]
+      - ARCH: ["amd64", "arm64"]
+        BASE_IMAGE: ["nginx:1.30.0", "nginx:1.30.0-alpine"]
+        NGINX_VERSION: ["1.30.0"]
+        WAF: ["ON", "OFF"]
       - ARCH: ["amd64", "arm64"]
         BASE_IMAGE: ["amazonlinux:2023.3.20240219.0"]
         NGINX_VERSION: ["1.24.0"]
@@ -432,6 +438,10 @@ test-nginx-rum-all:
         BASE_IMAGE: ["nginx:1.29.8"]
         NGINX_VERSION: ["1.29.8"]
         WAF: ["OFF"]
+      - ARCH: ["amd64", "arm64"]
+        BASE_IMAGE: ["nginx:1.30.0"]
+        NGINX_VERSION: ["1.30.0"]
+        WAF: ["OFF"]
 
 test-ingress-nginx-all:
   extends:
diff --git a/.gitlab/build-and-test-fast.yml b/.gitlab/build-and-test-fast.yml
@@ -63,6 +63,7 @@ build-nginx-fast:
           - "1.27.5"
           - "1.28.3"
           - "1.29.8"
+          - "1.30.0"
         WAF: ["ON", "OFF"]
 
 build-ingress-nginx-fast:
@@ -103,6 +104,7 @@ build-nginx-rum-fast:
           - "1.27.5"
           - "1.28.3"
           - "1.29.8"
+          - "1.30.0"
         WAF: ["OFF"]
 
 test-nginx-fast:
@@ -136,6 +138,10 @@ test-nginx-fast:
         BASE_IMAGE: ["nginx:1.29.8", "nginx:1.29.8-alpine"]
         NGINX_VERSION: ["1.29.8"]
         WAF: ["ON", "OFF"]
+      - ARCH: ["amd64", "arm64"]
+        BASE_IMAGE: ["nginx:1.30.0", "nginx:1.30.0-alpine"]
+        NGINX_VERSION: ["1.30.0"]
+        WAF: ["ON", "OFF"]
       - ARCH: ["amd64", "arm64"]
         BASE_IMAGE: ["amazonlinux:2023.3.20240219.0"]
         NGINX_VERSION: ["1.24.0"]
@@ -198,6 +204,10 @@ test-nginx-rum-fast:
         BASE_IMAGE: ["nginx:1.29.8"]
         NGINX_VERSION: ["1.29.8"]
         WAF: ["OFF"]
+      - ARCH: ["amd64", "arm64"]
+        BASE_IMAGE: ["nginx:1.30.0"]
+        NGINX_VERSION: ["1.30.0"]
+        WAF: ["OFF"]
 
 coverage:
   extends:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 cmake_policy(SET CMP0068 NEW)
 cmake_policy(SET CMP0135 NEW)
 
-set(NGINX_DATADOG_VERSION 1.15.0)
+set(NGINX_DATADOG_VERSION 1.16.0)
 project(ngx_http_datadog_module VERSION ${NGINX_DATADOG_VERSION})
 
 option(NGINX_DATADOG_ASM_ENABLED "Build with libddwaf" ON)
