[ruby] Remove excessive Rails versions

.github/workflows/run-docker-mode.yml

@@ -91,14 +91,14 @@ jobs:
           - rack
           # - sinatra14
           # - sinatra20
-          - sinatra21
+          - sinatra22
           # - rails50
           # - rails51
           # - rails52
           # - rails60
           # - rails61
           # - rails70
-          - rails71
+          - rails72
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -170,14 +170,14 @@ jobs:
           - rack
           # - sinatra14
           # - sinatra20
-          - sinatra21
+          - sinatra22
           # - rails50
           # - rails51
           # - rails52
           # - rails60
           # - rails61
           # - rails70
-          - rails71
+          - rails72
         scenario:
           - DEFAULT
           # - APPSEC_DISABLED
@@ -289,14 +289,14 @@ jobs:
           - rack
           # - sinatra14
           # - sinatra20
-          - sinatra21
+          - sinatra22
           # - rails50
           # - rails51
           # - rails52
           # - rails60
           # - rails61
           # - rails70
-          - rails71
+          - rails72
     runs-on: ubuntu-latest
     needs:
       - test

utils/build/docker/ruby/README.md

@@ -1,26 +1,65 @@
-# System test apps for Ruby
+# Rules
 
-## Updating lockfiles
+We add new weblog **only** when it makes sense. For instance, when it's a next major
+release or an important breaking change that is so significant, that it must be
+addressed as a separate weblog.
 
+In every major release, we try to keep the most recent patch version of the framework,
+with a caveat covered in previous sentence.
 
-```
-# example with rails71
+Otherwise, please use `dd-trace-rb` repository tests to cover a specific permutation.
+
+The Ruby version must be the most recent version of the major release, unless it's
+a specific version is required by the framework.
+
+# Permutations
+
+Some weblogs contain additional enpoints and gem versions that are not present in
+other weblogs. For instance, Rails 7.2 has `/otel_drop_in_default_propagator_extract`
+and `/kafka/` endpoints.
+
+Rails 7.2
+* `/otel_drop_in_default_propagator_extract` with `opentelemetry-{sdk,api}` gem
+* `/otel_drop_in_default_propagator_inject` with `opentelemetry-{sdk,api}` gem
+* `/read_file`
+* `/log/library`
+* `/kafka/*` with `ruby-kafka` gem
+* `/debugger/*`
 
-# get base image to use same ruby version
-cat rails71.Dockerfile | perl -ne '/^FROM (.*)/ and print "$1\n"'
+Rails 8.0
+* `/kafka/*` with `rdkafka` gem
+* `/debugger/*`
 
-# go into app
-cd rails71
+# Updating Gemfile.lock
 
-# conservative lock update (like bundle install)
-docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bundle lock
+In order to update the lockfile, we use the following commands inside the container:
 
-# full lock update (like bundle update)
-docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bundle lock --update
+1. To update the lockfile to the most recent version of the framework, run:
+    ```bash
+    $ bundle lock --update
+    ```
+2. To add the target platform to the lockfile, run one of the following commands:
+    ```bash
+    $ bundle lock --add-platform x86_64-linux-gnu
+    $ bundle lock --add-platform arm64-darwin
+    $ bundle lock --add-platform aarch64-linux-gnu
+    $ bundle lock --add-platform x86_64-darwin
+    ```
 
-# adding a target platform with same deps as local platform
-docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bundle lock --add-platform x86_64-linux-gnu
-docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bundle lock --add-platform aarch64-linux-gnu
-docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bundle lock --add-platform x86_64-darwin
-docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bundle lock --add-platform arm64-darwin
+The ruby version is specified in the `Dockerfile` file. And to run the commands,
+you need to be inside the container, like this:
+
+```bash
+$ cd utils/build/docker/ruby/rails72
+$ docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:3.2 bash
 ```
+
+## Ruby 2.5 tips & tricks
+
+For Ruby 2.5 and Rails 4.2 we need to use bundler < 2.
+
+```bash
+$ docker run --rm -it -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/images-rb/engines/ruby:2.5 bash
+$ root@c262f9bc5bd8: gem install -N bundler:1.17.3
+$ root@c262f9bc5bd8: rm $(ruby -e 'puts Gem.default_specifications_dir')/bundler-2.*.gemspec
+```

utils/build/docker/ruby/graphql23.Dockerfile

@@ -1,24 +1,21 @@
-FROM ghcr.io/datadog/images-rb/engines/ruby:3.2
-
-RUN apt-get update && apt-get install -y nodejs npm
+FROM ghcr.io/datadog/images-rb/engines/ruby:3.4
 
 RUN mkdir -p /app
 WORKDIR /app
 
-# Install gem dependencies prior to copying the entire application
-COPY utils/build/docker/ruby/graphql23/Gemfile .
-COPY utils/build/docker/ruby/graphql23/Gemfile.lock .
-RUN sed -i -e '/gem .ddtrace./d' Gemfile && bundle config set --local without test development && bundle install
+ENV RAILS_ENV="production"
+ENV RAILS_MASTER_KEY="9d319c57ec128e905d9e2ce5742bf2de"
+ENV BUNDLE_WITHOUT="development test"
+ENV DD_TRACE_HEADER_TAGS="user-agent"
+
+COPY utils/build/docker/ruby/rails72/Gemfile* ./
+RUN bundle install
 
 COPY utils/build/docker/ruby/graphql23/ .
+
 COPY utils/build/docker/ruby/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh
 
-ENV DD_TRACE_HEADER_TAGS=user-agent
-ENV RAILS_ENV=production
-ENV RAILS_MASTER_KEY=9d319c57ec128e905d9e2ce5742bf2de
-RUN bundle exec rails db:create db:migrate db:seed
+RUN bundle exec rails db:prepare
 
-RUN echo "#!/bin/bash\nbundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1" > app.sh
-RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/ruby/graphql23/Gemfile

@@ -1,48 +1,17 @@
-source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+source 'https://rubygems.org'
 
-ruby "~> 3.2.0"
+ruby '~> 3.4.0'
+gem 'rails', '~> 7.1.1'
+gem 'sqlite3', '~> 1.4'
+gem 'graphql', '~> 2.3'
+gem 'puma', '~> 6.0'
+gem 'bootsnap', require: false
+# AppSec related dependencies
+gem 'devise', '~> 4.9.0'
 
-# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.1.1"
+group :development do
+  gem 'pry-byebug'
+end
 
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
-
-# Use sqlite3 as the database for Active Record
-gem "sqlite3", "~> 1.4"
-
-# Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 6.0"
-
-# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-gem "importmap-rails"
-
-# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
-gem "turbo-rails"
-
-# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
-gem "stimulus-rails"
-
-# Use Redis adapter to run Action Cable in production
-# gem "redis", "~> 4.0"
-
-# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
-# gem "kredis"
-
-# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
-# gem "bcrypt", "~> 3.1.7"
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
-
-# Reduces boot times through caching; required in config/boot.rb
-gem "bootsnap", require: false
-
-gem 'devise'
-
-gem 'pry'
 gem 'dogstatsd-ruby'
-gem 'ddtrace', '~> 1.0.0.a', require: 'ddtrace/auto_instrument'
-
-gem "graphql", "~> 2.3"
+gem 'datadog', '~> 2.0', require: 'datadog/auto_instrument'