Merge branch 'master' into semgrep.yml

Author: marcotc

.github/workflows/system-tests.yml

@@ -1,4 +1,4 @@
-name: "SystemTests"
+name: System Tests
 
 on:
   push:
@@ -233,6 +233,15 @@ jobs:
           name: system-tests-${{ matrix.library }}-${{ matrix.app }}-logs-gha${{ github.run_id }}-g${{ github.sha }}
           path: logs*
 
+  all_test_successful:
+    name: System tests successful
+    runs-on: ubuntu-latest
+    needs:
+      - test
+    steps:
+      - name: System tests successful
+        run: echo "Done"
+
   aggregate:
     strategy:
       fail-fast: false

.github/workflows/test-macos.yaml

@@ -1,5 +1,11 @@
 name: Test macOS
-on: [push]
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
 jobs:
   test-macos:
     strategy:

Rakefile

@@ -672,6 +672,7 @@ target :ddtrace do
   library 'delayed_job'
   library 'opentelemetry-api'
   library 'passenger'
+  library 'webmock'
 
   # TODO: gem 'libddwaf'
   library 'libddwaf'

Steepfile

@@ -169,17 +169,13 @@
 
 (3..5).each { |v| gem_cucumber(v) }
 
-appraise 'contrib' do
-  gem 'actionpack'
-  gem 'actionview'
-  gem 'active_model_serializers', '>= 0.10.0'
-  gem 'activerecord', '~> 5'
+appraise 'aws' do
   gem 'aws-sdk'
-  gem 'concurrent-ruby'
-  gem 'dalli', '>= 3.0.0'
-  gem 'delayed_job'
-  gem 'delayed_job_active_record'
-  gem 'elasticsearch', '>= 8.0.0'
+  gem 'shoryuken'
+end
+
+appraise 'http' do
+  gem 'elasticsearch'
   # Workaround bundle of JRuby/ethon issues:
   # * ethon 0.15.0 is incompatible with most JRuby 9.2 versions (fixed in 9.2.20.0),
   #   see https://github.com/typhoeus/ethon/issues/205
@@ -190,39 +186,49 @@
   # either the upstream issues are fixed OR we end up moving to Java 11.
   gem 'ethon', (RUBY_PLATFORM == 'java' ? '< 0.15.0' : '>= 0')
   gem 'excon'
-  gem 'faraday', '>= 1.0'
+  gem 'faraday'
+  gem 'http', '~> 4' # TODO: Fix test breakage and flakiness for 5+
+  gem 'httpclient'
+  gem 'opensearch-ruby'
+  gem 'rest-client'
+  gem 'stripe', '~> 7.0'
+  gem 'typhoeus'
+end
+
+appraise 'contrib' do
+  gem 'actionpack'
+  gem 'actionview'
+  gem 'active_model_serializers', '>= 0.10.0'
+  gem 'activerecord', '~> 5'
+  gem 'concurrent-ruby'
+  gem 'dalli', '>= 3.0.0'
+  gem 'delayed_job'
+  gem 'delayed_job_active_record'
   gem 'grape'
   gem 'graphql', '>= 2.0'
-  gem 'http'
-  gem 'httpclient'
   gem 'lograge', '~> 0.11'
   gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   gem 'makara'
   gem 'minitest', '>= 5.0.0'
   gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
   gem 'activerecord-jdbcmysql-adapter', '>= 52', platform: :jruby
-  gem 'opensearch-ruby'
   gem 'activerecord-jdbcpostgresql-adapter', '>= 52', platform: :jruby
   gem 'racecar', '>= 0.3.5'
   gem 'rack'
   gem 'rack-contrib'
   gem 'rack-test'
   gem 'rake', '>= 12.3'
-  gem 'rest-client'
   gem 'resque'
   gem 'roda', '>= 2.0.0'
   gem 'ruby-kafka', '>= 0.7.10'
   gem 'rspec', '>= 3.0.0'
   gem 'semantic_logger', '~> 4.0'
   gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+
-  gem 'shoryuken'
   gem 'sidekiq'
   gem 'sneakers', '>= 2.12.0'
   gem 'bunny', '~> 2.19.0' # uninitialized constant OpenSSL::SSL::TLS1_3_VERSION for jruby, https://github.com/ruby-amqp/bunny/issues/645
-  gem 'stripe', '~> 7.0'
   gem 'activerecord-jdbcsqlite3-adapter', '>= 52', platform: :jruby
   gem 'sucker_punch'
