datadog 2.48.0 → 2.49.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (277) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +47 -1
  3. data/ext/datadog_profiling_native_extension/collectors_stack.c +1 -1
  4. data/ext/datadog_profiling_native_extension/collectors_stack.h +4 -2
  5. data/ext/datadog_profiling_native_extension/extconf.rb +3 -0
  6. data/ext/datadog_profiling_native_extension/private_vm_api_access.c +13 -21
  7. data/ext/libdatadog_api/extconf.rb +2 -0
  8. data/ext/libdatadog_api/feature_flags.c +137 -0
  9. data/ext/libdatadog_api/process_discovery.c +3 -3
  10. data/ext/libdatadog_extconf_helpers.rb +1 -1
  11. data/lib/datadog/ai_guard/contrib/rack/patcher.rb +3 -5
  12. data/lib/datadog/ai_guard/contrib/rails/patcher.rb +7 -9
  13. data/lib/datadog/ai_guard/contrib/ruby_llm/patcher.rb +3 -5
  14. data/lib/datadog/ai_guard/metrics/telemetry.rb +2 -4
  15. data/lib/datadog/appsec/actions_handler.rb +5 -7
  16. data/lib/datadog/appsec/api_security/endpoint_collection/grape_route_serializer.rb +1 -3
  17. data/lib/datadog/appsec/api_security/endpoint_collection/rails_route_serializer.rb +1 -3
  18. data/lib/datadog/appsec/api_security/endpoint_collection/sinatra_route_serializer.rb +1 -3
  19. data/lib/datadog/appsec/assets.rb +8 -10
  20. data/lib/datadog/appsec/configuration.rb +1 -1
  21. data/lib/datadog/appsec/context.rb +63 -6
  22. data/lib/datadog/appsec/contrib/active_record/instrumentation.rb +1 -3
  23. data/lib/datadog/appsec/contrib/active_record/patcher.rb +21 -24
  24. data/lib/datadog/appsec/contrib/aws_lambda/patcher.rb +3 -5
  25. data/lib/datadog/appsec/contrib/aws_lambda/waf_addresses.rb +9 -11
  26. data/lib/datadog/appsec/contrib/devise/configuration.rb +2 -4
  27. data/lib/datadog/appsec/contrib/devise/patcher.rb +3 -5
  28. data/lib/datadog/appsec/contrib/excon/patcher.rb +3 -5
  29. data/lib/datadog/appsec/contrib/faraday/patcher.rb +4 -6
  30. data/lib/datadog/appsec/contrib/graphql/patcher.rb +3 -5
  31. data/lib/datadog/appsec/contrib/rack/input_peeker.rb +3 -5
  32. data/lib/datadog/appsec/contrib/rack/patcher.rb +3 -5
  33. data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +5 -4
  34. data/lib/datadog/appsec/contrib/rack/request_middleware.rb +6 -7
  35. data/lib/datadog/appsec/contrib/rails/patcher.rb +19 -16
  36. data/lib/datadog/appsec/contrib/rails/patches/live_thread_patch.rb +33 -0
  37. data/lib/datadog/appsec/contrib/rest_client/patcher.rb +3 -5
  38. data/lib/datadog/appsec/contrib/sinatra/patcher.rb +4 -6
  39. data/lib/datadog/appsec/default_header_tags.rb +2 -4
  40. data/lib/datadog/appsec/metrics/exporter.rb +4 -6
  41. data/lib/datadog/appsec/metrics/telemetry.rb +1 -3
  42. data/lib/datadog/appsec/metrics/telemetry_exporter.rb +2 -4
  43. data/lib/datadog/appsec/route_normalizer/route_text.rb +1 -3
  44. data/lib/datadog/appsec/route_normalizer.rb +4 -6
  45. data/lib/datadog/appsec/utils/http/body_reader.rb +3 -5
  46. data/lib/datadog/appsec/utils/http/url_encoded.rb +2 -4
  47. data/lib/datadog/core/borrowing_token_bucket.rb +60 -0
  48. data/lib/datadog/core/chunker.rb +1 -3
  49. data/lib/datadog/core/configuration/components.rb +48 -17
  50. data/lib/datadog/core/configuration/settings.rb +2 -1
  51. data/lib/datadog/core/configuration/supported_configurations.rb +2 -0
  52. data/lib/datadog/core/diagnostics/environment_logger.rb +1 -6
  53. data/lib/datadog/core/encoding.rb +8 -12
  54. data/lib/datadog/core/environment/cgroup.rb +3 -5
  55. data/lib/datadog/core/environment/container.rb +9 -11
  56. data/lib/datadog/core/environment/ext.rb +1 -6
  57. data/lib/datadog/core/environment/gc.rb +2 -4
  58. data/lib/datadog/core/environment/identity.rb +13 -15
  59. data/lib/datadog/core/environment/platform.rb +10 -12
  60. data/lib/datadog/core/environment/socket.rb +3 -5
  61. data/lib/datadog/core/environment/thread_count.rb +2 -4
  62. data/lib/datadog/core/environment/variable_helpers.rb +2 -6
  63. data/lib/datadog/core/environment/vm_cache.rb +5 -7
  64. data/lib/datadog/core/environment/yjit.rb +25 -24
  65. data/lib/datadog/core/logger.rb +5 -2
  66. data/lib/datadog/core/metrics/client.rb +8 -16
  67. data/lib/datadog/core/metrics/helpers.rb +3 -0
  68. data/lib/datadog/core/metrics/metric.rb +3 -1
  69. data/lib/datadog/core/rate_limiter.rb +9 -31
  70. data/lib/datadog/core/refillable_bucket.rb +72 -0
  71. data/lib/datadog/core/remote/client/capabilities.rb +4 -0
  72. data/lib/datadog/core/remote/client.rb +1 -5
  73. data/lib/datadog/core/remote/transport/http.rb +2 -4
  74. data/lib/datadog/core/tag_normalizer.rb +0 -2
  75. data/lib/datadog/core/telemetry/configuration_value.rb +1 -3
  76. data/lib/datadog/core/telemetry/transport/http.rb +2 -4
  77. data/lib/datadog/core/telemetry/worker.rb +30 -24
  78. data/lib/datadog/core/transport/http.rb +2 -4
  79. data/lib/datadog/core/utils/at_fork_monkey_patch.rb +2 -2
  80. data/lib/datadog/core/utils/forking.rb +1 -1
  81. data/lib/datadog/core/utils/lru_cache.rb +2 -2
  82. data/lib/datadog/core/utils/network.rb +1 -1
  83. data/lib/datadog/core/utils/time.rb +2 -2
  84. data/lib/datadog/core/utils/truncation.rb +1 -3
  85. data/lib/datadog/core/workers/async.rb +16 -14
  86. data/lib/datadog/core/workers/runtime_metrics.rb +1 -1
  87. data/lib/datadog/data_streams/transport/http.rb +1 -3
  88. data/lib/datadog/di/component.rb +14 -2
  89. data/lib/datadog/di/context.rb +50 -0
  90. data/lib/datadog/di/contrib.rb +2 -2
  91. data/lib/datadog/di/correlation_sampler/trace_budget.rb +75 -0
  92. data/lib/datadog/di/correlation_sampler/trace_budget_ledger/entry.rb +34 -0
  93. data/lib/datadog/di/correlation_sampler/trace_budget_ledger.rb +104 -0
  94. data/lib/datadog/di/correlation_sampler.rb +224 -0
  95. data/lib/datadog/di/guardrails_telemetry/reason.rb +8 -3
  96. data/lib/datadog/di/instrumenter.rb +294 -109
  97. data/lib/datadog/di/probe.rb +13 -2
  98. data/lib/datadog/di/probe_builder.rb +6 -8
  99. data/lib/datadog/di/probe_file_loader.rb +2 -2
  100. data/lib/datadog/di/probe_manager.rb +7 -30
  101. data/lib/datadog/di/probe_notification_builder.rb +42 -11
  102. data/lib/datadog/di/probe_notifier_worker.rb +11 -0
  103. data/lib/datadog/di/snapshot_pruner/node.rb +190 -0
  104. data/lib/datadog/di/snapshot_pruner/node_queue.rb +104 -0
  105. data/lib/datadog/di/snapshot_pruner/parser.rb +102 -0
  106. data/lib/datadog/di/snapshot_pruner.rb +128 -0
  107. data/lib/datadog/di/transport/input.rb +75 -15
  108. data/lib/datadog/di/utils.rb +3 -3
  109. data/lib/datadog/di.rb +29 -0
  110. data/lib/datadog/error_tracking/filters.rb +6 -8
  111. data/lib/datadog/open_feature/agentless/parser.rb +2 -4
  112. data/lib/datadog/open_feature/component.rb +24 -2
  113. data/lib/datadog/open_feature/configuration.rb +13 -0
  114. data/lib/datadog/open_feature/evaluation_engine.rb +5 -5
  115. data/lib/datadog/open_feature/exposure_hook.rb +146 -0
  116. data/lib/datadog/open_feature/exposures/event.rb +10 -8
  117. data/lib/datadog/open_feature/exposures/reporter.rb +34 -25
  118. data/lib/datadog/open_feature/ext.rb +12 -0
  119. data/lib/datadog/open_feature/flag_evaluation/aggregator.rb +10 -8
  120. data/lib/datadog/open_feature/flag_evaluation/writer.rb +9 -6
  121. data/lib/datadog/open_feature/hooks/exposure_logging_hook.rb +58 -0
  122. data/lib/datadog/open_feature/hooks/flag_eval_evp_hook.rb +4 -2
  123. data/lib/datadog/open_feature/hooks/flag_eval_metrics_hook.rb +3 -5
  124. data/lib/datadog/open_feature/hooks/span_enrichment_hook/codec.rb +3 -5
  125. data/lib/datadog/open_feature/native_evaluator.rb +30 -2
  126. data/lib/datadog/open_feature/noop_evaluator.rb +3 -1
  127. data/lib/datadog/open_feature/provider.rb +54 -4
  128. data/lib/datadog/open_feature/resolution_details.rb +1 -0
  129. data/lib/datadog/open_feature/split_features.rb +76 -0
  130. data/lib/datadog/opentelemetry/sdk/propagator.rb +5 -2
  131. data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +28 -31
  132. data/lib/datadog/profiling/component.rb +31 -9
  133. data/lib/datadog/profiling/profiler.rb +6 -0
  134. data/lib/datadog/profiling/remote.rb +381 -0
  135. data/lib/datadog/profiling/worker_state.rb +65 -0
  136. data/lib/datadog/profiling.rb +1 -0
  137. data/lib/datadog/symbol_database/file_hash.rb +1 -3
  138. data/lib/datadog/tracing/component.rb +14 -16
  139. data/lib/datadog/tracing/configuration/settings.rb +2 -2
  140. data/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb +4 -6
  141. data/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb +4 -6
  142. data/lib/datadog/tracing/contrib/action_cable/events/transmit.rb +4 -6
  143. data/lib/datadog/tracing/contrib/action_cable/events.rb +3 -5
  144. data/lib/datadog/tracing/contrib/action_cable/patcher.rb +2 -4
  145. data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb +5 -7
  146. data/lib/datadog/tracing/contrib/action_mailer/events/process.rb +4 -6
  147. data/lib/datadog/tracing/contrib/action_mailer/events.rb +3 -5
  148. data/lib/datadog/tracing/contrib/action_mailer/patcher.rb +2 -4
  149. data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb +2 -4
  150. data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb +2 -4
  151. data/lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb +2 -4
  152. data/lib/datadog/tracing/contrib/action_pack/action_dispatch/patcher.rb +2 -4
  153. data/lib/datadog/tracing/contrib/action_pack/patcher.rb +2 -4
  154. data/lib/datadog/tracing/contrib/action_view/events/render_partial.rb +3 -5
  155. data/lib/datadog/tracing/contrib/action_view/events/render_template.rb +3 -5
  156. data/lib/datadog/tracing/contrib/action_view/events.rb +3 -5
  157. data/lib/datadog/tracing/contrib/action_view/patcher.rb +3 -5
  158. data/lib/datadog/tracing/contrib/action_view/utils.rb +1 -3
  159. data/lib/datadog/tracing/contrib/active_job/events/discard.rb +3 -5
  160. data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb +3 -5
  161. data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb +3 -5
  162. data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb +3 -5
  163. data/lib/datadog/tracing/contrib/active_job/events/perform.rb +3 -5
  164. data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb +3 -5
  165. data/lib/datadog/tracing/contrib/active_job/events.rb +3 -5
  166. data/lib/datadog/tracing/contrib/active_job/patcher.rb +4 -6
  167. data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb +4 -6
  168. data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb +4 -6
  169. data/lib/datadog/tracing/contrib/active_model_serializers/events.rb +3 -5
  170. data/lib/datadog/tracing/contrib/active_model_serializers/patcher.rb +3 -5
  171. data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb +4 -6
  172. data/lib/datadog/tracing/contrib/active_record/events/sql.rb +3 -5
  173. data/lib/datadog/tracing/contrib/active_record/events.rb +3 -5
  174. data/lib/datadog/tracing/contrib/active_record/patcher.rb +2 -4
  175. data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb +8 -10
  176. data/lib/datadog/tracing/contrib/active_support/cache/events.rb +3 -5
  177. data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +5 -7
  178. data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +4 -6
  179. data/lib/datadog/tracing/contrib/active_support/patcher.rb +2 -4
  180. data/lib/datadog/tracing/contrib/analytics.rb +4 -6
  181. data/lib/datadog/tracing/contrib/aws/patcher.rb +5 -7
  182. data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +5 -7
  183. data/lib/datadog/tracing/contrib/configuration/settings.rb +17 -0
  184. data/lib/datadog/tracing/contrib/dalli/patcher.rb +2 -4
  185. data/lib/datadog/tracing/contrib/dalli/quantize.rb +1 -3
  186. data/lib/datadog/tracing/contrib/delayed_job/patcher.rb +4 -6
  187. data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +3 -5
  188. data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb +6 -8
  189. data/lib/datadog/tracing/contrib/ethon/patcher.rb +2 -4
  190. data/lib/datadog/tracing/contrib/excon/patcher.rb +3 -5
  191. data/lib/datadog/tracing/contrib/faraday/patcher.rb +4 -6
  192. data/lib/datadog/tracing/contrib/grape/patcher.rb +2 -4
  193. data/lib/datadog/tracing/contrib/graphql/patcher.rb +4 -6
  194. data/lib/datadog/tracing/contrib/graphql/trace_patcher.rb +1 -3
  195. data/lib/datadog/tracing/contrib/graphql/tracing_patcher.rb +1 -3
  196. data/lib/datadog/tracing/contrib/graphql/unified_trace_patcher.rb +1 -3
  197. data/lib/datadog/tracing/contrib/grpc/patcher.rb +3 -5
  198. data/lib/datadog/tracing/contrib/hanami/patcher.rb +2 -4
  199. data/lib/datadog/tracing/contrib/http/patcher.rb +2 -4
  200. data/lib/datadog/tracing/contrib/httpclient/patcher.rb +2 -4
  201. data/lib/datadog/tracing/contrib/httprb/patcher.rb +2 -4
  202. data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb +4 -6
  203. data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb +3 -5
  204. data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb +3 -5
  205. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb +3 -5
  206. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb +2 -4
  207. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb +2 -4
  208. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb +2 -4
  209. data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb +4 -6
  210. data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb +4 -6
  211. data/lib/datadog/tracing/contrib/kafka/events.rb +3 -5
  212. data/lib/datadog/tracing/contrib/kafka/patcher.rb +4 -6
  213. data/lib/datadog/tracing/contrib/karafka/patcher.rb +2 -4
  214. data/lib/datadog/tracing/contrib/lograge/patcher.rb +2 -4
  215. data/lib/datadog/tracing/contrib/mongodb/parsers.rb +5 -7
  216. data/lib/datadog/tracing/contrib/mongodb/patcher.rb +3 -5
  217. data/lib/datadog/tracing/contrib/mysql2/patcher.rb +3 -5
  218. data/lib/datadog/tracing/contrib/opensearch/patcher.rb +1 -3
  219. data/lib/datadog/tracing/contrib/opensearch/quantize.rb +5 -7
  220. data/lib/datadog/tracing/contrib/pg/patcher.rb +3 -5
  221. data/lib/datadog/tracing/contrib/presto/patcher.rb +1 -3
  222. data/lib/datadog/tracing/contrib/que/patcher.rb +2 -4
  223. data/lib/datadog/tracing/contrib/racecar/events/batch.rb +3 -5
  224. data/lib/datadog/tracing/contrib/racecar/events/consume.rb +3 -5
  225. data/lib/datadog/tracing/contrib/racecar/events/message.rb +3 -5
  226. data/lib/datadog/tracing/contrib/racecar/events.rb +3 -5
  227. data/lib/datadog/tracing/contrib/racecar/patcher.rb +2 -4
  228. data/lib/datadog/tracing/contrib/rack/patcher.rb +13 -19
  229. data/lib/datadog/tracing/contrib/rack/request_queue.rb +1 -3
  230. data/lib/datadog/tracing/contrib/rack/route_inference.rb +4 -6
  231. data/lib/datadog/tracing/contrib/rack/trace_proxy_middleware.rb +4 -6
  232. data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +4 -0
  233. data/lib/datadog/tracing/contrib/rails/ext.rb +2 -0
  234. data/lib/datadog/tracing/contrib/rails/framework.rb +6 -8
  235. data/lib/datadog/tracing/contrib/rails/log_injection.rb +1 -3
  236. data/lib/datadog/tracing/contrib/rails/patcher.rb +9 -11
  237. data/lib/datadog/tracing/contrib/rake/patcher.rb +3 -5
  238. data/lib/datadog/tracing/contrib/redis/patcher.rb +2 -4
  239. data/lib/datadog/tracing/contrib/redis/quantize.rb +7 -9
  240. data/lib/datadog/tracing/contrib/resque/patcher.rb +2 -4
  241. data/lib/datadog/tracing/contrib/rest_client/patcher.rb +2 -4
  242. data/lib/datadog/tracing/contrib/roda/patcher.rb +2 -4
  243. data/lib/datadog/tracing/contrib/semantic_logger/patcher.rb +2 -4
  244. data/lib/datadog/tracing/contrib/sequel/patcher.rb +4 -6
  245. data/lib/datadog/tracing/contrib/shoryuken/patcher.rb +2 -4
  246. data/lib/datadog/tracing/contrib/sidekiq/patcher.rb +7 -9
  247. data/lib/datadog/tracing/contrib/sinatra/env.rb +3 -5
  248. data/lib/datadog/tracing/contrib/sinatra/patcher.rb +5 -7
  249. data/lib/datadog/tracing/contrib/sneakers/patcher.rb +2 -4
  250. data/lib/datadog/tracing/contrib/stripe/patcher.rb +2 -4
  251. data/lib/datadog/tracing/contrib/stripe/request.rb +4 -6
  252. data/lib/datadog/tracing/contrib/sucker_punch/exception_handler.rb +1 -3
  253. data/lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb +1 -3
  254. data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb +3 -5
  255. data/lib/datadog/tracing/contrib/support.rb +1 -3
  256. data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb +4 -0
  257. data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb +2 -1
  258. data/lib/datadog/tracing/contrib/trilogy/patcher.rb +3 -5
  259. data/lib/datadog/tracing/contrib/utils/database.rb +1 -3
  260. data/lib/datadog/tracing/contrib/utils/quantization/hash_formatter.rb +8 -10
  261. data/lib/datadog/tracing/contrib/utils/quantization/http.rb +11 -13
  262. data/lib/datadog/tracing/contrib/waterdrop/patcher.rb +3 -5
  263. data/lib/datadog/tracing/correlation.rb +3 -5
  264. data/lib/datadog/tracing/distributed/propagation.rb +2 -2
  265. data/lib/datadog/tracing/distributed/propagation_policy.rb +1 -3
  266. data/lib/datadog/tracing/distributed/trace_state/datadog.rb +5 -5
  267. data/lib/datadog/tracing/distributed/trace_state/open_telemetry.rb +2 -2
  268. data/lib/datadog/tracing/metadata/ext.rb +3 -9
  269. data/lib/datadog/tracing/remote.rb +1 -1
  270. data/lib/datadog/tracing/trace_operation.rb +11 -3
  271. data/lib/datadog/tracing/tracer.rb +9 -1
  272. data/lib/datadog/tracing/transport/http.rb +1 -3
  273. data/lib/datadog/tracing/transport/io.rb +2 -4
  274. data/lib/datadog/tracing/transport/traces.rb +1 -3
  275. data/lib/datadog/tracing/utils.rb +4 -6
  276. data/lib/datadog/version.rb +1 -1
  277. metadata +22 -6
