diff --git a/Gemfile b/Gemfile index 0a02fae14a9..43473c3b13c 100644 --- a/Gemfile +++ b/Gemfile @@ -90,9 +90,3 @@ end group :dev do gem 'ruby-lsp', require: false if RUBY_VERSION >= '3.0.0' && RUBY_PLATFORM != 'java' end - -# `1.17.0` provides broken RBS type definitions -# https://github.com/ffi/ffi/blob/master/CHANGELOG.md#1170rc1--2024-04-08 -# -# TODO: Remove this once the issue is resolved: https://github.com/ffi/ffi/issues/1107 -gem 'ffi', '~> 1.16.3', require: false diff --git a/Steepfile b/Steepfile index d2b0f428454..c2baeedd576 100644 --- 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 index 6575fc6041b..53cf187106b 100644 --- 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/gemfiles/ruby_3.3_activesupport.gemfile b/gemfiles/ruby_3.3_activesupport.gemfile index d199dfe7905..8de858f43a2 100644 --- a/gemfiles/ruby_3.3_activesupport.gemfile +++ b/gemfiles/ruby_3.3_activesupport.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "activesupport", "~> 7" gem "actionpack" gem "actionview" diff --git a/gemfiles/ruby_3.3_activesupport.gemfile.lock b/gemfiles/ruby_3.3_activesupport.gemfile.lock index d6f561b8d6d..38b30ef9d24 100644 --- a/gemfiles/ruby_3.3_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.3_activesupport.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -107,9 +107,9 @@ GEM king_konf (1.0.1) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) lograge (0.13.0) actionpack (>= 4) @@ -259,7 +259,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) grape json-schema (< 3) @@ -289,4 +288,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_aws.gemfile b/gemfiles/ruby_3.3_aws.gemfile index 4499f0460c4..4381de35358 100644 --- a/gemfiles/ruby_3.3_aws.gemfile +++ b/gemfiles/ruby_3.3_aws.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "aws-sdk" gem "shoryuken" diff --git a/gemfiles/ruby_3.3_aws.gemfile.lock b/gemfiles/ruby_3.3_aws.gemfile.lock index fe33abb6f28..b499ef18398 100644 --- a/gemfiles/ruby_3.3_aws.gemfile.lock +++ b/gemfiles/ruby_3.3_aws.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -1472,9 +1472,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) @@ -1574,7 +1574,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -1601,4 +1600,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_contrib.gemfile b/gemfiles/ruby_3.3_contrib.gemfile index 52e865d20fe..e0dc8534eb4 100644 --- a/gemfiles/ruby_3.3_contrib.gemfile +++ b/gemfiles/ruby_3.3_contrib.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "dalli", ">= 3.0.0" gem "grpc", ">= 1.38.0", platform: :ruby gem "mongo", ">= 2.8.0", "< 2.15.0" diff --git a/gemfiles/ruby_3.3_contrib_old.gemfile b/gemfiles/ruby_3.3_contrib_old.gemfile index d886f7af99e..141c6e7cef6 100644 --- a/gemfiles/ruby_3.3_contrib_old.gemfile +++ b/gemfiles/ruby_3.3_contrib_old.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "dalli", "< 3.0.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.12.0" diff --git a/gemfiles/ruby_3.3_core_old.gemfile b/gemfiles/ruby_3.3_core_old.gemfile index b0e19229378..d7b773d365d 100644 --- a/gemfiles/ruby_3.3_core_old.gemfile +++ b/gemfiles/ruby_3.3_core_old.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", "~> 4" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false group :check do diff --git a/gemfiles/ruby_3.3_elasticsearch_7.gemfile b/gemfiles/ruby_3.3_elasticsearch_7.gemfile index 17ab53fbb6b..0b69fee6a14 100644 --- a/gemfiles/ruby_3.3_elasticsearch_7.gemfile +++ b/gemfiles/ruby_3.3_elasticsearch_7.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "elasticsearch", "~> 7" group :check do diff --git a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock index ac53e932be4..9df25f207e7 100644 --- a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -67,9 +67,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) logger (1.6.1) memory_profiler (0.9.14) @@ -171,7 +171,6 @@ DEPENDENCIES dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -197,4 +196,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_elasticsearch_8.gemfile b/gemfiles/ruby_3.3_elasticsearch_8.gemfile index 587bb77e7fb..145cd806d7e 100644 --- a/gemfiles/ruby_3.3_elasticsearch_8.gemfile +++ b/gemfiles/ruby_3.3_elasticsearch_8.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "elasticsearch", "~> 8" group :check do diff --git a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock index a252c96bf10..083f1e77aaa 100644 --- a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -65,9 +65,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) logger (1.6.1) memory_profiler (0.9.14) @@ -169,7 +169,6 @@ DEPENDENCIES dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -195,4 +194,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_elasticsearch_latest.gemfile b/gemfiles/ruby_3.3_elasticsearch_latest.gemfile index a18e6d9735a..a828fd4a6f7 100644 --- a/gemfiles/ruby_3.3_elasticsearch_latest.gemfile +++ b/gemfiles/ruby_3.3_elasticsearch_latest.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "elasticsearch" group :check do diff --git a/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock index a948818461c..25c206ab410 100644 --- a/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock +++ b/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -68,9 +68,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) logger (1.6.1) memory_profiler (0.9.14) @@ -170,7 +170,6 @@ DEPENDENCIES dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -196,4 +195,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_graphql_1.13.gemfile b/gemfiles/ruby_3.3_graphql_1.13.gemfile index a04f64144c5..70834bb9442 100644 --- a/gemfiles/ruby_3.3_graphql_1.13.gemfile +++ b/gemfiles/ruby_3.3_graphql_1.13.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "graphql", "~> 1.13.0" gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock index 7ae7958b334..8ca229c59da 100644 --- a/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -120,10 +126,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -300,6 +302,7 @@ DEPENDENCIES google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 1.13.0) json-schema (< 3) + libddwaf! lograge (~> 0.11) memory_profiler (~> 0.9) os (~> 1.1) @@ -326,4 +329,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_graphql_2.0.gemfile b/gemfiles/ruby_3.3_graphql_2.0.gemfile index 4260bea7abf..be3f11fc16a 100644 --- a/gemfiles/ruby_3.3_graphql_2.0.gemfile +++ b/gemfiles/ruby_3.3_graphql_2.0.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "graphql", "~> 2.0.0" gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock index d3ec63b60f5..167b09b6a7b 100644 --- a/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -120,10 +126,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -300,6 +302,7 @@ DEPENDENCIES google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 2.0.0) json-schema (< 3) + libddwaf! lograge (~> 0.11) memory_profiler (~> 0.9) os (~> 1.1) @@ -326,4 +329,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_graphql_2.1.gemfile b/gemfiles/ruby_3.3_graphql_2.1.gemfile index a2999be5818..fd234b8dd05 100644 --- a/gemfiles/ruby_3.3_graphql_2.1.gemfile +++ b/gemfiles/ruby_3.3_graphql_2.1.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "graphql", "~> 2.1.0" gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock index 40c53c95bba..d74071e9bb2 100644 --- a/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -121,10 +127,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -301,6 +303,7 @@ DEPENDENCIES google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 2.1.0) json-schema (< 3) + libddwaf! lograge (~> 0.11) memory_profiler (~> 0.9) os (~> 1.1) @@ -327,4 +330,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_graphql_2.2.gemfile b/gemfiles/ruby_3.3_graphql_2.2.gemfile index 6a47cf6e7d6..c51f0271f08 100644 --- a/gemfiles/ruby_3.3_graphql_2.2.gemfile +++ b/gemfiles/ruby_3.3_graphql_2.2.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "graphql", "~> 2.2.0" gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock index f45e7bc2dfc..4876225dace 100644 --- a/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -121,10 +127,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -301,6 +303,7 @@ DEPENDENCIES google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 2.2.0) json-schema (< 3) + libddwaf! lograge (~> 0.11) memory_profiler (~> 0.9) os (~> 1.1) @@ -327,4 +330,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_graphql_2.3.gemfile b/gemfiles/ruby_3.3_graphql_2.3.gemfile index e86241a6af5..a41051005f2 100644 --- a/gemfiles/ruby_3.3_graphql_2.3.gemfile +++ b/gemfiles/ruby_3.3_graphql_2.3.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "graphql", "~> 2.3.0" gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock index 8333ee495e5..4f787b3c73e 100644 --- a/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -124,10 +130,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -304,6 +306,7 @@ DEPENDENCIES google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 2.3.0) json-schema (< 3) + libddwaf! lograge (~> 0.11) memory_profiler (~> 0.9) os (~> 1.1) @@ -330,4 +333,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_http.gemfile b/gemfiles/ruby_3.3_http.gemfile index 8ff564a89c4..0e0503cb90f 100644 --- a/gemfiles/ruby_3.3_http.gemfile +++ b/gemfiles/ruby_3.3_http.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_3.3_http.gemfile.lock b/gemfiles/ruby_3.3_http.gemfile.lock index cf23da20fdc..f954a54f720 100644 --- a/gemfiles/ruby_3.3_http.gemfile.lock +++ b/gemfiles/ruby_3.3_http.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -72,9 +72,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) llhttp-ffi (0.3.1) ffi-compiler (~> 1.0) @@ -190,7 +190,6 @@ DEPENDENCIES excon extlz4 (~> 0.3, >= 0.3.3) faraday - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) http httpclient @@ -220,4 +219,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_opensearch_2.gemfile b/gemfiles/ruby_3.3_opensearch_2.gemfile index 97c7bb50b6f..1ddb1abca41 100644 --- a/gemfiles/ruby_3.3_opensearch_2.gemfile +++ b/gemfiles/ruby_3.3_opensearch_2.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "opensearch-ruby", "~> 2" group :check do diff --git a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock index cde8e33b8a1..d8f3d7c67cb 100644 --- a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -57,9 +57,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) logger (1.6.1) memory_profiler (0.9.14) @@ -168,7 +168,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -195,4 +194,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_opensearch_3.gemfile b/gemfiles/ruby_3.3_opensearch_3.gemfile index 8d9d62f01d0..1620625a1fe 100644 --- a/gemfiles/ruby_3.3_opensearch_3.gemfile +++ b/gemfiles/ruby_3.3_opensearch_3.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "opensearch-ruby", "~> 3" group :check do diff --git a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock index 8b85503396a..955b52d94d4 100644 --- a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -57,9 +57,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) logger (1.6.1) memory_profiler (0.9.14) @@ -163,7 +163,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -190,4 +189,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_opensearch_latest.gemfile b/gemfiles/ruby_3.3_opensearch_latest.gemfile index 1eb664e0fff..aa9a7905992 100644 --- a/gemfiles/ruby_3.3_opensearch_latest.gemfile +++ b/gemfiles/ruby_3.3_opensearch_latest.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "opensearch-ruby" group :check do diff --git a/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock index e5c69200dce..69ef8ede904 100644 --- a/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -60,9 +60,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) logger (1.6.1) memory_profiler (0.9.14) @@ -164,7 +164,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -191,4 +190,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_opentelemetry.gemfile b/gemfiles/ruby_3.3_opentelemetry.gemfile index 17fe5120eed..882b5534f2f 100644 --- a/gemfiles/ruby_3.3_opentelemetry.gemfile +++ b/gemfiles/ruby_3.3_opentelemetry.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "opentelemetry-sdk", "~> 1.1" group :check do diff --git a/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile b/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile index 288ffc6f66b..dc1e1a628d2 100644 --- a/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile +++ b/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "opentelemetry-sdk", "~> 1.1" gem "opentelemetry-exporter-otlp" diff --git a/gemfiles/ruby_3.3_rack_2.gemfile b/gemfiles/ruby_3.3_rack_2.gemfile index da057e50c25..9c6e1202600 100644 --- a/gemfiles/ruby_3.3_rack_2.gemfile +++ b/gemfiles/ruby_3.3_rack_2.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rack", "~> 2" gem "rack-contrib" gem "rack-test" diff --git a/gemfiles/ruby_3.3_rack_2.gemfile.lock b/gemfiles/ruby_3.3_rack_2.gemfile.lock index 220c5b8eb1c..6dc938b691a 100644 --- a/gemfiles/ruby_3.3_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_2.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -50,10 +56,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.7.2) @@ -155,6 +157,7 @@ DEPENDENCIES ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) + libddwaf! memory_profiler (~> 0.9) os (~> 1.1) pimpmychangelog (>= 0.1.2) @@ -181,4 +184,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rack_3.gemfile b/gemfiles/ruby_3.3_rack_3.gemfile index 2d1be5f7909..8e935538d96 100644 --- a/gemfiles/ruby_3.3_rack_3.gemfile +++ b/gemfiles/ruby_3.3_rack_3.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rack", "~> 3" gem "rack-contrib" gem "rack-test" diff --git a/gemfiles/ruby_3.3_rack_3.gemfile.lock b/gemfiles/ruby_3.3_rack_3.gemfile.lock index 2cedf106108..2ec5de78e18 100644 --- a/gemfiles/ruby_3.3_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_3.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -50,10 +56,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.7.2) @@ -155,6 +157,7 @@ DEPENDENCIES ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) + libddwaf! memory_profiler (~> 0.9) os (~> 1.1) pimpmychangelog (>= 0.1.2) @@ -181,4 +184,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rack_latest.gemfile b/gemfiles/ruby_3.3_rack_latest.gemfile index e8a313cd70f..98c3bee7b5c 100644 --- a/gemfiles/ruby_3.3_rack_latest.gemfile +++ b/gemfiles/ruby_3.3_rack_latest.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rack" gem "rack-contrib" gem "rack-test" diff --git a/gemfiles/ruby_3.3_rack_latest.gemfile.lock b/gemfiles/ruby_3.3_rack_latest.gemfile.lock index cb9d62d34bf..0cc73744d7f 100644 --- a/gemfiles/ruby_3.3_rack_latest.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_latest.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -54,10 +60,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -158,6 +160,7 @@ DEPENDENCIES ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) + libddwaf! memory_profiler (~> 0.9) os (~> 1.1) pimpmychangelog (>= 0.1.2) diff --git a/gemfiles/ruby_3.3_rails61_mysql2.gemfile b/gemfiles/ruby_3.3_rails61_mysql2.gemfile index 04cb6694650..b3d6f50f232 100644 --- a/gemfiles/ruby_3.3_rails61_mysql2.gemfile +++ b/gemfiles/ruby_3.3_rails61_mysql2.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "mysql2", "~> 0.5", platform: :ruby gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock index 124f97e193c..fb75a2dc674 100644 --- a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -117,9 +117,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) lograge (0.12.0) actionpack (>= 4) @@ -289,7 +289,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) lograge (~> 0.11) @@ -320,4 +319,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails61_postgres.gemfile b/gemfiles/ruby_3.3_rails61_postgres.gemfile index 609da1f3595..52c56a81911 100644 --- a/gemfiles/ruby_3.3_rails61_postgres.gemfile +++ b/gemfiles/ruby_3.3_rails61_postgres.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock index bdbbdbe7d5a..22879a76d12 100644 --- a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -117,9 +117,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) lograge (0.12.0) actionpack (>= 4) @@ -289,7 +289,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) lograge (~> 0.11) @@ -320,4 +319,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile index dde99290665..62e57d1655f 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile +++ b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby gem "redis", "~> 4" diff --git a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock index f3aa02e3e49..80973ea723a 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -117,9 +117,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) lograge (0.12.0) actionpack (>= 4) @@ -290,7 +290,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) lograge (~> 0.11) @@ -322,4 +321,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile index 695aaf7c342..8c76214aceb 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile +++ b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby gem "sidekiq", ">= 6.1.2" diff --git a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock index a02f17661b4..896f221c68f 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -118,9 +118,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) lograge (0.12.0) actionpack (>= 4) @@ -303,7 +303,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) lograge (~> 0.11) @@ -336,4 +335,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile index 28a4d4adc26..2391b1824bd 100644 --- a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile +++ b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "pg", ">= 1.1", platform: :ruby gem "sprockets", "< 4" diff --git a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock index 4a668ec3c54..4c59096bb04 100644 --- a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -117,9 +117,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) loofah (2.21.3) crass (~> 1.0.2) @@ -288,7 +288,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -319,4 +318,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails61_trilogy.gemfile b/gemfiles/ruby_3.3_rails61_trilogy.gemfile index a99d1f7c681..7babf75a747 100644 --- a/gemfiles/ruby_3.3_rails61_trilogy.gemfile +++ b/gemfiles/ruby_3.3_rails61_trilogy.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" gem "trilogy" gem "activerecord-trilogy-adapter" diff --git a/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock index eaba9a4d3e2..64831640cba 100644 --- a/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -121,9 +121,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) lograge (0.14.0) actionpack (>= 4) @@ -298,7 +298,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) lograge (~> 0.11) @@ -329,4 +328,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails7.gemfile b/gemfiles/ruby_3.3_rails7.gemfile index b7cc3caff02..1d7bf20234e 100644 --- a/gemfiles/ruby_3.3_rails7.gemfile +++ b/gemfiles/ruby_3.3_rails7.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 7.0.0" group :check do diff --git a/gemfiles/ruby_3.3_rails7.gemfile.lock b/gemfiles/ruby_3.3_rails7.gemfile.lock index 2839a026c7f..436eae5331c 100644 --- a/gemfiles/ruby_3.3_rails7.gemfile.lock +++ b/gemfiles/ruby_3.3_rails7.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -127,9 +127,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) @@ -288,7 +288,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -315,4 +314,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_rails71.gemfile b/gemfiles/ruby_3.3_rails71.gemfile index b5555633a60..ef669fc2d04 100644 --- a/gemfiles/ruby_3.3_rails71.gemfile +++ b/gemfiles/ruby_3.3_rails71.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 7.1.0" group :check do diff --git a/gemfiles/ruby_3.3_rails71.gemfile.lock b/gemfiles/ruby_3.3_rails71.gemfile.lock index 14cfbe41007..bf3a20229b4 100644 --- a/gemfiles/ruby_3.3_rails71.gemfile.lock +++ b/gemfiles/ruby_3.3_rails71.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -143,9 +143,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) @@ -318,7 +318,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -345,4 +344,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_redis_3.gemfile b/gemfiles/ruby_3.3_redis_3.gemfile index f075759c264..d7dd94b9dc2 100644 --- a/gemfiles/ruby_3.3_redis_3.gemfile +++ b/gemfiles/ruby_3.3_redis_3.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "redis", "~> 3" group :check do diff --git a/gemfiles/ruby_3.3_redis_4.gemfile b/gemfiles/ruby_3.3_redis_4.gemfile index dc3e2d2b6cb..d1cfebb7540 100644 --- a/gemfiles/ruby_3.3_redis_4.gemfile +++ b/gemfiles/ruby_3.3_redis_4.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "redis", "~> 4" group :check do diff --git a/gemfiles/ruby_3.3_redis_5.gemfile b/gemfiles/ruby_3.3_redis_5.gemfile index 3bbc9ad0bed..51fc2bd6fcb 100644 --- a/gemfiles/ruby_3.3_redis_5.gemfile +++ b/gemfiles/ruby_3.3_redis_5.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "redis", "~> 5" group :check do diff --git a/gemfiles/ruby_3.3_relational_db.gemfile b/gemfiles/ruby_3.3_relational_db.gemfile index 11a7788b868..f6b2e9588fa 100644 --- a/gemfiles/ruby_3.3_relational_db.gemfile +++ b/gemfiles/ruby_3.3_relational_db.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "activerecord", "~> 7" gem "delayed_job" gem "delayed_job_active_record" diff --git a/gemfiles/ruby_3.3_relational_db.gemfile.lock b/gemfiles/ruby_3.3_relational_db.gemfile.lock index fa44d0f280a..8ed4e1c1970 100644 --- a/gemfiles/ruby_3.3_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.3_relational_db.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -68,9 +68,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) makara (0.6.0.pre) activerecord (>= 5.2.0) @@ -181,7 +181,6 @@ DEPENDENCIES delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) makara (>= 0.6.0.pre) @@ -213,4 +212,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_resque2_redis3.gemfile b/gemfiles/ruby_3.3_resque2_redis3.gemfile index ba9a57b22b9..640f8597e26 100644 --- a/gemfiles/ruby_3.3_resque2_redis3.gemfile +++ b/gemfiles/ruby_3.3_resque2_redis3.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "redis", "< 4.0" gem "resque", ">= 2.0" diff --git a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock index 359aabd13fd..e21cd7515af 100644 --- a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -50,9 +50,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) @@ -167,7 +167,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -195,4 +194,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_resque2_redis4.gemfile b/gemfiles/ruby_3.3_resque2_redis4.gemfile index d56e77f5a5a..506386653cd 100644 --- a/gemfiles/ruby_3.3_resque2_redis4.gemfile +++ b/gemfiles/ruby_3.3_resque2_redis4.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "redis", ">= 4.0" gem "resque", ">= 2.0" diff --git a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock index 55bda5b6d5b..edaacff0bb6 100644 --- a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -51,9 +51,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) @@ -171,7 +171,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -199,4 +198,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_sinatra_2.gemfile b/gemfiles/ruby_3.3_sinatra_2.gemfile index d3bb1ac1eb5..829793bf92f 100644 --- a/gemfiles/ruby_3.3_sinatra_2.gemfile +++ b/gemfiles/ruby_3.3_sinatra_2.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "sinatra", "~> 2" gem "rack-contrib" gem "rack-test" diff --git a/gemfiles/ruby_3.3_sinatra_2.gemfile.lock b/gemfiles/ruby_3.3_sinatra_2.gemfile.lock index 539500b5df1..f2ee9799c22 100644 --- a/gemfiles/ruby_3.3_sinatra_2.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra_2.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -54,10 +60,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -171,6 +173,7 @@ DEPENDENCIES ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) + libddwaf! memory_profiler (~> 0.9) os (~> 1.1) pimpmychangelog (>= 0.1.2) @@ -197,4 +200,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_sinatra_3.gemfile b/gemfiles/ruby_3.3_sinatra_3.gemfile index 019c7714d7a..b32d81abb42 100644 --- a/gemfiles/ruby_3.3_sinatra_3.gemfile +++ b/gemfiles/ruby_3.3_sinatra_3.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "sinatra", "~> 3" gem "rack-contrib" gem "rack-test" diff --git a/gemfiles/ruby_3.3_sinatra_3.gemfile.lock b/gemfiles/ruby_3.3_sinatra_3.gemfile.lock index 1dfd9ab1e68..534d13f07a0 100644 --- a/gemfiles/ruby_3.3_sinatra_3.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra_3.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -55,10 +61,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -173,6 +175,7 @@ DEPENDENCIES ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) + libddwaf! memory_profiler (~> 0.9) os (~> 1.1) pimpmychangelog (>= 0.1.2) @@ -199,4 +202,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_sinatra_4.gemfile b/gemfiles/ruby_3.3_sinatra_4.gemfile index 3fa07ea81b7..4f2f198fcc7 100644 --- a/gemfiles/ruby_3.3_sinatra_4.gemfile +++ b/gemfiles/ruby_3.3_sinatra_4.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "sinatra", "~> 4" gem "rack-contrib" gem "rack-test" diff --git a/gemfiles/ruby_3.3_sinatra_4.gemfile.lock b/gemfiles/ruby_3.3_sinatra_4.gemfile.lock index f3485472861..36ebca4ac50 100644 --- a/gemfiles/ruby_3.3_sinatra_4.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra_4.gemfile.lock @@ -14,9 +14,15 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack +PATH + remote: /mounted-gems/libddwaf-rb + specs: + libddwaf (1.15.0.0.0) + ffi (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -55,10 +61,6 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -176,6 +178,7 @@ DEPENDENCIES ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) + libddwaf! memory_profiler (~> 0.9) os (~> 1.1) pimpmychangelog (>= 0.1.2) @@ -202,4 +205,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_10.gemfile b/gemfiles/ruby_3.3_stripe_10.gemfile index 425478e78b2..78c1b12b157 100644 --- a/gemfiles/ruby_3.3_stripe_10.gemfile +++ b/gemfiles/ruby_3.3_stripe_10.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "~> 10" group :check do diff --git a/gemfiles/ruby_3.3_stripe_10.gemfile.lock b/gemfiles/ruby_3.3_stripe_10.gemfile.lock index 1a452224fb8..efcd20340cc 100644 --- a/gemfiles/ruby_3.3_stripe_10.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_10.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -153,7 +153,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -180,4 +179,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_11.gemfile b/gemfiles/ruby_3.3_stripe_11.gemfile index b8b49621a49..97cc42bc32b 100644 --- a/gemfiles/ruby_3.3_stripe_11.gemfile +++ b/gemfiles/ruby_3.3_stripe_11.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "~> 11" group :check do diff --git a/gemfiles/ruby_3.3_stripe_11.gemfile.lock b/gemfiles/ruby_3.3_stripe_11.gemfile.lock index a744bf707f2..02e3bfc21d1 100644 --- a/gemfiles/ruby_3.3_stripe_11.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_11.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -153,7 +153,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -180,4 +179,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_12.gemfile b/gemfiles/ruby_3.3_stripe_12.gemfile index 175d5f415ec..d32c0492d04 100644 --- a/gemfiles/ruby_3.3_stripe_12.gemfile +++ b/gemfiles/ruby_3.3_stripe_12.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "~> 12" group :check do diff --git a/gemfiles/ruby_3.3_stripe_12.gemfile.lock b/gemfiles/ruby_3.3_stripe_12.gemfile.lock index 8e607487ca6..200f6915aa6 100644 --- a/gemfiles/ruby_3.3_stripe_12.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_12.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -153,7 +153,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -180,4 +179,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_7.gemfile b/gemfiles/ruby_3.3_stripe_7.gemfile index b47fdc17a19..f6058cec9af 100644 --- a/gemfiles/ruby_3.3_stripe_7.gemfile +++ b/gemfiles/ruby_3.3_stripe_7.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "~> 7" group :check do diff --git a/gemfiles/ruby_3.3_stripe_7.gemfile.lock b/gemfiles/ruby_3.3_stripe_7.gemfile.lock index f24da4367e1..007dd424b04 100644 --- a/gemfiles/ruby_3.3_stripe_7.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_7.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -153,7 +153,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -180,4 +179,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_8.gemfile b/gemfiles/ruby_3.3_stripe_8.gemfile index a603cf0b931..207e52f7ef0 100644 --- a/gemfiles/ruby_3.3_stripe_8.gemfile +++ b/gemfiles/ruby_3.3_stripe_8.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "~> 8" group :check do diff --git a/gemfiles/ruby_3.3_stripe_8.gemfile.lock b/gemfiles/ruby_3.3_stripe_8.gemfile.lock index 8c894d0feab..78af778c5c1 100644 --- a/gemfiles/ruby_3.3_stripe_8.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_8.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -153,7 +153,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -180,4 +179,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_9.gemfile b/gemfiles/ruby_3.3_stripe_9.gemfile index c3e5f6f91f1..694bb73a25f 100644 --- a/gemfiles/ruby_3.3_stripe_9.gemfile +++ b/gemfiles/ruby_3.3_stripe_9.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "~> 9" group :check do diff --git a/gemfiles/ruby_3.3_stripe_9.gemfile.lock b/gemfiles/ruby_3.3_stripe_9.gemfile.lock index 8103d29c126..8c860086267 100644 --- a/gemfiles/ruby_3.3_stripe_9.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_9.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -153,7 +153,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -180,4 +179,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_latest.gemfile b/gemfiles/ruby_3.3_stripe_latest.gemfile index 8a1ea441f5b..75c1fc97991 100644 --- a/gemfiles/ruby_3.3_stripe_latest.gemfile +++ b/gemfiles/ruby_3.3_stripe_latest.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe" group :check do diff --git a/gemfiles/ruby_3.3_stripe_latest.gemfile.lock b/gemfiles/ruby_3.3_stripe_latest.gemfile.lock index 63766033cb9..026ea936f15 100644 --- a/gemfiles/ruby_3.3_stripe_latest.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_latest.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -151,7 +151,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -178,4 +177,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/gemfiles/ruby_3.3_stripe_min.gemfile b/gemfiles/ruby_3.3_stripe_min.gemfile index 014fd636730..001cec5c97f 100644 --- a/gemfiles/ruby_3.3_stripe_min.gemfile +++ b/gemfiles/ruby_3.3_stripe_min.gemfile @@ -32,7 +32,6 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"] -gem "ffi", "~> 1.16.3", require: false gem "stripe", "= 5.15.0" group :check do diff --git a/gemfiles/ruby_3.3_stripe_min.gemfile.lock b/gemfiles/ruby_3.3_stripe_min.gemfile.lock index 400426e7031..c84edd902c6 100644 --- a/gemfiles/ruby_3.3_stripe_min.gemfile.lock +++ b/gemfiles/ruby_3.3_stripe_min.gemfile.lock @@ -14,7 +14,7 @@ PATH datadog (2.4.0) datadog-ruby_core_source (~> 3.3) libdatadog (~> 13.1.0.1.0) - libddwaf (~> 1.14.0.0.0) + libddwaf (= 1.15.0.0.0) msgpack GEM @@ -54,9 +54,9 @@ GEM addressable (>= 2.4) libdatadog (13.1.0.1.0-aarch64-linux) libdatadog (13.1.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) + libddwaf (1.15.0.0.0) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) + libddwaf (1.15.0.0.0-aarch64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) @@ -151,7 +151,6 @@ DEPENDENCIES datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) - ffi (~> 1.16.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) json-schema (< 3) memory_profiler (~> 0.9) @@ -178,4 +177,4 @@ DEPENDENCIES webrick (>= 1.7.0) BUNDLED WITH - 2.3.26 + 2.3.27 diff --git a/lib/datadog/appsec/contrib/graphql/reactive/multiplex.rb b/lib/datadog/appsec/contrib/graphql/reactive/multiplex.rb index af3f44802eb..d177da5c258 100644 --- a/lib/datadog/appsec/contrib/graphql/reactive/multiplex.rb +++ b/lib/datadog/appsec/contrib/graphql/reactive/multiplex.rb @@ -25,12 +25,12 @@ def self.subscribe(op, waf_context) Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" } arguments = values[0] - waf_args = { + waf_persistent_data = { 'graphql.server.all_resolvers' => arguments } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/contrib/rack/reactive/request.rb b/lib/datadog/appsec/contrib/rack/reactive/request.rb index b250daa568c..18ef8556ac2 100644 --- a/lib/datadog/appsec/contrib/rack/reactive/request.rb +++ b/lib/datadog/appsec/contrib/rack/reactive/request.rb @@ -42,7 +42,7 @@ def self.subscribe(op, waf_context) client_ip = values[4] request_method = values[5] - waf_args = { + waf_persistent_data = { 'server.request.cookies' => cookies, 'server.request.query' => query, 'server.request.uri.raw' => uri_raw, @@ -53,7 +53,7 @@ def self.subscribe(op, waf_context) } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/contrib/rack/reactive/request_body.rb b/lib/datadog/appsec/contrib/rack/reactive/request_body.rb index ccd2c09eb21..694a97ed32a 100644 --- a/lib/datadog/appsec/contrib/rack/reactive/request_body.rb +++ b/lib/datadog/appsec/contrib/rack/reactive/request_body.rb @@ -26,12 +26,12 @@ def self.subscribe(op, waf_context) Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" } body = values[0] - waf_args = { + waf_persistent_data = { 'server.request.body' => body, } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/contrib/rack/reactive/response.rb b/lib/datadog/appsec/contrib/rack/reactive/response.rb index 44306d13d19..8ca65089518 100644 --- a/lib/datadog/appsec/contrib/rack/reactive/response.rb +++ b/lib/datadog/appsec/contrib/rack/reactive/response.rb @@ -30,14 +30,14 @@ def self.subscribe(op, waf_context) response_headers = values[1] response_headers_no_cookies = response_headers.dup.tap { |h| h.delete('set-cookie') } - waf_args = { + waf_persistent_data = { 'server.response.status' => response_status.to_s, 'server.response.headers' => response_headers, 'server.response.headers.no_cookies' => response_headers_no_cookies, } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/contrib/rails/reactive/action.rb b/lib/datadog/appsec/contrib/rails/reactive/action.rb index f11fe9581b4..667d9e04318 100644 --- a/lib/datadog/appsec/contrib/rails/reactive/action.rb +++ b/lib/datadog/appsec/contrib/rails/reactive/action.rb @@ -31,13 +31,13 @@ def self.subscribe(op, waf_context) body = values[0] path_params = values[1] - waf_args = { + waf_persistent_data = { 'server.request.body' => body, 'server.request.path_params' => path_params, } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb b/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb index 7541456e9be..a31a3adadfb 100644 --- a/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb +++ b/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb @@ -27,12 +27,12 @@ def self.subscribe(op, waf_context) Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" } path_params = values[0] - waf_args = { + waf_persistent_data = { 'server.request.path_params' => path_params, } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/monitor/reactive/set_user.rb b/lib/datadog/appsec/monitor/reactive/set_user.rb index cfd6a60eb4f..9af22264755 100644 --- a/lib/datadog/appsec/monitor/reactive/set_user.rb +++ b/lib/datadog/appsec/monitor/reactive/set_user.rb @@ -25,12 +25,12 @@ def self.subscribe(op, waf_context) user_id = values[0] - waf_args = { + waf_persistent_data = { 'usr.id' => user_id, } waf_timeout = Datadog.configuration.appsec.waf_timeout - result = waf_context.run(waf_args, waf_timeout) + result = waf_context.run(waf_persistent_data, {}, waf_timeout) next if result.status != :match diff --git a/lib/datadog/appsec/processor/context.rb b/lib/datadog/appsec/processor/context.rb index 884f88969f1..70afe4cb319 100644 --- a/lib/datadog/appsec/processor/context.rb +++ b/lib/datadog/appsec/processor/context.rb @@ -24,18 +24,24 @@ def initialize(handle, telemetry:) @libddwaf_debug_tag = "libddwaf:#{WAF::VERSION::STRING}" end - def run(input, timeout = WAF::LibDDWAF::DDWAF_RUN_TIMEOUT) + def run(persistent_data, ephemeral_data, timeout = WAF::LibDDWAF::DDWAF_RUN_TIMEOUT) @run_mutex.lock start_ns = Core::Utils::Time.get_time(:nanosecond) - input.reject! do |_, v| + persistent_data.reject! do |_, v| next false if v.is_a?(TrueClass) || v.is_a?(FalseClass) v.nil? ? true : v.empty? end - _code, result = try_run(input, timeout) + ephemeral_data.reject! do |_, v| + next false if v.is_a?(TrueClass) || v.is_a?(FalseClass) + + v.nil? ? true : v.empty? + end + + _code, result = try_run(persistent_data, ephemeral_data, timeout) stop_ns = Core::Utils::Time.get_time(:nanosecond) @@ -59,7 +65,7 @@ def extract_schema } } - _code, result = try_run(input, WAF::LibDDWAF::DDWAF_RUN_TIMEOUT) + _code, result = try_run(input, {}, WAF::LibDDWAF::DDWAF_RUN_TIMEOUT) report_execution(result) result @@ -71,8 +77,8 @@ def finalize private - def try_run(input, timeout) - @context.run(input, timeout) + def try_run(persistent_data, ephemeral_data, timeout) + @context.run(persistent_data, ephemeral_data, timeout) rescue WAF::LibDDWAF::Error => e Datadog.logger.debug { "#{@libddwaf_debug_tag} execution error: #{e} backtrace: #{e.backtrace&.first(3)}" } @telemetry.report(e, description: 'libddwaf internal low-level error') diff --git a/sig/datadog/appsec/processor/context.rbs b/sig/datadog/appsec/processor/context.rbs index 7d8027940b4..f5b5a0f9a6c 100644 --- a/sig/datadog/appsec/processor/context.rbs +++ b/sig/datadog/appsec/processor/context.rbs @@ -30,7 +30,7 @@ module Datadog def initialize: (WAF::Handle handle, telemetry: Core::Telemetry::Component) -> void - def run: (Hash[untyped, untyped] input, ?::Integer timeout) -> WAF::Result + def run: (Hash[untyped, untyped] persistent_data, Hash[untyped, untyped] ephemeral_data, ?::Integer timeout) -> WAF::Result def extract_schema: () -> WAF::Result? @@ -38,7 +38,7 @@ module Datadog private - def try_run: (Hash[untyped, untyped] input, ::Integer timeout) -> [::Symbol, WAF::Result] + def try_run: (Hash[untyped, untyped] persistent_data, Hash[untyped, untyped] ephemeral_data, ::Integer timeout) -> [::Symbol, WAF::Result] def report_execution: (WAF::Result result) -> void diff --git a/spec/datadog/appsec/contrib/graphql/reactive/multiplex_spec.rb b/spec/datadog/appsec/contrib/graphql/reactive/multiplex_spec.rb index 812184e6eb8..519904cfc5d 100644 --- a/spec/datadog/appsec/contrib/graphql/reactive/multiplex_spec.rb +++ b/spec/datadog/appsec/contrib/graphql/reactive/multiplex_spec.rb @@ -47,6 +47,7 @@ waf_result = double(:waf_result, status: :ok, timeout: false) expect(waf_context).to receive(:run).with( { 'graphql.server.all_resolvers' => expected_arguments }, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, waf_context) diff --git a/spec/datadog/appsec/contrib/rack/reactive/request_body_spec.rb b/spec/datadog/appsec/contrib/rack/reactive/request_body_spec.rb index edf70172e35..7b5ce95a3a2 100644 --- a/spec/datadog/appsec/contrib/rack/reactive/request_body_spec.rb +++ b/spec/datadog/appsec/contrib/rack/reactive/request_body_spec.rb @@ -47,6 +47,7 @@ waf_result = double(:waf_result, status: :ok, timeout: false) expect(waf_context).to receive(:run).with( expected_waf_arguments, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, waf_context) diff --git a/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb b/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb index 2e67f7dd188..b9927ce8f87 100644 --- a/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb +++ b/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb @@ -81,6 +81,7 @@ waf_result = double(:waf_result, status: :ok, timeout: false) expect(waf_context).to receive(:run).with( expected_waf_arguments, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, waf_context) diff --git a/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb b/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb index 8d7c61ab48e..8ea92c75e78 100644 --- a/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb +++ b/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb @@ -70,6 +70,7 @@ it 'does call the waf context with the right arguments' do expect(processor_context).to receive(:run).with( expected_waf_arguments, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, processor_context) diff --git a/spec/datadog/appsec/contrib/rails/reactive/action_spec.rb b/spec/datadog/appsec/contrib/rails/reactive/action_spec.rb index 345abd1c6c4..75c302e2751 100644 --- a/spec/datadog/appsec/contrib/rails/reactive/action_spec.rb +++ b/spec/datadog/appsec/contrib/rails/reactive/action_spec.rb @@ -55,6 +55,7 @@ waf_result = double(:waf_result, status: :ok, timeout: false) expect(waf_context).to receive(:run).with( expected_waf_arguments, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, waf_context) diff --git a/spec/datadog/appsec/contrib/sinatra/reactive/routed_spec.rb b/spec/datadog/appsec/contrib/sinatra/reactive/routed_spec.rb index 9dbc89b863d..b30ca74c3f6 100644 --- a/spec/datadog/appsec/contrib/sinatra/reactive/routed_spec.rb +++ b/spec/datadog/appsec/contrib/sinatra/reactive/routed_spec.rb @@ -51,6 +51,7 @@ waf_result = double(:waf_result, status: :ok, timeout: false) expect(waf_context).to receive(:run).with( expected_waf_arguments, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, waf_context) diff --git a/spec/datadog/appsec/monitor/reactive/set_user_spec.rb b/spec/datadog/appsec/monitor/reactive/set_user_spec.rb index 88791342d87..e29b076ffa0 100644 --- a/spec/datadog/appsec/monitor/reactive/set_user_spec.rb +++ b/spec/datadog/appsec/monitor/reactive/set_user_spec.rb @@ -32,11 +32,12 @@ it 'does call the waf context with the right arguments' do expect(operation).to receive(:subscribe).and_call_original - expected_waf_arguments = { 'usr.id' => 1 } + expected_waf_persisted_data = { 'usr.id' => 1 } waf_result = double(:waf_result, status: :ok, timeout: false) expect(waf_context).to receive(:run).with( - expected_waf_arguments, + expected_waf_persisted_data, + {}, Datadog.configuration.appsec.waf_timeout ).and_return(waf_result) described_class.subscribe(operation, waf_context) diff --git a/spec/datadog/appsec/processor/context_spec.rb b/spec/datadog/appsec/processor/context_spec.rb index bcb0724a5fd..a482c410efb 100644 --- a/spec/datadog/appsec/processor/context_spec.rb +++ b/spec/datadog/appsec/processor/context_spec.rb @@ -24,7 +24,7 @@ let(:run_count) { 1 } let(:timeout) { 10_000_000_000 } - let(:runs) { Array.new(run_count) { context.run(input, timeout) } } + let(:runs) { Array.new(run_count) { context.run(input, {}, timeout) } } let(:results) { runs } let(:overall_runtime) { results.reduce(0) { |a, e| a + e.total_runtime } } @@ -91,10 +91,11 @@ { 'string_value' => 'hello' }, + {}, timeout ).and_call_original - context.run(input, timeout) + context.run(input, {}, timeout) end it 'do not removes boolean values' do @@ -103,10 +104,10 @@ 'true_value' => true } expect(context.instance_variable_get(:@context)).to receive(:run).with( - input, timeout + input, {}, timeout ).and_call_original - context.run(input, timeout) + context.run(input, {}, timeout) end it 'removes empty string values' do @@ -118,10 +119,11 @@ { 'string_value' => 'hello' }, + {}, timeout ).and_call_original - context.run(input, timeout) + context.run(input, {}, timeout) end it 'removes empty arrays values' do @@ -133,10 +135,11 @@ { 'non_empty_array_value' => [1, 2] }, + {}, timeout ).and_call_original - context.run(input, timeout) + context.run(input, {}, timeout) end it 'removes empty hash values' do @@ -148,10 +151,11 @@ { 'non_empty_hash_value' => { 'hello' => 'world' } }, + {}, timeout ).and_call_original - context.run(input, timeout) + context.run(input, {}, timeout) end end @@ -184,8 +188,8 @@ context 'same attack' do let(:runs) do [ - context.run(input_scanner, timeout), - context.run(input_scanner, timeout) + context.run(input_scanner, {}, timeout), + context.run(input_scanner, {}, timeout) ] end @@ -201,8 +205,8 @@ context 'different attacks' do let(:runs) do [ - context.run(input_sqli, timeout), - context.run(input_scanner, timeout) + context.run(input_sqli, {}, timeout), + context.run(input_scanner, {}, timeout) ] end @@ -236,7 +240,7 @@ context 'run failed with libddwaf error result' do before do - allow(context.instance_variable_get(:@context)).to receive(:run).with(input, timeout) + allow(context.instance_variable_get(:@context)).to receive(:run).with(input, {}, timeout) .and_return([result.status, result]) end @@ -252,17 +256,17 @@ it 'sends telemetry error' do expect(telemetry).to receive(:error).with(/libddwaf:[\d.]+ execution error: :err_invalid_object/) - context.run(input, timeout) + context.run(input, {}, timeout) end end context 'run failed with libddwaf low-level exception' do before do - allow(context.instance_variable_get(:@context)).to receive(:run).with(input, timeout) + allow(context.instance_variable_get(:@context)).to receive(:run).with(input, {}, timeout) .and_raise(Datadog::AppSec::WAF::LibDDWAF::Error, 'Could not convert persistent data') end - let(:result) { context.run(input, timeout) } + let(:result) { context.run(input, {}, timeout) } it 'sends telemetry report' do expect(telemetry).to receive(:error).with(/libddwaf:[\d.]+ execution error: :err_internal/) @@ -296,6 +300,7 @@ expect(context.instance_variable_get(:@context)).to receive(:run).with( input, + {}, Datadog::AppSec::WAF::LibDDWAF::DDWAF_RUN_TIMEOUT ).and_return([result.status, result]) @@ -304,7 +309,7 @@ it 'returns schema extraction information' do input = { 'server.request.query' => { 'vin' => '4Y1SL65848Z411439' } } - context.run(input, timeout) + context.run(input, {}, timeout) results = context.extract_schema derivatives = results.derivatives diff --git a/vendor/rbs/ffi/0/ffi.rbs b/vendor/rbs/ffi/0/ffi.rbs deleted file mode 100644 index 99b56b82695..00000000000 --- a/vendor/rbs/ffi/0/ffi.rbs +++ /dev/null @@ -1,62 +0,0 @@ -module FFI - module Type - class Builtin - end - - class Mapped - end - end - - class AbstractMemory - def get_array_of_string: (::Integer, ::Integer) -> Array[String] - def read_bytes: (::Integer) -> ::String - end - - class Pointer < AbstractMemory - NULL: Pointer - - def null?: () -> bool - end - - class MemoryPointer < Pointer - def self.from_string: (::String) -> MemoryPointer - end - - class Enum - end - - class Union - def self.layout: (*(Symbol | Integer)) -> void - end - - type union = top # TODO: handle user-defined unions - - class Struct - # TODO: layout args are actually "Symbol | Union, Integer, *(Symbol | Union, Integer)" - def self.layout: (*(Symbol | Integer | union)) -> void - def self.by_ref: () -> Type::Mapped - def self.size: () -> Integer - - def null?: () -> bool - def initialize: (?Pointer) -> void - def []: (Symbol) -> untyped - def []=: (Symbol, untyped) -> untyped - def pointer: () -> Pointer - end - - class Function < Pointer - end - - module Library - # these can be worked around by typedef'ing to a Symbol - type enum = top # TODO: handle user-defined enum constants - type ref = top # TODO: handle by_ref references - type typedef = top # TODO: handle non-builtin types - - def ffi_lib: (Array[String]) -> void - def typedef: (ref | Symbol, Symbol) -> (Type::Builtin | Type::Mapped | typedef) - def attach_function: (Symbol, Array[Symbol | Struct | enum], Symbol | Enum, ?blocking: bool) -> Function - def callback: (Symbol, Array[Symbol | Enum | Struct], Symbol | Enum) -> Function - def enum: (*untyped) -> Enum - end -end diff --git a/vendor/rbs/libddwaf-stub/0/datadog/appsec/waf.rbs b/vendor/rbs/libddwaf-stub/0/datadog/appsec/waf.rbs new file mode 100644 index 00000000000..4fd3c2d1d78 --- /dev/null +++ b/vendor/rbs/libddwaf-stub/0/datadog/appsec/waf.rbs @@ -0,0 +1,137 @@ +module Datadog + module AppSec + # rubocop:disable Metrics/ModuleLength + module WAF + # retain logging proc if set properly + self.@log_callback: untyped + + self.@logger: untyped + + def self.version: () -> untyped + + # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity + def self.ruby_to_object: (untyped val, ?max_container_size: untyped?, ?max_container_depth: untyped?, ?max_string_length: untyped?, ?coerce: bool) -> untyped + + def self.object_to_ruby: (untyped obj) -> untyped + + def self.log_callback: (untyped level, untyped func, untyped file, untyped line, untyped message, untyped len) -> (nil | untyped) + + def self.logger: () -> untyped + + def self.logger=: (untyped logger) -> untyped + + RESULT_CODE: { ddwaf_err_internal: :err_internal, ddwaf_err_invalid_object: :err_invalid_object, ddwaf_err_invalid_argument: :err_invalid_argument, ddwaf_ok: :ok, ddwaf_match: :match } + + module LibDDWAF + class Error < StandardError + @diagnostics: untyped + + attr_reader diagnostics: untyped + + def initialize: (untyped msg, ?diagnostics: untyped?) -> void + end + + class Object + end + + DDWAF_RUN_TIMEOUT: untyped + end + + class Handle + @config: untyped + + @handle_obj: untyped + + @diagnostics: untyped + + @valid: untyped + + attr_reader handle_obj: untyped + + attr_reader diagnostics: untyped + + attr_reader config: untyped + + def initialize: (untyped rule, ?limits: ::Hash[untyped, untyped], ?obfuscator: ::Hash[untyped, untyped]) -> void + + def finalize: () -> untyped + + def required_addresses: () -> (::Array[untyped] | untyped) + + def merge: (untyped data) -> untyped + + private + + def new_from_handle: (untyped handle_object, untyped diagnostics, untyped config) -> untyped + + def validate!: () -> untyped + + def invalidate!: () -> untyped + + def valid?: () -> untyped + + def valid!: () -> (nil | untyped) + end + + class Result + @status: untyped + + @events: untyped + + @total_runtime: untyped + + @timeout: untyped + + @actions: untyped + + @derivatives: untyped + + attr_reader status: untyped + + attr_reader events: untyped + + attr_reader total_runtime: untyped + + attr_reader timeout: untyped + + attr_reader actions: untyped + + attr_reader derivatives: untyped + + def initialize: (untyped status, untyped events, untyped total_runtime, untyped timeout, untyped actions, untyped derivatives) -> void + end + + class Context + @context_obj: untyped + + @valid: untyped + + @retained: untyped + + attr_reader context_obj: untyped + + def initialize: (untyped handle) -> void + + def finalize: () -> untyped + + def run: (untyped persistent_data, untyped ephemeral_data, ?untyped timeout) -> untyped + + private + + def validate!: () -> untyped + + def invalidate!: () -> untyped + + def valid?: () -> untyped + + def valid!: () -> (nil | untyped) + + def retained: () -> untyped + + def retain: (untyped object) -> untyped + + def release: (untyped object) -> untyped + end + end + end +end diff --git a/vendor/rbs/libddwaf/0/datadog/appsec/waf/version.rbs b/vendor/rbs/libddwaf-stub/0/datadog/appsec/waf/version.rbs similarity index 100% rename from vendor/rbs/libddwaf/0/datadog/appsec/waf/version.rbs rename to vendor/rbs/libddwaf-stub/0/datadog/appsec/waf/version.rbs diff --git a/vendor/rbs/libddwaf/0/datadog/appsec/waf.rbs b/vendor/rbs/libddwaf/0/datadog/appsec/waf.rbs deleted file mode 100644 index af8c30dd3e5..00000000000 --- a/vendor/rbs/libddwaf/0/datadog/appsec/waf.rbs +++ /dev/null @@ -1,217 +0,0 @@ -module Datadog - module AppSec - module WAF - module LibDDWAF - class Error < StandardError - attr_reader diagnostics: ::Datadog::AppSec::WAF::data - - def initialize: (::String msg, ?diagnostics: ::Datadog::AppSec::WAF::data?) -> void - end - - extend ::FFI::Library - - def self.local_os: () -> ::String - def self.local_cpu: () -> ::String - def self.local_version: () -> (::String | nil) - def self.source_dir: () -> ::String - def self.vendor_dir: () -> ::String - def self.libddwaf_vendor_dir: () -> ::String - def self.shared_lib_triplet: (?version: ::String?) -> ::String - def self.libddwaf_dir: () -> ::String - def self.shared_lib_extname: () -> ::String - def self.shared_lib_path: () -> ::String - - # version - - def self.ddwaf_get_version: () -> ::String - - # ddwaf::object data structure - - DDWAF_OBJ_TYPE: ::FFI::Enum - - class UInt32Ptr < ::FFI::Struct - end - - class UInt64Ptr < ::FFI::Struct - end - - class SizeTPtr < ::FFI::Struct - end - - class ObjectValueUnion < ::FFI::Union - end - - class Object < ::FFI::Struct - end - - # setters - - def self.ddwaf_object_invalid: (LibDDWAF::Object) -> ::FFI::Pointer - def self.ddwaf_object_string: (LibDDWAF::Object, ::String) -> ::FFI::Pointer - def self.ddwaf_object_stringl: (LibDDWAF::Object, ::String, ::Integer) -> ::FFI::Pointer - def self.ddwaf_object_stringl_nc: (LibDDWAF::Object, ::String, ::Integer) -> ::FFI::Pointer - def self.ddwaf_object_unsigned: (LibDDWAF::Object, ::Integer) -> ::FFI::Pointer - def self.ddwaf_object_signed: (LibDDWAF::Object, ::Integer) -> ::FFI::Pointer - def self.ddwaf_object_string_from_unsigned: (LibDDWAF::Object, ::Integer) -> ::FFI::Pointer - def self.ddwaf_object_string_from_signed: (LibDDWAF::Object, ::Integer) -> ::FFI::Pointer - def self.ddwaf_object_bool: (LibDDWAF::Object, bool) -> ::FFI::Pointer - def self.ddwaf_object_float: (LibDDWAF::Object, ::Float) -> ::FFI::Pointer - def self.ddwaf_object_null: (LibDDWAF::Object) -> ::FFI::Pointer - - def self.ddwaf_object_array: (LibDDWAF::Object) -> ::FFI::Pointer - def self.ddwaf_object_array_add: (LibDDWAF::Object, LibDDWAF::Object) -> bool - - def self.ddwaf_object_map: (LibDDWAF::Object) -> ::FFI::Pointer - def self.ddwaf_object_map_add: (LibDDWAF::Object, ::String, LibDDWAF::Object) -> bool - def self.ddwaf_object_map_addl: (LibDDWAF::Object, ::String, ::Integer, LibDDWAF::Object) -> bool - def self.ddwaf_object_map_addl_nc: (LibDDWAF::Object, ::String, ::Integer, LibDDWAF::Object) -> bool - - # getters - - def self.ddwaf_object_type: (LibDDWAF::Object) -> ::FFI::Enum - def self.ddwaf_object_size: (LibDDWAF::Object) -> ::Integer - def self.ddwaf_object_length: (LibDDWAF::Object) -> ::Integer - def self.ddwaf_object_get_key: (LibDDWAF::Object, SizeTPtr) -> ::String - def self.ddwaf_object_get_string: (LibDDWAF::Object, SizeTPtr) -> ::String - def self.ddwaf_object_get_unsigned: (LibDDWAF::Object, SizeTPtr) -> ::Integer - def self.ddwaf_object_get_signed: (LibDDWAF::Object, SizeTPtr) -> ::Integer - def self.ddwaf_object_get_index: (LibDDWAF::Object, ::Integer) -> LibDDWAF::Object - def self.ddwaf_object_get_bool: (LibDDWAF::Object) -> bool - def self.ddwaf_object_get_float: (LibDDWAF::Object) -> ::Float - - # freeers - - def self.ddwaf_object_free: (LibDDWAF::Object) -> void - - ObjectFree: ::FFI::Function - ObjectNoFree: ::FFI::Pointer - - # main handle - - class Config < ::FFI::Struct - class Limits < ::FFI::Struct - end - - class Obfuscator < ::FFI::Struct - end - end - - def self.ddwaf_init: (top, Config, Object) -> ::FFI::Pointer - def self.ddwaf_update: (::FFI::Pointer, LibDDWAF::Object, LibDDWAF::Object) -> ::FFI::Pointer - def self.ddwaf_destroy: (::FFI::Pointer) -> void - - def self.ddwaf_required_addresses: (::FFI::Pointer, UInt32Ptr) -> ::FFI::Pointer - def self.ddwaf_rule_data_ids: (::FFI::Pointer, UInt32Ptr) -> ::FFI::Pointer - - # updating - - DDWAF_RET_CODE: ::FFI::Enum - - # running - - def self.ddwaf_context_init: (::FFI::Pointer) -> ::FFI::Pointer - def self.ddwaf_context_destroy: (::FFI::Pointer) -> void - - class Result < ::FFI::Struct - end - - def self.ddwaf_run: (::FFI::Pointer, Object, Result, ::Integer) -> ::Symbol - def self.ddwaf_result_free: (Result) -> void - - # logging - - DDWAF_LOG_LEVEL: ::FFI::Enum - - type ddwaf_log_level = ::Symbol - - # TODO: signature is as below but steep 1.1 does not yet support method/proc/block mapping - # type ddwaf_log_cb = ^(ddwaf_log_level, ::String, ::String, ::Integer, ::FFI::Pointer, ::Integer) -> void - type ddwaf_log_cb = ::Method | ::Proc - def self.ddwaf_set_log_cb: (ddwaf_log_cb, ddwaf_log_level) -> bool - - DEFAULT_MAX_CONTAINER_SIZE: ::Integer - DEFAULT_MAX_CONTAINER_DEPTH: ::Integer - DEFAULT_MAX_STRING_LENGTH: ::Integer - - DDWAF_MAX_CONTAINER_SIZE: ::Integer - DDWAF_MAX_CONTAINER_DEPTH: ::Integer - DDWAF_MAX_STRING_LENGTH: ::Integer - - DDWAF_RUN_TIMEOUT: ::Integer - end - - def self.version: () -> ::String - - type data = String | Symbol | Integer | Float | TrueClass | FalseClass | Array[data] | Hash[(String | Symbol | nil), data] | nil - - def self.ruby_to_object: (top val, ?max_container_size: ::Integer?, ?max_container_depth: ::Integer?, ?max_string_length: ::Integer?, ?coerce: bool?) -> ::Datadog::AppSec::WAF::LibDDWAF::Object - def self.object_to_ruby: (::Datadog::AppSec::WAF::LibDDWAF::Object obj) -> data - - self.@logger: ::Logger - self.@log_callback: LibDDWAF::ddwaf_log_cb - - def self.log_callback: (LibDDWAF::ddwaf_log_level, ::String, ::String, ::Integer, ::FFI::Pointer, ::Integer) -> void - def self.logger: () -> ::Logger - def self.logger=: (::Logger logger) -> void - - RESULT_CODE: ::Hash[::Symbol, ::Symbol] - - class Handle - attr_reader handle_obj: ::FFI::Pointer - attr_reader diagnostics: data - attr_reader config: WAF::LibDDWAF::Config - - def initialize: (data rule, ?limits: ::Hash[::Symbol, ::Integer], ?obfuscator: ::Hash[::Symbol, ::String]) -> void - def finalize: () -> untyped - def required_addresses: () -> ::Array[::String] - def merge: (untyped data) -> Handle? - - private - - @valid: bool - - def new_from_handle: (::FFI::Pointer handle_object, data diagnostics, WAF::LibDDWAF::Config config) -> untyped - def validate!: () -> void - def invalidate!: () -> void - def valid?: () -> (nil | bool) - def valid!: () -> void - end - - class Result - attr_reader status: ::Symbol - attr_reader events: data - attr_reader total_runtime: ::Float - attr_reader timeout: bool - # Until we update libddwaf, actions is an array - attr_reader actions: ::Array[data] - attr_reader derivatives: data - - def initialize: (::Symbol, data, ::Float, bool, data, data) -> void - end - - class Context - attr_reader context_obj: ::FFI::Pointer - - def initialize: (Handle handle) -> void - def finalize: () -> void - - def run: (data input, ?::Integer timeout) -> [::Symbol, Result] - - private - - @valid: bool - - def validate!: () -> void - def invalidate!: () -> void - def valid?: () -> (nil | bool) - def valid!: () -> void - - @retained: Array[untyped] - - def retained: () -> Array[untyped] - def retain: (top object) -> void - def release: (top object) -> void - end - end - end -end diff --git a/vendor/rbs/libddwaf/0/libddwaf.rbs b/vendor/rbs/libddwaf/0/libddwaf.rbs deleted file mode 100644 index e69de29bb2d..00000000000