Merge branch 'master' into di-eval-failed-rate-limit

Author: p-datadog

.github/workflows/lock-dependency.yml

@@ -36,6 +36,8 @@ jobs:
       matrix:
         engine:
           # ADD NEW RUBIES HERE
+          - name: ruby
+            version: '3.5'
           - name: ruby
             version: '3.4'
           - name: ruby
@@ -58,6 +60,8 @@ jobs:
             version: '9.3'
           - name: jruby
             version: '9.2'
+          - name: jruby
+            version: '10.0'
     container:
       image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}-gnu-gcc
       env:

.github/workflows/system-tests.yml

@@ -81,7 +81,7 @@ jobs:
         include:
           - weblogs: ""  # All of them
             scenarios: DEFAULT,EVERYTHING_DISABLED,APPSEC_BLOCKING_FULL_DENYLIST,APPSEC_BLOCKING,GRAPHQL_APPSEC,PARAMETRIC
-          - weblogs: rack,rails70
+          - weblogs: rack,rails72
             scenarios: |
               APPSEC_API_SECURITY,
               APPSEC_API_SECURITY_RC,
@@ -111,7 +111,7 @@ jobs:
               TELEMETRY_METRIC_GENERATION_DISABLED
     needs:
       - build
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@09c09a432410992fae600e0b4c4939b481276a7d  # Automated: This reference is automatically updated.
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@2618589543a4c500c44f7cf95f8762ebca898f61  # Automated: This reference is automatically updated.
     secrets: inherit  # zizmor: ignore[secrets-inherit]
     permissions:
       contents: read
@@ -124,7 +124,7 @@ jobs:
       scenarios: ${{ matrix.scenarios }}
       weblogs: ${{ matrix.weblogs }}
       skip_empty_scenarios: true
-      ref: 400b9fc20864170c6f468cbc5161bf7bf2c49bd2  # Automated: This reference is automatically updated.
+      ref: 2618589543a4c500c44f7cf95f8762ebca898f61  # Automated: This reference is automatically updated.
       force_execute: ${{ needs.build.outputs.forced_tests }}
       parametric_job_count: 8
 

.github/workflows/test-macos.yaml

@@ -27,6 +27,7 @@ jobs:
           - '3.2'
           - '3.3'
           - '3.4'
+          - '3.5'
           # ADD NEW RUBIES HERE
     name: Test (${{ matrix.os }}, ${{ matrix.ruby }})
     runs-on: ${{ matrix.os }}

.github/workflows/test-yjit.yaml

@@ -22,6 +22,7 @@ jobs:
           - '3.2'
           - '3.3'
           - '3.4'
+          - '3.5'
           # ADD NEW RUBIES HERE
         rubyopt:
           - '--yjit'

.github/workflows/test.yml

@@ -23,6 +23,15 @@ concurrency:
   cancel-in-progress: "${{ github.ref != 'refs/heads/master' }}"
 
 jobs:
+  # ADD NEW RUBIES HERE
+  ruby-35:
+    name: "Ruby 3.5"
+    uses: ./.github/workflows/_unit_test.yml
+    with:
+      engine: ruby
+      version: "3.5"
+      alias: ruby-35
+
   ruby-34:
     name: "Ruby 3.4"
     uses: ./.github/workflows/_unit_test.yml
@@ -87,6 +96,14 @@ jobs:
       version: "2.5"
       alias: ruby-25
 
+  jruby-100:
+    name: "JRuby 10.0"
+    uses: ./.github/workflows/_unit_test.yml
+    with:
+      engine: jruby
+      version: "10.0"
+      alias: jruby-100
+
   jruby-94:
     name: "JRuby 9.4"
     uses: ./.github/workflows/_unit_test.yml
@@ -127,6 +144,8 @@ jobs:
         DD_SERVICE: dd-trace-rb
         DD_GIT_REPOSITORY_URL: "${{ github.repositoryUrl }}"
     needs:
+      # ADD NEW RUBIES HERE
+      - ruby-35
       - ruby-34
       - ruby-33
       - ruby-32
@@ -135,6 +154,7 @@ jobs:
       - ruby-27
       - ruby-26
       - ruby-25
+      - jruby-100
       - jruby-94
       - jruby-93
       - jruby-92
@@ -171,6 +191,8 @@ jobs:
     name: dd/coverage
     runs-on: ubuntu-24.04
     needs:
+      # ADD NEW RUBIES HERE
+      - ruby-35
       - ruby-34
       - ruby-33
       - ruby-32
@@ -179,6 +201,7 @@ jobs:
       - ruby-27
       - ruby-26
       - ruby-25
+      - jruby-100
       - jruby-94
       - jruby-93
       - jruby-92
@@ -208,6 +231,8 @@ jobs:
     name: Unit Tests (complete)
     runs-on: ubuntu-24.04
     needs:
+      # ADD NEW RUBIES HERE
+      - ruby-35
       - ruby-34
       - ruby-33
       - ruby-32
@@ -216,6 +241,7 @@ jobs:
       - ruby-27
       - ruby-26
       - ruby-25
+      - jruby-100
       - jruby-94
       - jruby-93
       - jruby-92

.github/workflows/update-latest-dependency.yml

@@ -22,6 +22,8 @@ jobs:
       matrix:
         engine:
           # ADD NEW RUBIES HERE
+          - name: ruby
+            version: '3.5'
           - name: ruby
             version: '3.4'
           - name: ruby
@@ -44,6 +46,8 @@ jobs:
             version: '9.3'
           - name: jruby
             version: '9.2'
+          - name: jruby
+            version: '10.0'
     container:
       image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}-gnu-gcc
     steps:

.gitlab-ci.yml

@@ -35,7 +35,7 @@ default:
   parallel:
     matrix:
       # ADD NEW RUBIES HERE
-      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
+      - RUBY_VERSION: ["3.5", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
   script:
     - >
       docker build
@@ -71,7 +71,7 @@ promote-image:
   parallel:
     matrix:
       # ADD NEW RUBIES HERE
-      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
+      - RUBY_VERSION: ["3.5", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
         ARCHITECTURE: ["amd64", "arm64"]
   script:
     - docker pull $RUBY_CUSTOM_IMAGE_BASE/$RUBY_VERSION-$ARCHITECTURE:$CI_PIPELINE_ID
@@ -109,6 +109,8 @@ install-dependencies:
   tags: ["arch:$ARCH"]
   parallel:
     matrix:
+      # ADD NEW RUBIES HERE
+      # TODO: Ruby 3.5 - Not added here yet to avoid increasing SSI OCI image size and adding premature support for 3.5.
       - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
         ARCH: ["amd64", "arm64"]
   stage: package
@@ -141,7 +143,7 @@ requirements_json_test:
 
 configure_system_tests:
   variables:
-    SYSTEM_TESTS_REF: 400b9fc20864170c6f468cbc5161bf7bf2c49bd2 # Automated: This reference is automatically updated.
+    SYSTEM_TESTS_REF: 2618589543a4c500c44f7cf95f8762ebca898f61 # Automated: This reference is automatically updated.
     SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,lib-injection"
 
 save_versions:

.gitlab/Dockerfile-3.5

@@ -0,0 +1 @@
+FROM ghcr.io/datadog/images-rb/engines/ruby:3.5-centos-gcc