@@ -6,37 +6,35 @@ module Datadog
6
6
  module AppSec
7
7
  # Helper methods to get vendored assets
8
8
  module Assets
9
- module_function
10
-
11
- def waf_rules(kind = :recommended)
9
+ def self.waf_rules(kind = :recommended)
12
10
  read("waf_rules/#{kind}.json")
13
11
  end
14
12
 
15
- def waf_processors
13
+ def self.waf_processors
16
14
  read("waf_rules/processors.json")
17
15
  end
18
16
 
19
- def waf_scanners
17
+ def self.waf_scanners
20
18
  read("waf_rules/scanners.json")
21
19
  end
22
20
 
23
- def blocked(format: :html)
21
+ def self.blocked(format: :html)
24
22
  (@blocked ||= {})[format] ||= read("blocked.#{format}").freeze
25
23
  end
26
24
 
27
- def path
25
+ def self.path
28
26
  Pathname.new(dir).join("assets")
29
27
  end
30
28
 
31
- def filepath(filename)
29
+ def self.filepath(filename)
32
30
  path.join(filename)
33
31
  end
34
32
 
35
- def read(filename, mode = "rb")
33
+ def self.read(filename, mode = "rb")
36
34
  File.open(filepath(filename), mode) { |f| f.read || raise("Unexpected nil IO object") }
