Add Ruby 4.0

.github/workflows/lock-dependency.yml

@@ -37,7 +37,7 @@ jobs:
         engine:
           # ADD NEW RUBIES HERE
           - name: ruby
-            version: "3.5"
+            version: "4.0"
           - name: ruby
             version: "3.4"
           - name: ruby

.github/workflows/test-macos.yaml

@@ -19,14 +19,20 @@ jobs:
         os:
           - macos-15
         ruby:
-          - '3.0'
-          - '3.1'
-          - '3.2'
-          - '3.3'
-          - '3.4'
-          - '3.5'
           # ADD NEW RUBIES HERE
-    name: Test (${{ matrix.os }}, ${{ matrix.ruby }})
+          - version: '4.0'
+            rubygems: '3.7.2'
+          - version: '3.4'
+            rubygems: '3.7.2'
+          - version: '3.3'
+            rubygems: '3.7.2'
+          - version: '3.2'
+            rubygems: '3.7.2'
+          - version: '3.1'
+            rubygems: '3.6.9'
+          - version: '3.0'
+            rubygems: '3.5.23'
+    name: Test (${{ matrix.os }}, ${{ matrix.ruby.version }})
     runs-on: ${{ matrix.os }}
     env:
       SKIP_SIMPLECOV: 1
@@ -39,19 +45,25 @@ jobs:
       # bundler appears to match both prerelease and release rubies when we
       # want the former only. relax the constraint to allow any version for
       # head rubies
-      - if: ${{ matrix.ruby == 'head' }}
+      - if: ${{ matrix.ruby.version == 'head' }}
         run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec
       - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
-          ruby-version: ${{ matrix.ruby }}
-          rubygems: 3.3.26
-          bundler: 2.3.26 # needed to fix issue with steep on Ruby 3.0/3.1
-      # Specify gem version for 3.4 because default version (3.6.0.dev)
-      # leads to an incorrect gem root path
-      - if: ${{ matrix.ruby == '3.3' || matrix.ruby == '3.4' }}
-        run: gem update --system 3.5.21
-      - run: bundle install
-      - run: bundle exec rake spec:main
+          ruby-version: ${{ matrix.ruby.version }}
+      - name: Install rubygems
+        run: gem update --system ${{ matrix.ruby.rubygems }}
+      - name: Get ruby information
+        run: |
+          which ruby
+          ruby --version
+          which gem
+          gem --version
+          which bundle
+          bundle --version
+      - name: Install dependencies
+        run: bundle install
+      - name: Run specs
+        run: bundle exec rake spec:main
 
   complete:
     name: Test macOS (complete)

.github/workflows/test-yjit.yaml

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

.github/workflows/test.yml

@@ -24,6 +24,14 @@ concurrency:
 
 jobs:
   # ADD NEW RUBIES HERE
+  ruby-40:
+    name: "Ruby 4.0"
+    uses: ./.github/workflows/_unit_test.yml
+    with:
+      engine: ruby
+      version: "4.0"
+      alias: ruby-40
+
   ruby-34:
     name: "Ruby 3.4"
     uses: ./.github/workflows/_unit_test.yml
@@ -137,6 +145,7 @@ jobs:
         DD_GIT_REPOSITORY_URL: "${{ github.repositoryUrl }}"
     needs:
       # ADD NEW RUBIES HERE
+      - ruby-40
       - ruby-34
       - ruby-33
       - ruby-32
@@ -183,6 +192,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
       # ADD NEW RUBIES HERE
+      - ruby-40
       - ruby-34
       - ruby-33
       - ruby-32
@@ -222,6 +232,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
       # ADD NEW RUBIES HERE
+      - ruby-40
       - ruby-34
       - ruby-33
       - ruby-32

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

@@ -23,7 +23,7 @@ jobs:
         engine:
           # ADD NEW RUBIES HERE
           - name: ruby
-            version: '3.5'
+            version: '4.0'
           - name: ruby
             version: '3.4'
           - name: ruby

.gitlab-ci.yml

@@ -38,7 +38,7 @@ workflow:
   parallel:
     matrix:
       # ADD NEW RUBIES HERE
-      - RUBY_VERSION: ["3.5", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
+      - RUBY_VERSION: ["4.0", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
   script:
     - >
       docker build
@@ -74,7 +74,7 @@ promote-image:
   parallel:
     matrix:
       # ADD NEW RUBIES HERE
-      - RUBY_VERSION: ["3.5", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
+      - RUBY_VERSION: ["4.0", "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
@@ -113,7 +113,7 @@ install-dependencies:
   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.
+      # TODO: Ruby 4.0 - Not added here yet to avoid increasing SSI OCI image size and adding premature support for 4.0.
       - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
         ARCH: ["amd64", "arm64"]
   stage: package

.gitlab/Dockerfile-4.0

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

.gitlab/install_datadog_deps.rb

@@ -86,6 +86,7 @@
   'msgpack',
   'libdatadog', # libdatadog MUST be installed before datadog to ensure libdatadog native extension is compiled
   'logger',
+  'cgi',
   'datadog',
 ].each do |gem|
   version = gem_version_mapping.delete(gem)