Merge branch 'master' into rails-runner

.circleci/images/primary/Dockerfile-2.7.6 → .circleci/images/primary/Dockerfile-2.7.8

@@ -1,6 +1,6 @@
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-FROM ruby:2.7.6
+FROM ruby:2.7.8-bullseye
 
 # Make apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \

.circleci/images/primary/Dockerfile-3.3.0 → .circleci/images/primary/Dockerfile-3.0.7

@@ -1,6 +1,6 @@
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-FROM ruby:3.3.0-bullseye
+FROM ruby:3.0.7-bullseye
 
 # Make apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \

.circleci/images/primary/Dockerfile-3.0.4 → .circleci/images/primary/Dockerfile-3.1.6

@@ -1,6 +1,6 @@
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-FROM ruby:3.0.4-bullseye
+FROM ruby:3.1.6-bookworm
 
 # Make apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -15,7 +15,7 @@ RUN set -ex; \
         apt-get install -y --no-install-recommends \
             git mercurial xvfb \
             locales sudo openssh-client ca-certificates tar gzip parallel \
-            net-tools netcat unzip zip bzip2 gnupg curl wget \
+            net-tools netcat-openbsd unzip zip bzip2 gnupg curl wget \
             tzdata rsync vim less jq; \
         rm -rf /var/lib/apt/lists/*;
 

.circleci/images/primary/Dockerfile-3.1.2 → .circleci/images/primary/Dockerfile-3.2.4

@@ -1,6 +1,6 @@
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-FROM ruby:3.1.2-bullseye
+FROM ruby:3.2.4-bookworm
 
 # Make apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -15,7 +15,7 @@ RUN set -ex; \
         apt-get install -y --no-install-recommends \
             git mercurial xvfb \
             locales sudo openssh-client ca-certificates tar gzip parallel \
-            net-tools netcat unzip zip bzip2 gnupg curl wget \
+            net-tools netcat-openbsd unzip zip bzip2 gnupg curl wget \
             tzdata rsync vim less jq; \
         rm -rf /var/lib/apt/lists/*;
 

.circleci/images/primary/Dockerfile-3.2.0 → .circleci/images/primary/Dockerfile-3.3.2

@@ -1,6 +1,6 @@
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-FROM ruby:3.2.0-bullseye
+FROM ruby:3.3.2-bookworm
 
 # Make apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -15,7 +15,7 @@ RUN set -ex; \
         apt-get install -y --no-install-recommends \
             git mercurial xvfb \
             locales sudo openssh-client ca-certificates tar gzip parallel \
-            net-tools netcat unzip zip bzip2 gnupg curl wget \
+            net-tools netcat-openbsd unzip zip bzip2 gnupg curl wget \
             tzdata rsync vim less jq; \
         rm -rf /var/lib/apt/lists/*;
 

.circleci/images/primary/Dockerfile-jruby-9.2.21.0

@@ -1,17 +1,6 @@
-# Note:
-#
-# There is an incompatibility between ethon and httprb on debian 11 bullseye.
-# This is why this image is based on debian 10 buster.
-#
-# See:
-# - https://github.com/jruby/jruby/issues/7033
-# - https://github.com/DataDog/dd-trace-rb/pull/2380#issuecomment-1320994823
-
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-# openjdk:8-jre image is from https://github.com/docker-library/openjdk/blob/a0c4da867ddd1a11408b7ec5032f12130bdc5476/8/jre/buster/Dockerfile
-# note: docker-library/openjdk is deprecated, there is a later move to https://hub.docker.com/_/eclipse-temurin
-FROM openjdk:8-jre-buster AS jruby-9.2.21.0-jre8
+FROM eclipse-temurin:8-jammy AS jruby-9.2.21.0-jre8
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 

.circleci/images/primary/Dockerfile-jruby-9.3.9.0

@@ -1,17 +1,6 @@
-# Note:
-#
-# There is an incompatibility between ethon and httprb on debian 11 bullseye.
-# This is why this image is based on debian 10 buster.
-#
-# See:
-# - https://github.com/jruby/jruby/issues/7033
-# - https://github.com/DataDog/dd-trace-rb/pull/2380#issuecomment-1320994823
-
 # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image
 
-# openjdk:11-jre image is from https://github.com/docker-library/openjdk/blob/8dfb0c5645098b8c330c4811c8228cae52f18388/11/jre/buster/Dockerfile
-# note: docker-library/openjdk is deprecated, there is a later move to https://hub.docker.com/_/eclipse-temurin
-FROM openjdk:11-jre-buster AS jruby-9.3.9.0-jre11
+FROM eclipse-temurin:11-jammy AS jruby-9.3.9.0-jre11
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 

.circleci/images/primary/Dockerfile-jruby-9.4.7.0

@@ -106,4 +106,3 @@ RUN mkdir /app
 WORKDIR /app
 
 CMD ["/bin/sh"]
-

.github/workflows/build-ruby.yml

@@ -28,20 +28,20 @@ jobs:
             version: 2.6.10
             dockerfile: Dockerfile-2.6.10
           - engine: ruby
-            version: 2.7.6
-            dockerfile: Dockerfile-2.7.6
+            version: 2.7.8
+            dockerfile: Dockerfile-2.7.8
           - engine: ruby
-            version: 3.0.4
-            dockerfile: Dockerfile-3.0.4
+            version: 3.0.7
+            dockerfile: Dockerfile-3.0.7
           - engine: ruby
-            version: 3.1.2
-            dockerfile: Dockerfile-3.1.2
+            version: 3.1.6
+            dockerfile: Dockerfile-3.1.6
           - engine: ruby
-            version: 3.2.0
-            dockerfile: Dockerfile-3.2.0
+            version: 3.2.4
+            dockerfile: Dockerfile-3.2.4
           - engine: ruby
-            version: 3.3.0
-            dockerfile: Dockerfile-3.3.0
+            version: 3.3.2
+            dockerfile: Dockerfile-3.3.2
           - engine: ruby
             version: 3.4.0
             dockerfile: Dockerfile-3.4.0

.gitlab/benchmarks.yml

@@ -153,7 +153,7 @@ benchmarks:
   script:
     - export ARTIFACTS_DIR="$(pwd)/artifacts" && (mkdir "${ARTIFACTS_DIR}" || :)
     - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "https://github.com/DataDog/"
-    - git clone --branch dd-trace-rb https://github.com/DataDog/benchmarking-platform platform && cd platform
+    - git clone --branch dd-trace-rb https://github.com/DataDog/benchmarking-platform benchmarking-platform && cd benchmarking-platform
     - ./steps/capture-hardware-software-info.sh
     - ./steps/run-benchmarks.sh
     - ./steps/analyze-results.sh

Rakefile

@@ -67,7 +67,7 @@ TEST_METADATA = {
     'elasticsearch-8' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
   },
   'ethon' => {
-    'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
+    'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby'
   },
   'excon' => {
     'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
@@ -101,7 +101,7 @@ TEST_METADATA = {
     'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
   },
   'httprb' => {
-    'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
+    'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby'
   },
   'kafka' => {
     'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'