37
35
  end
38
36
 
39
- def dir
37
+ def self.dir
40
38
  # Happens only if this file is evaluated standalone, which should not happen
41
39
  # Necessary to make type-checker happy with a non-nilable return value
42
40
  __dir__ || raise("Unexpected file eval")
@@ -78,7 +78,7 @@ module Datadog
78
78
  # is a collection of techniques and heuristics aimed at detecting malicious inputs and preventing
79
79
  # any potential side-effects on the application resulting from the use of said malicious inputs.
80
80
  option :rasp_enabled do |o|
81
- o.type :bool, nilable: true
81
+ o.type :bool
82
82
  o.env "DD_APPSEC_RASP_ENABLED"
83
83
  o.default true
84
84
  end
@@ -37,17 +37,21 @@ module Datadog
37
37
  raise ArgumentError, "not a Datadog::AppSec::Context" unless context.instance_of?(Context)
38
38
  raise ActiveContextError, "another context is active, nested contexts are not supported" if active
39
39
 
40
+ # NOTE: Activation makes the caller a member, so a caller that only
41
+ # activates and deactivates never has to call `attach`
42
+ context.attach
40
43
  Thread.current[Ext::ACTIVE_CONTEXT_KEY] = context
41
44
  end
42
45
 
43
46
  def deactivate
