datadog 2.10.0 → 2.12.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.12.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0.0.0
+        version: 1.18.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0.0.0
+        version: 1.18.0.0.1
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.3.1.1.0
+        version: 16.0.1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.3.1.1.0
+        version: 16.0.1.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,6 @@ executables:
 - ddprofrb
 extensions:
 - ext/datadog_profiling_native_extension/extconf.rb
-- ext/datadog_profiling_loader/extconf.rb
 - ext/libdatadog_api/extconf.rb
 extra_rdoc_files: []
 files:
@@ -102,8 +101,6 @@ files:
 - NOTICE
 - README.md
 - bin/ddprofrb
-- ext/datadog_profiling_loader/datadog_profiling_loader.c
-- ext/datadog_profiling_loader/extconf.rb
 - ext/datadog_profiling_native_extension/NativeExtensionDesign.md
 - ext/datadog_profiling_native_extension/clock_id.h
 - ext/datadog_profiling_native_extension/clock_id_from_pthread.c
@@ -173,6 +170,7 @@ files:
 - lib/datadog/appsec/contrib/active_record/integration.rb
 - lib/datadog/appsec/contrib/active_record/patcher.rb
 - lib/datadog/appsec/contrib/auto_instrument.rb
+- lib/datadog/appsec/contrib/devise/configuration.rb
 - lib/datadog/appsec/contrib/devise/event.rb
 - lib/datadog/appsec/contrib/devise/ext.rb
 - lib/datadog/appsec/contrib/devise/integration.rb
@@ -182,23 +180,26 @@ files:
 - lib/datadog/appsec/contrib/devise/patcher/rememberable_patch.rb
 - lib/datadog/appsec/contrib/devise/resource.rb
 - lib/datadog/appsec/contrib/devise/tracking.rb
+- lib/datadog/appsec/contrib/excon/integration.rb
+- lib/datadog/appsec/contrib/excon/patcher.rb
+- lib/datadog/appsec/contrib/excon/ssrf_detection_middleware.rb
+- lib/datadog/appsec/contrib/faraday/connection_patch.rb
+- lib/datadog/appsec/contrib/faraday/integration.rb
+- lib/datadog/appsec/contrib/faraday/patcher.rb
+- lib/datadog/appsec/contrib/faraday/rack_builder_patch.rb
+- lib/datadog/appsec/contrib/faraday/ssrf_detection_middleware.rb
 - lib/datadog/appsec/contrib/graphql/appsec_trace.rb
 - lib/datadog/appsec/contrib/graphql/gateway/multiplex.rb
 - lib/datadog/appsec/contrib/graphql/gateway/watcher.rb
 - lib/datadog/appsec/contrib/graphql/integration.rb
 - lib/datadog/appsec/contrib/graphql/patcher.rb
-- lib/datadog/appsec/contrib/graphql/reactive/multiplex.rb
 - lib/datadog/appsec/contrib/integration.rb
-- lib/datadog/appsec/contrib/patcher.rb
 - lib/datadog/appsec/contrib/rack/ext.rb
 - lib/datadog/appsec/contrib/rack/gateway/request.rb
 - lib/datadog/appsec/contrib/rack/gateway/response.rb
 - lib/datadog/appsec/contrib/rack/gateway/watcher.rb
 - lib/datadog/appsec/contrib/rack/integration.rb
 - lib/datadog/appsec/contrib/rack/patcher.rb
-- lib/datadog/appsec/contrib/rack/reactive/request.rb
-- lib/datadog/appsec/contrib/rack/reactive/request_body.rb
-- lib/datadog/appsec/contrib/rack/reactive/response.rb
 - lib/datadog/appsec/contrib/rack/request_body_middleware.rb
 - lib/datadog/appsec/contrib/rack/request_middleware.rb
 - lib/datadog/appsec/contrib/rails/ext.rb
@@ -207,16 +208,17 @@ files:
 - lib/datadog/appsec/contrib/rails/gateway/watcher.rb
 - lib/datadog/appsec/contrib/rails/integration.rb
 - lib/datadog/appsec/contrib/rails/patcher.rb
-- lib/datadog/appsec/contrib/rails/reactive/action.rb
 - lib/datadog/appsec/contrib/rails/request.rb
 - lib/datadog/appsec/contrib/rails/request_middleware.rb
