Merge branch 'master' into sarahchen6/add-ruby-3.4-github

DataDog · Nov 4, 2024 · 5e0ade7 · 5e0ade7
2 parents fad72df + ce863f0
commit 5e0ade7
Show file tree

Hide file tree

Showing 1,093 changed files with 2,768 additions and 3,569 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -107,7 +107,7 @@ test_containers:
     image: memcached:1.5-alpine
   - &memcached_port 11211
   - &container_testagent
-    image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.18.0
+    image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.12.0
     name: testagent
     environment:
       - LOG_LEVEL=DEBUG

diff --git a/.circleci/images/primary/Dockerfile-2.5.9 b/.circleci/images/primary/Dockerfile-2.5.9
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Install RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-2.6.10 b/.circleci/images/primary/Dockerfile-2.6.10
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Install RubyGems
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-2.7.8 b/.circleci/images/primary/Dockerfile-2.7.8
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 

diff --git a/.circleci/images/primary/Dockerfile-3.0.7 b/.circleci/images/primary/Dockerfile-3.0.7
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.1.6 b/.circleci/images/primary/Dockerfile-3.1.6
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.2.4 b/.circleci/images/primary/Dockerfile-3.2.4
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.3.2 b/.circleci/images/primary/Dockerfile-3.3.2
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.4.0 b/.circleci/images/primary/Dockerfile-3.4.0
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -56,7 +56,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
-
+# Install a pinned RubyGems and Bundler
+RUN gem update --system 3.3.26
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.2.21.0 b/.circleci/images/primary/Dockerfile-jruby-9.2.21.0
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 # Ensure JRuby is available when running "bash --login"

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.3.9.0 b/.circleci/images/primary/Dockerfile-jruby-9.3.9.0
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 # Ensure JRuby is available when running "bash --login"

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.4.7.0 b/.circleci/images/primary/Dockerfile-jruby-9.4.7.0
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 # Ensure JRuby is available when running "bash --login"

diff --git a/.circleci/images/primary/binary_version b/.circleci/images/primary/binary_version
@@ -1 +1 @@
-4
+326
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -2,56 +2,70 @@
 # See https://github.com/marketplace/actions/labeler for more information.
 
 core:
-  - any: [ 'lib/datadog/core/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib/datadog/core/**' ]
 
 # Only documentation changes
 docs:
-  - all: [ '**/*.md' ]
+- changed-files:
+  - all-globs-to-all-files: [ '**/*.md' ]
 
 # Only test changes
 dev/testing:
-  - all: [ '{spec/**,integration/**,benchmarks/**}' ]
+- changed-files:
+  - all-globs-to-all-files: [ '{spec/**,integration/**,benchmarks/**}' ]
 
 # Changes to Profiling
 profiling:
-  - any: [ '{lib/datadog/profiling/**,ext/datadog_profiling_loader/**,ext/datadog_profiling_native_extension/**}' ]
+- changed-files:
+  - any-glob-to-any-file: [ '{lib/datadog/profiling/**,ext/datadog_profiling_loader/**,ext/datadog_profiling_native_extension/**}' ]
 
 # Changes to CI-App
 ci-app:
-  - any: [ 'lib/datadog/ci/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib/datadog/ci/**' ]
 
 # Changes to ASM
 appsec:
-  - any: [ 'lib/datadog/appsec/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib/datadog/appsec/**' ]
 
 # Changes to Tracing
 tracing:
-  - any: [ 'lib/datadog/tracing/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib/datadog/tracing/**' ]
 
 # Changes to Tracing integrations
 integrations:
-  - any: [ '{lib/datadog/tracing/contrib/**,lib/datadog/appsec/contrib/**}' ]
+- changed-files:
+  - any-glob-to-any-file: [ '{lib/datadog/tracing/contrib/**,lib/datadog/appsec/contrib/**}' ]
 
 # Only repository GitHub changes
 dev/github:
-  - all: [ '.github/**' ]
+- changed-files:
+  - all-globs-to-all-files: [ '.github/**' ]
 
 # Only repository CI changes
 dev/ci:
-  - all: [ '{.circleci/**,.gitlab-ci.yml}' ]
+- changed-files:
+  - all-globs-to-all-files: [ '{.circleci/**,.gitlab-ci.yml}' ]
 
 # Version bump pull request
 release:
-  - all: [ '{CHANGELOG.md,lib/datadog/version.rb}' ]
+- changed-files:
+  - all-globs-to-all-files: [ '{CHANGELOG.md,lib/datadog/version.rb}' ]
 
 # Changes to OpenTelemetry
 otel:
-  - any: [ 'lib/datadog/opentelemetry/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib/datadog/opentelemetry/**' ]
 
 # Changes to Single Step Instrumentation
 single-step:
-  - any: [ 'lib-injection/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib-injection/**' ]
 
 # Changes to Debugging
 debugging:
-  - any: [ 'lib/datadog/debugging/**' ]
+- changed-files:
+  - any-glob-to-any-file: [ 'lib/datadog/debugging/**' ]
diff --git a/.github/workflows/pull-request-labeler.yml b/.github/workflows/pull-request-labeler.yml
@@ -12,4 +12,3 @@ jobs:
       - uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          configuration-path: .github/labeler.yml
diff --git a/Steepfile b/Steepfile
@@ -552,7 +552,6 @@ target :datadog do
 
   repo_path 'vendor/rbs'
   library 'cucumber'
-  library 'ffi'
   library 'jruby'
   library 'gem'
   library 'rails'
@@ -575,7 +574,8 @@ target :datadog do
   library 'graphql'
   library 'datadog-ci'
 
-  # TODO: gem 'libddwaf'
-  library 'libddwaf'
+  # ffi version 1.17 was shipped with invalid rbs types:
+  # https://github.com/ffi/ffi/issues/1107
+  library 'libddwaf-stub'
   library 'libdatadog'
 end
diff --git a/datadog.gemspec b/datadog.gemspec
@@ -65,7 +65,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'datadog-ruby_core_source', '~> 3.3'
 
   # Used by appsec
-  spec.add_dependency 'libddwaf', '~> 1.14.0.0.0'
+  spec.add_dependency 'libddwaf', '~> 1.15.0.0.0'
 
   # When updating the version here, please also update the version in `libdatadog_extconf_helpers.rb`
   # (and yes we have a test for it)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -203,7 +203,7 @@ services:
       - ddagent_var_run:/var/run/datadog
 
   testagent:
-    image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.18.0
+    image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.12.0
     ports:
         - "127.0.0.1:${DD_TRACE_AGENT_PORT}:9126"
     depends_on:

diff --git a/gemfiles/jruby_9.2_activesupport.gemfile b/gemfiles/jruby_9.2_activesupport.gemfile
diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2_aws.gemfile b/gemfiles/jruby_9.2_aws.gemfile