44
- active&.finalize!
47
+ active&.detach
45
48
  ensure
46
49
  Thread.current[Ext::ACTIVE_CONTEXT_KEY] = nil
47
50
  end
48
51
 
49
52
  def active
50
- Thread.current[Ext::ACTIVE_CONTEXT_KEY]
53
+ context = Thread.current[Ext::ACTIVE_CONTEXT_KEY]
54
+ context if context && !context.finalized?
51
55
  end
52
56
  end
53
57
 
@@ -55,6 +59,9 @@ module Datadog
55
59
  @trace = trace
56
60
  @span = span
57
61
  @waf_runner = waf_runner
62
+ @mutex = Mutex.new
63
+ @attached_count = 0
64
+ @finalized = false
58
65
  @metrics = Metrics::Collector.new
59
66
  @downstream_body_sampler = CounterSampler.new(
60
67
  Datadog.configuration.appsec.api_security.downstream_body_analysis.sample_rate,
@@ -86,12 +93,33 @@ module Datadog
86
93
  @state[:events]
87
94
  end
88
95
 
89
- def mark_as_interrupted!
90
- @state[:interrupted] = true
96
+ def catch_interrupt
97
+ Kernel.catch(Ext::INTERRUPT) do
98
+ yield
99
+ return false
100
+ end
101
+
102
+ true
103
+ end
104
+
105
+ def interrupt!(action_params)
106
+ @mutex.synchronize do
107
+ @state[:interrupted] = true
108
+ @state[:interrupt_params] = action_params unless @state.key?(:interrupt_params)
109
+ end
110
+
111
+ throw(Ext::INTERRUPT, action_params)
112
+ rescue UncaughtThrowError
113
+ # NOTE: Without a catch up the stack, the throw raises into the host app
114
+ Datadog.logger.warn("AppSec: request was interrupted outside of an interruption point, continuing execution")
91
115
  end
92
116
 
93
117
  def interrupted?
94
- @state[:interrupted]
118
+ @mutex.synchronize { @state[:interrupted] }
119
+ end
120
+
121
+ def mark_as_interrupted!
122
+ @mutex.synchronize { @state[:interrupted] = true }
95
123
  end
96
124
 
97
125
  def waf_runner_ruleset_version
@@ -127,8 +155,37 @@ module Datadog
127
155
  Metrics::TelemetryExporter.export_api_security_metrics(self)
128
156
  end
129
157
 
130
- def finalize!
158
+ def attach
159
+ @mutex.synchronize do
160
+ return false if @finalized
161
+
162
+ @attached_count += 1
163
+ end
164
+
165
+ true
166
+ end
167
+
168
+ def detach
169
+ @mutex.synchronize do
170
+ return if @attached_count.zero?
171
+
172
+ @attached_count -= 1
173
+ return unless @attached_count.zero?
174
+
175
+ @finalized = true
176
+ end
177
+
131
178
  @waf_runner.finalize!
179
+ rescue => e
180
+ AppSec.telemetry.report(e, description: "AppSec: Failed to finalize context")
181
+ end
182
+
183
+ def finalized?
184
+ @mutex.synchronize { @finalized }
185
+ end
186
+
187
+ def shared?
188
+ @mutex.synchronize { @attached_count > 1 }
132
189
  end
133
190
  end
134
191
  end
@@ -10,9 +10,7 @@ module Datadog
10
10
  module ActiveRecord
11
11
  # AppSec module that will be prepended to ActiveRecord adapter
12
12
  module Instrumentation
13
- module_function
14
-
15
- def detect_sql_injection(sql, adapter_name)
13
+ def self.detect_sql_injection(sql, adapter_name)
16
14
  return unless AppSec.rasp_enabled?
17
15
 
18
16
  context = AppSec.active_context
@@ -8,50 +8,47 @@ module Datadog
8
8
  module ActiveRecord
9
9
  # AppSec patcher module for ActiveRecord
10
10
  module Patcher
11
- module_function
11
+ module AdapterInheritancePatch
12
+ def inherited(subclass)
13
+ super
12
14
 
13
- def patched?
15
+ case subclass.name
16
+ when "ActiveRecord::ConnectionAdapters::SQLite3Adapter" then Patcher.patch_sqlite3_adapter
17
+ when "ActiveRecord::ConnectionAdapters::Mysql2Adapter" then Patcher.patch_mysql2_adapter
18
+ when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter" then Patcher.patch_postgresql_adapter
19
+ end
20
+ end
21
+ end
22
+
23
+ def self.patched?
14
24
  !!Patcher.instance_variable_get(:@patched)
15
25
  end
16
26
 
17
- def target_version
27
+ def self.target_version
18
28
  Integration.version
19
29
  end
20
30
 
21
- def patch
22
- # Rails 7.0 intruduced new on-load hooks for sqlite3 and postgresql adapters
23
- # The load hook for mysql2 adapter was introduced in Rails 7.1
24
- #
25
- # If the adapter is not loaded when the :active_record load hook is called,
26
- # we need to add a load hook for the adapter
31
+ def self.patch
27
32
  ActiveSupport.on_load :active_record do
33
+ ::ActiveRecord::ConnectionAdapters::AbstractAdapter.singleton_class.prepend(
34
+ ::Datadog::AppSec::Contrib::ActiveRecord::Patcher::AdapterInheritancePatch,
35
+ )
36
+
28
37
  if defined?(::ActiveRecord::ConnectionAdapters::SQLite3Adapter)
29
38
  ::Datadog::AppSec::Contrib::ActiveRecord::Patcher.patch_sqlite3_adapter
30
- else
31
- ActiveSupport.on_load :active_record_sqlite3adapter do
32
- ::Datadog::AppSec::Contrib::ActiveRecord::Patcher.patch_sqlite3_adapter
33
- end
34
39
  end
35
40
 
36
41
  if defined?(::ActiveRecord::ConnectionAdapters::Mysql2Adapter)
37
42
  ::Datadog::AppSec::Contrib::ActiveRecord::Patcher.patch_mysql2_adapter
38
- else
39
- ActiveSupport.on_load :active_record_mysql2adapter do
40
- ::Datadog::AppSec::Contrib::ActiveRecord::Patcher.patch_mysql2_adapter
41
- end
42
43
  end
43
44
 
44
45
  if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
45
46
  ::Datadog::AppSec::Contrib::ActiveRecord::Patcher.patch_postgresql_adapter
46
- else
47
- ActiveSupport.on_load :active_record_postgresqladapter do
48
- ::Datadog::AppSec::Contrib::ActiveRecord::Patcher.patch_postgresql_adapter
49
- end
50
47
  end
51
48
  end
52
49
  end
53
50
 
54
- def patch_sqlite3_adapter
51
+ def self.patch_sqlite3_adapter
55
52
  instrumentation_module = if ::ActiveRecord.gem_version >= Gem::Version.new("8.0")
56
53
  Instrumentation::PreprocessQueryAdapterPatch
57
54
  elsif ::ActiveRecord.gem_version >= Gem::Version.new("7.1")
@@ -66,7 +63,7 @@ module Datadog
66
63
  Patcher.instance_variable_set(:@patched, true)
67
64
  end
68
65
 
69
- def patch_mysql2_adapter
66
+ def self.patch_mysql2_adapter
70
67
  instrumentation_module = if ::ActiveRecord.gem_version >= Gem::Version.new("8.0")
71
68
  Instrumentation::PreprocessQueryAdapterPatch
72
69
  elsif ::ActiveRecord.gem_version >= Gem::Version.new("7.1")
@@ -81,7 +78,7 @@ module Datadog
81
78
  Patcher.instance_variable_set(:@patched, true)
82
79
  end
83
80
 
84
- def patch_postgresql_adapter
81
+ def self.patch_postgresql_adapter
85
82
  instrumentation_module = if ::ActiveRecord.gem_version >= Gem::Version.new("8.0")
86
83
  Instrumentation::PreprocessQueryAdapterPatch
87
84
  elsif ::ActiveRecord.gem_version.segments.first == 4
@@ -8,17 +8,15 @@ module Datadog
8
8
  module Contrib
9
9
  module AwsLambda
10
10
  module Patcher
11
- module_function
12
-
13
- def patched?
11
+ def self.patched?
14
12
  Patcher.instance_variable_get(:@patched)
15
13
  end
16
14
 
17
- def target_version
15
+ def self.target_version
18
16
  Integration.version
19
17
  end
20
18
 
21
- def patch
19
+ def self.patch
22
20
  Monitor::Gateway::Watcher.watch
23
21
  Gateway::Watcher.watch
24
22
  Patcher.instance_variable_set(:@patched, true)
@@ -19,9 +19,7 @@ module Datadog
19
19
  BASE64_BYTES_PER_GROUP = 3
20
20
  BASE64_PADDING_BYTE = "=".ord
21
21
 
22
- module_function
23
-
24
- def from_request(payload)
22
+ def self.from_request(payload)
25
23
  return {} if payload.nil? || payload.empty?
26
24
 
27
25
  headers = parse_headers(payload)
@@ -42,7 +40,7 @@ module Datadog
42
40
  data
43
41
  end
44
42
 
45
- def from_response(payload)
43
+ def self.from_response(payload)
46
44
  return {} if payload.nil? || payload.empty?
47
45
 
48
46
  headers = parse_headers(payload)
@@ -58,13 +56,13 @@ module Datadog
58
56
  data
59
57
  end
60
58
 
61
- def parse_headers(payload)
59
+ def self.parse_headers(payload)
62
60
  (payload["headers"] || {}).each_with_object({}) do |(key, value), hash|
63
61
  hash[key.downcase] = value
64
62
  end
65
63
  end
66
64
 
67
- def parse_cookies(payload, headers)
65
+ def self.parse_cookies(payload, headers)
68
66
  raw_pairs = payload["cookies"] || headers["cookie"]&.split(";")
69
67
  return unless raw_pairs
70
68
 
@@ -74,7 +72,7 @@ module Datadog
74
72
  end
75
73
  end
76
74
 
77
- def build_fullpath(payload)
75
+ def self.build_fullpath(payload)
78
76
  path = payload["path"]
79
77
  return unless path
80
78
 
@@ -82,7 +80,7 @@ module Datadog
82
80
  query_string ? "#{path}?#{query_string}" : path
83
81
  end
84
82
 
85
- def build_query_string(payload)
83
+ def self.build_query_string(payload)
86
84
  query_string = payload["query_string"]
87
85
  return query_string if query_string && !query_string.empty?
88
86
 
@@ -92,12 +90,12 @@ module Datadog
92
90
  URI.encode_www_form(query)
93
91
  end
94
92
 
95
- def extract_client_ip(remote_ip, headers)
93
+ def self.extract_client_ip(remote_ip, headers)
96
94
  header_collection = Datadog::Core::HeaderCollection.from_hash(headers)
97
95
  Datadog::Tracing::ClientIp.extract_client_ip(header_collection, remote_ip)
98
96
  end
99
97
 
100
- def parse_body(payload, headers)
98
+ def self.parse_body(payload, headers)
101
99
  body = payload["body"]
102
100
  return unless body
103
101
 
@@ -121,7 +119,7 @@ module Datadog
121
119
  nil
122
120
  end
123
121
 
124
- def body_byte_length(payload)
122
+ def self.body_byte_length(payload)
125
123
  body = payload["body"]
126
124
 
127
125
  return unless body
@@ -14,10 +14,8 @@ module Datadog
14
14
  AppSec::Configuration::Settings::IDENTIFICATION_AUTO_USER_INSTRUMENTATION_MODE,
15
15
  }.freeze