+- lib/datadog/appsec/contrib/rest_client/integration.rb
+- lib/datadog/appsec/contrib/rest_client/patcher.rb
+- lib/datadog/appsec/contrib/rest_client/request_ssrf_detection_patch.rb
 - lib/datadog/appsec/contrib/sinatra/framework.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/request.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/route_params.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb
 - lib/datadog/appsec/contrib/sinatra/integration.rb
 - lib/datadog/appsec/contrib/sinatra/patcher.rb
-- lib/datadog/appsec/contrib/sinatra/reactive/routed.rb
 - lib/datadog/appsec/contrib/sinatra/request_middleware.rb
 - lib/datadog/appsec/event.rb
 - lib/datadog/appsec/ext.rb
@@ -224,20 +226,17 @@ files:
 - lib/datadog/appsec/instrumentation.rb
 - lib/datadog/appsec/instrumentation/gateway.rb
 - lib/datadog/appsec/instrumentation/gateway/argument.rb
+- lib/datadog/appsec/instrumentation/gateway/middleware.rb
 - lib/datadog/appsec/metrics.rb
 - lib/datadog/appsec/metrics/collector.rb
 - lib/datadog/appsec/metrics/exporter.rb
 - lib/datadog/appsec/metrics/telemetry.rb
 - lib/datadog/appsec/monitor.rb
 - lib/datadog/appsec/monitor/gateway/watcher.rb
-- lib/datadog/appsec/monitor/reactive/set_user.rb
 - lib/datadog/appsec/processor.rb
 - lib/datadog/appsec/processor/rule_loader.rb
 - lib/datadog/appsec/processor/rule_merger.rb
 - lib/datadog/appsec/rate_limiter.rb
-- lib/datadog/appsec/reactive/address_hash.rb
-- lib/datadog/appsec/reactive/engine.rb
-- lib/datadog/appsec/reactive/subscriber.rb
 - lib/datadog/appsec/remote.rb
 - lib/datadog/appsec/response.rb
 - lib/datadog/appsec/sample_rate.rb
@@ -272,6 +271,7 @@ files:
 - lib/datadog/core/diagnostics/environment_logger.rb
 - lib/datadog/core/diagnostics/health.rb
 - lib/datadog/core/encoding.rb
+- lib/datadog/core/environment/agent_info.rb
 - lib/datadog/core/environment/cgroup.rb
 - lib/datadog/core/environment/class_count.rb
 - lib/datadog/core/environment/container.rb
@@ -318,9 +318,6 @@ files:
 - lib/datadog/core/remote/transport/config.rb
 - lib/datadog/core/remote/transport/http.rb
 - lib/datadog/core/remote/transport/http/api.rb
-- lib/datadog/core/remote/transport/http/api/instance.rb
-- lib/datadog/core/remote/transport/http/api/spec.rb
-- lib/datadog/core/remote/transport/http/builder.rb
 - lib/datadog/core/remote/transport/http/client.rb
 - lib/datadog/core/remote/transport/http/config.rb
 - lib/datadog/core/remote/transport/http/negotiation.rb
@@ -346,13 +343,17 @@ files:
 - lib/datadog/core/telemetry/request.rb
 - lib/datadog/core/telemetry/worker.rb
 - lib/datadog/core/transport/ext.rb
+- lib/datadog/core/transport/http.rb
 - lib/datadog/core/transport/http/adapters/net.rb
 - lib/datadog/core/transport/http/adapters/registry.rb
 - lib/datadog/core/transport/http/adapters/test.rb
 - lib/datadog/core/transport/http/adapters/unix_socket.rb
 - lib/datadog/core/transport/http/api/endpoint.rb
 - lib/datadog/core/transport/http/api/fallbacks.rb
+- lib/datadog/core/transport/http/api/instance.rb
 - lib/datadog/core/transport/http/api/map.rb
+- lib/datadog/core/transport/http/api/spec.rb
+- lib/datadog/core/transport/http/builder.rb
 - lib/datadog/core/transport/http/env.rb
 - lib/datadog/core/transport/http/response.rb
 - lib/datadog/core/transport/parcel.rb
@@ -397,6 +398,7 @@ files:
 - lib/datadog/di/error.rb
 - lib/datadog/di/extensions.rb
 - lib/datadog/di/instrumenter.rb
