Merge branch 'master' into alexjf/prof-10477-libdatadog12

DataDog · Sep 9, 2024 · 2cd3926 · 2cd3926
2 parents b055d42 + a5881cb
commit 2cd3926
Show file tree

Hide file tree

Showing 250 changed files with 726 additions and 1,074 deletions.
diff --git a/.github/workflows/add-milestone-to-pull-requests.yml b/.github/workflows/add-milestone-to-pull-requests.yml
@@ -5,6 +5,9 @@ on:
 
 jobs:
   add_milestone:
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && github.event.pull_request.milestone == null
     steps:

diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
@@ -312,6 +312,8 @@ jobs:
           - graphql23
     runs-on: ubuntu-latest
     needs:
+      - build-harness
+      - build-apps
       - test
     if: ${{ always() }}
     name: Aggregate (${{ matrix.app }})

diff --git a/Gemfile b/Gemfile
@@ -62,11 +62,6 @@ if RUBY_VERSION >= '2.6.0'
   gem 'rubocop-rspec', ['~> 2.20', '< 2.21'], require: false
 end
 
-if RUBY_VERSION >= '3.3'
-  gem 'fiddle'
-  gem 'ostruct'
-end
-
 # Optional extensions
 # TODO: Move this to Appraisals?
 # dogstatsd v5, but lower than 5.2, has possible memory leak with datadog.

diff --git a/Steepfile b/Steepfile
@@ -569,6 +569,7 @@ target :datadog do
   library 'passenger'
   library 'webmock'
   library 'graphql'
+  library 'datadog-ci'
 
   # TODO: gem 'libddwaf'
   library 'libddwaf'

diff --git a/gemfiles/ruby_2.5_stripe_10.gemfile.lock b/gemfiles/ruby_2.5_stripe_10.gemfile.lock
diff --git a/gemfiles/ruby_2.5_stripe_11.gemfile.lock b/gemfiles/ruby_2.5_stripe_11.gemfile.lock
diff --git a/gemfiles/ruby_2.5_stripe_12.gemfile.lock b/gemfiles/ruby_2.5_stripe_12.gemfile.lock
diff --git a/gemfiles/ruby_2.5_stripe_7.gemfile.lock b/gemfiles/ruby_2.5_stripe_7.gemfile.lock
diff --git a/gemfiles/ruby_2.5_stripe_8.gemfile.lock b/gemfiles/ruby_2.5_stripe_8.gemfile.lock
diff --git a/gemfiles/ruby_2.5_stripe_9.gemfile.lock b/gemfiles/ruby_2.5_stripe_9.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_10.gemfile.lock b/gemfiles/ruby_2.6_stripe_10.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_11.gemfile.lock b/gemfiles/ruby_2.6_stripe_11.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_12.gemfile.lock b/gemfiles/ruby_2.6_stripe_12.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_7.gemfile.lock b/gemfiles/ruby_2.6_stripe_7.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_8.gemfile.lock b/gemfiles/ruby_2.6_stripe_8.gemfile.lock
diff --git a/gemfiles/ruby_2.6_stripe_9.gemfile.lock b/gemfiles/ruby_2.6_stripe_9.gemfile.lock
diff --git a/gemfiles/ruby_2.7_stripe_10.gemfile.lock b/gemfiles/ruby_2.7_stripe_10.gemfile.lock
diff --git a/gemfiles/ruby_2.7_stripe_11.gemfile.lock b/gemfiles/ruby_2.7_stripe_11.gemfile.lock