16
16
 
17
- module_function
18
-
19
17
  # NOTE: DEV-3 Replace method use with `auto_user_instrumentation.enabled?`
20
- def auto_user_instrumentation_enabled?
18
+ def self.auto_user_instrumentation_enabled?
21
19
  appsec = Datadog.configuration.appsec
22
20
  appsec.auto_user_instrumentation.mode
23
21
 
@@ -29,7 +27,7 @@ module Datadog
29
27
  end
30
28
 
31
29
  # NOTE: DEV-3 Replace method use with `auto_user_instrumentation.mode`
32
- def auto_user_instrumentation_mode
30
+ def self.auto_user_instrumentation_mode
33
31
  appsec = Datadog.configuration.appsec
34
32
 
35
33
  # NOTE: Reading both to trigger precedence set
@@ -17,17 +17,15 @@ module Datadog
17
17
  hash[key] = Datadog::Core::Utils::OnlyOnce.new
18
18
  end
19
19
 
20
- module_function
21
-
22
- def patched?
20
+ def self.patched?
23
21
  !!Patcher.instance_variable_get(:@patched)
24
22
  end
25
23
 
26
- def target_version
24
+ def self.target_version
27
25
  Integration.version
28
26
  end
29
27
 
30
- def patch
28
+ def self.patch
31
29
  ::ActiveSupport.on_load(:before_initialize) do |app|