+- lib/datadog/di/logger.rb
 - lib/datadog/di/preload.rb
 - lib/datadog/di/probe.rb
 - lib/datadog/di/probe_builder.rb
@@ -406,7 +408,13 @@ files:
 - lib/datadog/di/redactor.rb
 - lib/datadog/di/remote.rb
 - lib/datadog/di/serializer.rb
-- lib/datadog/di/transport.rb
+- lib/datadog/di/transport/diagnostics.rb
+- lib/datadog/di/transport/http.rb
+- lib/datadog/di/transport/http/api.rb
+- lib/datadog/di/transport/http/client.rb
+- lib/datadog/di/transport/http/diagnostics.rb
+- lib/datadog/di/transport/http/input.rb
+- lib/datadog/di/transport/input.rb
 - lib/datadog/di/utils.rb
 - lib/datadog/kit.rb
 - lib/datadog/kit/appsec/events.rb
@@ -613,6 +621,7 @@ files:
 - lib/datadog/tracing/contrib/grape/instrumentation.rb
 - lib/datadog/tracing/contrib/grape/integration.rb
 - lib/datadog/tracing/contrib/grape/patcher.rb
+- lib/datadog/tracing/contrib/graphql/configuration/error_extension_env_parser.rb
 - lib/datadog/tracing/contrib/graphql/configuration/settings.rb
 - lib/datadog/tracing/contrib/graphql/ext.rb
 - lib/datadog/tracing/contrib/graphql/integration.rb
@@ -868,6 +877,8 @@ files:
 - lib/datadog/tracing/metadata/analytics.rb
 - lib/datadog/tracing/metadata/errors.rb
 - lib/datadog/tracing/metadata/ext.rb
+- lib/datadog/tracing/metadata/metastruct.rb
+- lib/datadog/tracing/metadata/metastruct_tagging.rb
 - lib/datadog/tracing/metadata/tagging.rb
 - lib/datadog/tracing/pipeline.rb
 - lib/datadog/tracing/pipeline/span_filter.rb
@@ -900,9 +911,6 @@ files:
 - lib/datadog/tracing/tracer.rb
 - lib/datadog/tracing/transport/http.rb
 - lib/datadog/tracing/transport/http/api.rb
-- lib/datadog/tracing/transport/http/api/instance.rb
-- lib/datadog/tracing/transport/http/api/spec.rb
-- lib/datadog/tracing/transport/http/builder.rb
 - lib/datadog/tracing/transport/http/client.rb
 - lib/datadog/tracing/transport/http/statistics.rb
 - lib/datadog/tracing/transport/http/traces.rb
@@ -925,8 +933,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.10.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.10.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.12.2/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.12.2
 post_install_message:
 rdoc_options: []
 require_paths:

data/ext/datadog_profiling_loader/datadog_profiling_loader.c