-  gem 'typhoeus'
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end
 

appraisal/jruby-9.2.21.0.rb

@@ -149,51 +149,57 @@
 
 (3..5).each { |v| gem_cucumber(v) }
 
+appraise 'aws' do
+  gem 'aws-sdk'
+  gem 'shoryuken'
+end
+
+appraise 'http' do
+  gem 'elasticsearch'
+  gem 'ethon'
+  gem 'excon'
+  gem 'faraday'
+  gem 'http', '~> 4' # TODO: Fix test breakage and flakiness for 5+
+  gem 'httpclient'
+  gem 'opensearch-ruby'
+  gem 'rest-client'
+  gem 'stripe', '~> 8.0'
+  gem 'typhoeus'
+end
+
 appraise 'contrib' do
   gem 'actionpack'
   gem 'actionview'
   gem 'active_model_serializers', '>= 0.10.0'
   gem 'activerecord', '~> 6.0.0'
-  gem 'aws-sdk'
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'delayed_job'
   gem 'delayed_job_active_record'
-  gem 'elasticsearch', '>= 8.0.0'
-  gem 'ethon'
-  gem 'excon'
-  gem 'faraday', '>= 1.0'
   gem 'grape'
   gem 'graphql', '>= 2.0'
-  gem 'http'
-  gem 'httpclient'
   gem 'lograge', '~> 0.11'
   gem 'makara'
   gem 'minitest', '>= 5.0.0'
   gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
   gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-  gem 'opensearch-ruby'
   gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
   gem 'racecar', '>= 0.3.5'
   gem 'rack'
   gem 'rack-contrib'
   gem 'rack-test'
   gem 'rake', '>= 12.3'
   gem 'redis', '~> 4' # TODO: Support redis 5.x
-  gem 'rest-client'
   gem 'resque'
   gem 'roda', '>= 2.0.0'
   gem 'ruby-kafka', '>= 0.7.10'
   gem 'rspec', '>= 3.0.0'
   gem 'semantic_logger', '~> 4.0'
   gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+
-  gem 'shoryuken'
   gem 'sidekiq', '~> 6.5'
   gem 'sneakers', '>= 2.12.0'
-  gem 'stripe', '~> 8.0'
   gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
   gem 'sucker_punch'
-  gem 'typhoeus'
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end
 
@@ -202,10 +208,6 @@
   gem 'rack-test'
 end
 
-appraise 'opentelemetry' do
-  gem 'opentelemetry-sdk', '~> 1.1'
-end
-
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"

appraisal/jruby-9.3.9.0.rb

@@ -55,49 +55,56 @@
 
 (3..8).each { |v| gem_cucumber(v) }
 
+appraise 'aws' do
+  gem 'aws-sdk'
+  gem 'shoryuken'
+end
+
+appraise 'http' do
+  gem 'elasticsearch'
+  gem 'ethon'
+  gem 'excon'
+  gem 'faraday'
+  gem 'http', '~> 4' # TODO: Completely broken with this JRuby version, this has not be validate on CI
+  gem 'httpclient'
+  gem 'opensearch-ruby'
+  gem 'rest-client'
+  gem 'stripe'
+  gem 'typhoeus'
+end
+
 appraise 'contrib' do
   gem 'actionpack', '~> 7'
   gem 'actionview', '~> 7'
   gem 'active_model_serializers', '>= 0.10.0'
   gem 'activerecord', '~> 7'
-  gem 'aws-sdk'
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'delayed_job'
   gem 'delayed_job_active_record'
-  gem 'elasticsearch', '>= 8.0.0'
-  gem 'ethon'
-  gem 'excon'
   gem 'grape'
   gem 'graphql', '>= 2.0'
-  gem 'http'
-  gem 'httpclient'
   gem 'lograge'
   gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions
   gem 'minitest', '>= 5.0.0'
   gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
   gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-  gem 'opensearch-ruby'
   gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
   gem 'racecar', '>= 0.3.5'
   gem 'rack'
   gem 'rack-contrib'
   gem 'rack-test'
   gem 'rake', '>= 12.3'
-  gem 'rest-client'
   gem 'resque'
   gem 'roda', '>= 2.0.0'
   gem 'ruby-kafka', '>= 0.7.10'
   gem 'rspec', '>= 3.0.0'
   gem 'semantic_logger', '~> 4.0'
   gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+
-  gem 'shoryuken'
   gem 'sidekiq', '~> 7'
   gem 'sneakers', '>= 2.12.0'