32
30
  GUARD_ONCE_PER_APP[app].run do
33
31
  app.middleware.insert_after(Warden::Manager, TrackingMiddleware)
@@ -6,17 +6,15 @@ module Datadog
6
6
  module Excon
7
7
  # AppSec patcher module for Excon
8
8
  module Patcher
9
- module_function
10
-
11
- def patched?
9
+ def self.patched?
12
10
  !!Patcher.instance_variable_get(:@patched)
13
11
  end
14
12
 
15
- def target_version
13
+ def self.target_version
16
14
  Integration.version
17
15
  end
18
16
 
19
- def patch
17
+ def self.patch
20
18
  require_relative "ssrf_detection_middleware"
21
19
 
22
20
  ::Excon.defaults[:middlewares].insert(0, SSRFDetectionMiddleware)
@@ -6,17 +6,15 @@ module Datadog
6
6
  module Faraday
7
7
  # Patcher for Faraday
8
8
  module Patcher
9
- module_function
10
-
11
- def patched?
9
+ def self.patched?
12
10
  Patcher.instance_variable_get(:@patched)
13
11
  end
14
12
 
15
- def target_version
13
+ def self.target_version
16
14
  Integration.version
17
15
  end
18
16
 
19
- def patch
17
+ def self.patch
20
18
  require_relative "ssrf_detection_middleware"