@@ -1,142 +0,0 @@
-#include <stdbool.h>
-#include <dlfcn.h>
-#include <ruby.h>
-
-// Why this exists:
-//
-// The Datadog::Profiling::Loader exists because when Ruby loads a native extension (using `require`), it uses
-// `dlopen(..., RTLD_LAZY | RTLD_GLOBAL)` (https://github.com/ruby/ruby/blob/67950a4c0a884bdb78d9beb4405ebf7459229b21/dln.c#L362).
-// This means that every symbol exposed directly or indirectly by that native extension becomes visible to every other
-// extension in the Ruby process. This can cause issues, see https://github.com/rubyjs/mini_racer/pull/179.
-//
-// Instead of `RTLD_LAZY | RTLD_GLOBAL`, we want to call `dlopen` with `RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND` when
-// loading the profiling native extension, to avoid leaking any unintended symbols (`RTLD_LOCAL`) and avoid picking
-// up other's symbols (`RTLD_DEEPBIND`).
-//
-// But Ruby's extension loading mechanism is not configurable -- there's no way to tell it to use different flags when
-// calling `dlopen`. To get around this, this file (datadog_profiling_loader.c) introduces another extension
-// (profiling loader) which has only a single responsibility: mimic Ruby's extension loading mechanism, but when calling
-// `dlopen` use a different set of flags.
-// This idea was shamelessly stolen from @lloeki's work in https://github.com/rubyjs/mini_racer/pull/179, big thanks!
-//
-// Extra note: Currently (May 2022), that we know of, the profiling native extension only exposes one potentially
-// problematic symbol: `rust_eh_personality` (coming from libdatadog).
-// Future versions of Rust have been patched not to expose this
-// (see https://github.com/rust-lang/rust/pull/95604#issuecomment-1108563434) so we may want to revisit the need
-// for this loader in the future, and perhaps delete it if we no longer require its services :)
-
-#ifndef RTLD_DEEPBIND
-  #define RTLD_DEEPBIND 0
-#endif
-
-// Used to mark function arguments that are deliberately left unused
-#ifdef __GNUC__
-  #define DDTRACE_UNUSED  __attribute__((unused))
-#else
-  #define DDTRACE_UNUSED
-#endif
-
-static VALUE ok_symbol = Qnil; // :ok in Ruby
-static VALUE error_symbol = Qnil; // :error in Ruby
-
-static VALUE _native_load(DDTRACE_UNUSED VALUE self, VALUE ruby_path, VALUE ruby_init_name);
-static bool failed_to_load(void *handle, VALUE *failure_details);
-static bool incompatible_library(void *handle, VALUE *failure_details);
-static bool failed_to_initialize(void *handle, char *init_name, VALUE *failure_details);
-static void set_failure_from_dlerror(VALUE *failure_details);
-static void unload_failed_library(void *handle);
-
-#define DDTRACE_EXPORT __attribute__ ((visibility ("default")))
-
-void DDTRACE_EXPORT Init_datadog_profiling_loader(void) {
-  VALUE datadog_module = rb_define_module("Datadog");
-  VALUE profiling_module = rb_define_module_under(datadog_module, "Profiling");
-  VALUE loader_module = rb_define_module_under(profiling_module, "Loader");
-  rb_define_singleton_method(loader_module, "_native_load", _native_load, 2);
-
-  ok_symbol = ID2SYM(rb_intern_const("ok"));
-  error_symbol = ID2SYM(rb_intern_const("error"));
-}
-
-static VALUE _native_load(DDTRACE_UNUSED VALUE self, VALUE ruby_path, VALUE ruby_init_name) {
-  Check_Type(ruby_path, T_STRING);
-  Check_Type(ruby_init_name, T_STRING);
-
-  char *path = StringValueCStr(ruby_path);
-  char *init_name = StringValueCStr(ruby_init_name);
-
-  int dlopen_flags = RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND;
-
-  #if defined(__has_feature)
-    #if __has_feature(address_sanitizer)
-      dlopen_flags &= ~RTLD_DEEPBIND; // Not supported by ASAN
-    #endif
-  #endif
-
-  void *handle = dlopen(path, dlopen_flags);
-
-  VALUE failure_details = Qnil;
-
-  if (
-    failed_to_load(handle, &failure_details) ||
-    incompatible_library(handle, &failure_details) ||
-    failed_to_initialize(handle, init_name, &failure_details)
-  ) {
-    return rb_ary_new_from_args(2, error_symbol, failure_details);
-  }
-
-  return rb_ary_new_from_args(2, ok_symbol, Qnil);
-}
-
-static bool failed_to_load(void *handle, VALUE *failure_details) {
-  if (handle == NULL) {
-    set_failure_from_dlerror(failure_details);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-static bool incompatible_library(void *handle, VALUE *failure_details) {
-  // The library being loaded may be linked to a different libruby than the current executing Ruby.
-  // We check if this is the case by checking if a well-known symbol resolves to a common address.
-
-  void *xmalloc_from_library = dlsym(handle, "ruby_xmalloc");
-
-  if (xmalloc_from_library == NULL) {
-    // This happens when ruby is built without a `libruby.so` by using `--disable-shared` at compilation time.
-    // In this situation, no conflict between libruby version is possible.
-    return false;
-  }
-
-  if (xmalloc_from_library != &ruby_xmalloc) {
-    *failure_details = rb_str_new_cstr("library was compiled and linked to a different Ruby version");
-    unload_failed_library(handle);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-static bool failed_to_initialize(void *handle, char *init_name, VALUE *failure_details) {
-  void (*initialization_function)(void) = dlsym(handle, init_name);
-
-  if (initialization_function == NULL) {
-    set_failure_from_dlerror(failure_details);
-    unload_failed_library(handle);
-    return true;
-  } else {
-    (*initialization_function)();
-    return false;
-  }
-}
-
-static void set_failure_from_dlerror(VALUE *failure_details) {
-  char *failure = dlerror();
-  *failure_details = failure == NULL ? Qnil : rb_str_new_cstr(failure);
-}
-
-static void unload_failed_library(void *handle) {
-  // Note: According to the Ruby VM sources, this may fail with a segfault on really old versions of macOS (< 10.11)
-  dlclose(handle);
-}

data/ext/datadog_profiling_loader/extconf.rb

@@ -1,60 +0,0 @@
-# rubocop:disable Style/StderrPuts
-
-if RUBY_ENGINE != "ruby" || Gem.win_platform?
-  $stderr.puts(
-    "WARN: Skipping build of Datadog profiling loader. See Datadog profiling native extension note for details."
-  )
-
-  File.write("Makefile", "all install clean: # dummy makefile that does nothing")
-  exit
-end
-
-require "mkmf"
-
-# Because we can't control what compiler versions our customers use, shipping with -Werror by default is a no-go.
-# But we can enable it in CI, so that we quickly spot any new warnings that just got introduced.
-append_cflags "-Werror" if ENV["DATADOG_GEM_CI"] == "true"
-
-# Older gcc releases may not default to C99 and we need to ask for this. This is also used:
-# * by upstream Ruby -- search for gnu99 in the codebase
-# * by msgpack, another datadog gem dependency
-#   (https://github.com/msgpack/msgpack-ruby/blob/18ce08f6d612fe973843c366ac9a0b74c4e50599/ext/msgpack/extconf.rb#L8)
-append_cflags "-std=gnu99"
-
-# Gets really noisy when we include the MJIT header, let's omit it (TODO: Use #pragma GCC diagnostic instead?)
-append_cflags "-Wno-unused-function"
-
-# Allow defining variables at any point in a function
-append_cflags "-Wno-declaration-after-statement"
-
-# If we forget to include a Ruby header, the function call may still appear to work, but then
-# cause a segfault later. Let's ensure that never happens.
-append_cflags "-Werror-implicit-function-declaration"
-
-# Warn on unused parameters to functions. Use `DDTRACE_UNUSED` to mark things as known-to-not-be-used.
-append_cflags "-Wunused-parameter"
-
-# The native extension is not intended to expose any symbols/functions for other native libraries to use;
-# the sole exception being `Init_datadog_profiling_loader` which needs to be visible for Ruby to call it when
-# it `dlopen`s the library.
-#
-# By setting this compiler flag, we tell it to assume that everything is private unless explicitly stated.
-# For more details see https://gcc.gnu.org/wiki/Visibility
-append_cflags "-fvisibility=hidden"
-
-# Avoid legacy C definitions
-append_cflags "-Wold-style-definition"
-
-# Enable all other compiler warnings
-append_cflags "-Wall"
-append_cflags "-Wextra"
-
-# Tag the native extension library with the Ruby version and Ruby platform.
-# This makes it easier for development (avoids "oops I forgot to rebuild when I switched my Ruby") and ensures that
-# the wrong library is never loaded.
-# When requiring, we need to use the exact same string, including the version and the platform.
-EXTENSION_NAME = "datadog_profiling_loader.#{RUBY_VERSION}_#{RUBY_PLATFORM}".freeze
-
-create_makefile(EXTENSION_NAME)
-
-# rubocop:enable Style/StderrPuts

data/lib/datadog/appsec/contrib/graphql/reactive/multiplex.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module GraphQL
-        module Reactive
-          # Dispatch data from a GraphQL resolve query to the WAF context
-          module Multiplex
-            ADDRESSES = [
-              'graphql.server.all_resolvers'
-            ].freeze
-            private_constant :ADDRESSES
-
-            def self.publish(engine, gateway_multiplex)
-              catch(:block) do
-                engine.publish('graphql.server.all_resolvers', gateway_multiplex.arguments)
-
-                nil
-              end
-            end
-
-            def self.subscribe(engine, context)
-              engine.subscribe(*ADDRESSES) do |*values|
-                Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" }
-                arguments = values[0]
-
-                persistent_data = {
-                  'graphql.server.all_resolvers' => arguments
-                }
-
-                waf_timeout = Datadog.configuration.appsec.waf_timeout
-                result = context.run_waf(persistent_data, {}, waf_timeout)
-
-                next unless result.match?
-
-                yield result
-                throw(:block, true) unless result.actions.empty?
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/patcher.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      # Common patcher code for AppSec integrations
-      # TODO: empty implementation, check with tracer shareable code
-      module Patcher
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/rack/reactive/request.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Rack
-        module Reactive
-          # Dispatch data from a Rack request to the WAF context
-          module Request
-            ADDRESSES = [
-              'request.headers',
-              'request.uri.raw',
-              'request.query',
-              'request.cookies',
-              'request.client_ip',
-              'server.request.method'
-            ].freeze
-            private_constant :ADDRESSES
-
-            def self.publish(engine, gateway_request)
-              catch(:block) do
-                engine.publish('request.query', gateway_request.query)
-                engine.publish('request.headers', gateway_request.headers)
-                engine.publish('request.uri.raw', gateway_request.fullpath)
-                engine.publish('request.cookies', gateway_request.cookies)
-                engine.publish('request.client_ip', gateway_request.client_ip)
-                engine.publish('server.request.method', gateway_request.method)
-
-                nil
-              end
-            end
-
-            def self.subscribe(engine, context)
-              engine.subscribe(*ADDRESSES) do |*values|
-                Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" }
-
-                headers = values[0]
-                headers_no_cookies = headers.dup.tap { |h| h.delete('cookie') }
-                uri_raw = values[1]
-                query = values[2]
-                cookies = values[3]
-                client_ip = values[4]
-                request_method = values[5]
-
-                persistent_data = {
-                  'server.request.cookies' => cookies,
-                  'server.request.query' => query,
-                  'server.request.uri.raw' => uri_raw,
-                  'server.request.headers' => headers,
-                  'server.request.headers.no_cookies' => headers_no_cookies,
-                  'http.client_ip' => client_ip,
-                  'server.request.method' => request_method,
-                }
-
-                waf_timeout = Datadog.configuration.appsec.waf_timeout
-                result = context.run_waf(persistent_data, {}, waf_timeout)
-
-                next unless result.match?
-
-                yield result
-                throw(:block, true) unless result.actions.empty?
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/rack/reactive/request_body.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Rack
-        module Reactive
-          # Dispatch data from a Rack request to the WAF context
-          module RequestBody
-            ADDRESSES = [
-              'request.body',
-            ].freeze
-            private_constant :ADDRESSES
-
-            def self.publish(engine, gateway_request)
-              catch(:block) do
-                # params have been parsed from the request body
-                engine.publish('request.body', gateway_request.form_hash)
-
-                nil
-              end
-            end
-
-            def self.subscribe(engine, context)
-              engine.subscribe(*ADDRESSES) do |*values|
-                Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" }
-                body = values[0]
-
-                persistent_data = {
-                  'server.request.body' => body,
-                }
-
-                waf_timeout = Datadog.configuration.appsec.waf_timeout
-                result = context.run_waf(persistent_data, {}, waf_timeout)
-
-                next unless result.match?
-
-                yield result
-                throw(:block, true) unless result.actions.empty?
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/rack/reactive/response.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Rack
-        module Reactive
-          # Dispatch data from a Rack response to the WAF context
-          module Response
-            ADDRESSES = [
-              'response.status',
-              'response.headers',
-            ].freeze
-            private_constant :ADDRESSES
-
-            def self.publish(engine, gateway_response)
-              catch(:block) do
-                engine.publish('response.status', gateway_response.status)
-                engine.publish('response.headers', gateway_response.headers)
-
-                nil
-              end
-            end
-
-            def self.subscribe(engine, context)
-              engine.subscribe(*ADDRESSES) do |*values|
-                Datadog.logger.debug { "reacted to #{ADDRESSES.inspect}: #{values.inspect}" }
-
-                response_status = values[0]
-                response_headers = values[1]
-                response_headers_no_cookies = response_headers.dup.tap { |h| h.delete('set-cookie') }
-
-                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 = context.run_waf(persistent_data, {}, waf_timeout)
-
-                next unless result.match?
-
-                yield result
-                throw(:block, true) unless result.actions.empty?
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end