-  gem 'stripe'
   gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
   gem 'sucker_punch'
-  gem 'typhoeus'
   gem 'que', '>= 1.0.0'
   gem 'net-smtp'
 end

appraisal/jruby-9.4.0.0.rb

@@ -63,22 +63,31 @@
   gem 'lograge', '~> 0.11'
 end
 
+appraise 'aws' do
+  gem 'aws-sdk', '~> 2.0'
+end
+
+appraise 'http' do
+  gem 'elasticsearch'
+  gem 'faraday'
+  gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x
+  gem 'ethon'
+  gem 'excon'
+  gem 'http'
+  gem 'httpclient'
+  gem 'rest-client'
+  gem 'typhoeus'
+end
+
 appraise 'contrib' do
   gem 'active_model_serializers', '~> 0.9.0'
   gem 'activerecord', '3.2.22.5'
   gem 'activerecord-mysql-adapter'
-  gem 'aws-sdk', '~> 2.0'
   gem 'concurrent-ruby'
   gem 'dalli', '< 3.0.0' # Dalli 3.0 dropped support for Ruby < 2.5
   gem 'delayed_job'
   gem 'delayed_job_active_record'
-  gem 'elasticsearch'
   gem 'presto-client', '>=  0.5.14'
-  gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x
-  gem 'ethon'
-  gem 'excon'
-  gem 'http'
-  gem 'httpclient'
   gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
   gem 'mongo', '< 2.5'
   gem 'minitest', '>= 5.0.0'
@@ -89,19 +98,16 @@
   gem 'rack-cache', '1.7.1'
   gem 'rack-test', '0.7.0'
   gem 'rake', '< 12.3'
-  gem 'rest-client'
   gem 'resque', '< 2.0'
   gem 'roda', '>= 2.0.0'
   gem 'ruby-kafka', '>= 0.7.10'
   gem 'rspec', '>= 3.0.0'
   gem 'semantic_logger', '~> 4.0'
   gem 'sequel', '~> 4.0', '< 4.37'
-  gem 'shoryuken'
   gem 'sidekiq', '~> 3.5.4'
   gem 'sqlite3', '~> 1.3.6'
   gem 'sucker_punch'
   gem 'timers', '< 4.2'
-  gem 'typhoeus'
 end
 
 appraise 'sinatra' do

appraisal/ruby-2.1.10.rb

@@ -124,26 +124,35 @@
   gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
 end
 
+appraise 'aws' do
+  gem 'aws-sdk'
+  gem 'shoryuken'
+end
+
+appraise 'http' do
+  gem 'elasticsearch'
+  gem 'ethon'
+  gem 'excon'
+  gem 'faraday'
+  gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x
+  gem 'http'
+  gem 'httpclient'
+  gem 'rest-client'
+  gem 'typhoeus'
+end
+
 appraise 'contrib' do
   gem 'actionpack'
   gem 'actionview'
   gem 'active_model_serializers', '>= 0.10.0'
   gem 'activerecord', '< 5.1.5'
-  gem 'aws-sdk'
   gem 'concurrent-ruby'
   gem 'dalli', '< 3.0.0' # Dalli 3.0 dropped support for Ruby < 2.5
   gem 'delayed_job'
   gem 'delayed_job_active_record'
-  gem 'elasticsearch'
-  gem 'ethon'
-  gem 'excon'
-  gem 'faraday'
-  gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x
   gem 'grape'
   gem 'graphql'
   gem 'grpc', '~> 1.19.0' # Last version to support Ruby < 2.3 & google-protobuf < 3.7
-  gem 'http'
-  gem 'httpclient'
   gem 'lograge', '~> 0.11'
   gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
   gem 'mongo', '>= 2.8.0'
@@ -156,20 +165,17 @@
   gem 'rack-contrib'
   gem 'rack-test'
   gem 'rake', '>= 12.3'
-  gem 'rest-client'
   gem 'redis', '~> 3'
   gem 'resque', '< 2.0'
   gem 'roda', '>= 2.0.0'
   gem 'ruby-kafka', '>= 0.7.10'
   gem 'rspec', '>= 3.0.0'
   gem 'semantic_logger', '~> 4.0'
   gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+
-  gem 'shoryuken'
   gem 'sidekiq'
   gem 'sneakers', '>= 2.12.0'
   gem 'sqlite3', '~> 1.3.6'
   gem 'sucker_punch'
-  gem 'typhoeus'
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end