21
19
  require_relative "connection_patch"
22
20
  require_relative "rack_builder_patch"
@@ -27,7 +25,7 @@ module Datadog
27
25
  Patcher.instance_variable_set(:@patched, true)
28
26
  end
29
27
 
30
- def configure_default_faraday_connection
28
+ def self.configure_default_faraday_connection
31
29
  if target_version&.>= Gem::Version.new("1.0.0")
32
30
  # Patch the default connection (e.g. +Faraday.get+)
33
31
  ::Faraday.default_connection.use(:datadog_appsec)
@@ -12,17 +12,15 @@ module Datadog
12
12
  module GraphQL
13
13
  # Patcher for AppSec on GraphQL
14
14
  module Patcher
15
- module_function
16
-
17
- def patched?
15
+ def self.patched?
18
16
  Patcher.instance_variable_get(:@patched)
19
17
  end
20
18
 
21
- def target_version
19
+ def self.target_version
22
20
  Integration.version
23
21
  end
24
22
 
25
- def patch
23
+ def self.patch
26
24
  Gateway::Watcher.watch
27
25
  ::GraphQL::Schema.trace_with(AppSecTrace)
28
26
  Patcher.instance_variable_set(:@patched, true)
@@ -12,8 +12,6 @@ module Datadog
12
12
  #
13
13
  # @api private
14
14
  module InputPeeker
15
- module_function
16
-
17
15
  # Peeks at `env['rack.input']` and returns the body bytesize when it
18
16
  # can be measured within the given limit
19
17
  #
@@ -29,7 +27,7 @@ module Datadog
29
27
  # @return [Integer, nil] `Integer` bytesize when measured within
30
28
  # `limit`, including `0`; `nil` when input is missing, over the
31
29
  # limit, or cannot be preserved for downstream reads
32
- def peek_bytesize(env, limit:)
30
+ def self.peek_bytesize(env, limit:)
33
31
  rack_input = env["rack.input"]
34
32
  return unless rack_input
35
33
 
@@ -59,13 +57,13 @@ module Datadog
59
57
  over_limit ? nil : buffer.bytesize
60
58
  end
61
59
 
62
- private_class_method def rewind?
60
+ private_class_method def self.rewind?
63
61
  return @rewind if defined?(@rewind)
64
62
 
65
63
  @rewind = ::Gem::Version.new(::Rack.release) < ::Gem::Version.new("3")
66
64
  end
67
65
 
68
- private_class_method def rewind(io)
66
+ private_class_method def self.rewind(io)
69
67
  io.rewind
70
68
  true
71
69
  rescue => e
@@ -9,17 +9,15 @@ module Datadog
9
9
  module Rack
10
10
  # Patcher for Rack integration
11
11
  module Patcher
12
- module_function
13
-
14
- def patched?
12
+ def self.patched?
15
13
  !!Patcher.instance_variable_get(:@patched) # TODO: Patcher.flag_patched
16
14
  end
17
15
 
18
- def target_version
16
+ def self.target_version
19
17
  Integration.version
20
18
  end
21
19
 
22
- def patch
20
+ def self.patch
23
21
  Monitor::Gateway::Watcher.watch
24
22
  Gateway::Watcher.watch
25
23
  Patcher.instance_variable_set(:@patched, true)
@@ -25,15 +25,16 @@ module Datadog
25
25
  # TODO: handle exceptions, except for @app.call
26
26
 
27
27
  http_response = nil #: Rack::response?
28
- interrupt_params = catch(::Datadog::AppSec::Ext::INTERRUPT) do
28
+ interrupted = context.catch_interrupt do
29
29
  http_response, _request = Instrumentation.gateway.push("rack.request.body", Gateway::Request.new(env)) do
30
30
  @app.call(env)
31
31
  end
32
-
33
- nil
34
32
  end
35
33
 
36
- return AppSec::Response.from_interrupt_params(interrupt_params, env["HTTP_ACCEPT"]).to_rack if interrupt_params
34
+ response_shared = http_response && context.shared?
35
+ if interrupted && !response_shared
36
+ return AppSec::Response.from_interrupt_params(context.state[:interrupt_params], env["HTTP_ACCEPT"]).to_rack
37
+ end
37
38
 
38
39
  # Steep can't see that the catch block always populates http_response
39
40
  # when no interrupt is thrown.
@@ -60,7 +60,7 @@ module Datadog
60
60
  gateway_request = Gateway::Request.new(env)
61
61
  gateway_response = nil
62
62
 
63
- interrupt_params = catch(::Datadog::AppSec::Ext::INTERRUPT) do
63
+ interrupted = ctx.catch_interrupt do
64
64
  # TODO: This event should be renamed into `rack.request.start` to
65
65
  # reflect that it's the beginning of the request-cycle
66
66
  http_response, _gateway_request = Instrumentation.gateway.push("rack.request", gateway_request) do
@@ -73,15 +73,14 @@ module Datadog
73
73
 
74
74
  Instrumentation.gateway.push("rack.request.finish", gateway_request)
75
75
  Instrumentation.gateway.push("rack.response", gateway_response)
76
-
77
- nil
78
76
  end
79
77
 
78
+ response_shared = http_response && ctx.shared?
79
+ replace_response = interrupted && !response_shared
80
80
  add_normalized_route_tag(ctx, env)
81
81
 
82
- if interrupt_params
83
- ctx.mark_as_interrupted!
84
- http_response = AppSec::Response.from_interrupt_params(interrupt_params, env["HTTP_ACCEPT"]).to_rack
82
+ if replace_response
83
+ http_response = AppSec::Response.from_interrupt_params(ctx.state[:interrupt_params], env["HTTP_ACCEPT"]).to_rack
85
84
  end
86
85
 
87
86
  # NOTE: This is not optimal, but in the current implementation
@@ -93,7 +92,7 @@ module Datadog
93
92
  # `gateway_response` instead of re-creating it.
94
93
  #
95
94
  # WARNING: This part will be refactored.
96
- tmp_response = if interrupt_params
95
+ tmp_response = if replace_response
97
96
  Gateway::Response.new(http_response[2], http_response[0], http_response[1], context: ctx)
98
97
  else
99
98
  gateway_response