datadog 2.19.0 → 2.20.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 (271) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +27 -1
  3. data/ext/libdatadog_api/extconf.rb +3 -1
  4. data/ext/libdatadog_extconf_helpers.rb +13 -3
  5. data/lib/datadog/appsec/component.rb +3 -13
  6. data/lib/datadog/appsec/context.rb +23 -0
  7. data/lib/datadog/appsec/contrib/devise/patches/signin_tracking_patch.rb +2 -1
  8. data/lib/datadog/appsec/contrib/devise/patches/signup_tracking_patch.rb +2 -1
  9. data/lib/datadog/appsec/contrib/excon/ssrf_detection_middleware.rb +0 -1
  10. data/lib/datadog/appsec/contrib/faraday/ssrf_detection_middleware.rb +0 -1
  11. data/lib/datadog/appsec/contrib/rack/request_middleware.rb +14 -22
  12. data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb +23 -2
  13. data/lib/datadog/appsec/contrib/rails/patcher.rb +14 -26
  14. data/lib/datadog/appsec/contrib/rails/patches/process_action_patch.rb +27 -0
  15. data/lib/datadog/appsec/contrib/rails/patches/render_to_body_patch.rb +33 -0
  16. data/lib/datadog/appsec/contrib/rest_client/request_ssrf_detection_patch.rb +0 -1
  17. data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb +23 -0
  18. data/lib/datadog/appsec/contrib/sinatra/patcher.rb +8 -18
  19. data/lib/datadog/appsec/contrib/sinatra/patches/json_patch.rb +31 -0
  20. data/lib/datadog/appsec/event.rb +3 -18
  21. data/lib/datadog/appsec/instrumentation/gateway/argument.rb +16 -0
  22. data/lib/datadog/appsec/metrics/collector.rb +7 -3
  23. data/lib/datadog/appsec/metrics/telemetry.rb +1 -1
  24. data/lib/datadog/appsec/metrics/telemetry_exporter.rb +28 -0
  25. data/lib/datadog/appsec/metrics.rb +1 -0
  26. data/lib/datadog/appsec/security_engine/engine.rb +14 -32
  27. data/lib/datadog/appsec/security_engine/result.rb +16 -0
  28. data/lib/datadog/appsec/security_engine/runner.rb +18 -4
  29. data/lib/datadog/appsec/thread_safe_ref.rb +61 -0
  30. data/lib/datadog/appsec/trace_keeper.rb +24 -0
  31. data/lib/datadog/appsec/utils/hash_coercion.rb +23 -0
  32. data/lib/datadog/appsec.rb +0 -7
  33. data/lib/datadog/auto_instrument_base.rb +2 -1
  34. data/lib/datadog/core/configuration/option.rb +29 -20
  35. data/lib/datadog/core/configuration/option_definition.rb +2 -2
  36. data/lib/datadog/core/configuration/options.rb +13 -7
  37. data/lib/datadog/di/boot.rb +7 -0
  38. data/lib/datadog/di/component.rb +7 -0
  39. data/lib/datadog/di/probe_file_loader/railtie.rb +15 -0
  40. data/lib/datadog/di/probe_file_loader.rb +82 -0
  41. data/lib/datadog/di/remote.rb +3 -5
  42. data/lib/datadog/di.rb +0 -1
  43. data/lib/datadog/kit/appsec/events/v2.rb +5 -4
  44. data/lib/datadog/kit/appsec/events.rb +11 -10
  45. data/lib/datadog/kit/identity.rb +17 -11
  46. data/lib/datadog/opentelemetry/api/baggage.rb +2 -2
  47. data/lib/datadog/opentelemetry/api/context.rb +10 -9
  48. data/lib/datadog/opentelemetry/sdk/propagator.rb +4 -4
  49. data/lib/datadog/opentelemetry/sdk/span_processor.rb +8 -8
  50. data/lib/datadog/opentelemetry/sdk/trace/span.rb +14 -10
  51. data/lib/datadog/opentelemetry/trace.rb +4 -4
  52. data/lib/datadog/profiling.rb +6 -8
  53. data/lib/datadog/tracing/analytics.rb +1 -1
  54. data/lib/datadog/tracing/buffer.rb +7 -7
  55. data/lib/datadog/tracing/configuration/dynamic.rb +4 -6
  56. data/lib/datadog/tracing/configuration/ext.rb +3 -2
  57. data/lib/datadog/tracing/configuration/settings.rb +17 -0
  58. data/lib/datadog/tracing/context.rb +2 -2
  59. data/lib/datadog/tracing/contrib/action_cable/event.rb +1 -1
  60. data/lib/datadog/tracing/contrib/action_cable/integration.rb +1 -1
  61. data/lib/datadog/tracing/contrib/action_mailer/integration.rb +1 -1
  62. data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb +4 -4
  63. data/lib/datadog/tracing/contrib/action_pack/integration.rb +1 -1
  64. data/lib/datadog/tracing/contrib/action_view/events/render_template.rb +1 -1
  65. data/lib/datadog/tracing/contrib/active_job/event.rb +8 -8
  66. data/lib/datadog/tracing/contrib/active_job/events/discard.rb +1 -1
  67. data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb +1 -1
  68. data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb +1 -1
  69. data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb +1 -1
  70. data/lib/datadog/tracing/contrib/active_job/events/perform.rb +1 -1
  71. data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb +1 -1
  72. data/lib/datadog/tracing/contrib/active_job/integration.rb +1 -1
  73. data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb +1 -1
  74. data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb +3 -3
  75. data/lib/datadog/tracing/contrib/active_model_serializers/integration.rb +1 -2
  76. data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb +1 -1
  77. data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb +1 -1
  78. data/lib/datadog/tracing/contrib/active_record/events/sql.rb +5 -5
  79. data/lib/datadog/tracing/contrib/active_record/integration.rb +1 -1
  80. data/lib/datadog/tracing/contrib/active_record/utils.rb +15 -15
  81. data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb +6 -6
  82. data/lib/datadog/tracing/contrib/active_support/integration.rb +1 -1
  83. data/lib/datadog/tracing/contrib/active_support/notifications/event.rb +2 -1
  84. data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb +7 -9
  85. data/lib/datadog/tracing/contrib/aws/ext.rb +1 -1
  86. data/lib/datadog/tracing/contrib/aws/instrumentation.rb +2 -2
  87. data/lib/datadog/tracing/contrib/aws/parsed_context.rb +3 -1
  88. data/lib/datadog/tracing/contrib/aws/patcher.rb +5 -1
  89. data/lib/datadog/tracing/contrib/aws/service/base.rb +2 -1
  90. data/lib/datadog/tracing/contrib/aws/service/dynamodb.rb +1 -1
  91. data/lib/datadog/tracing/contrib/aws/service/eventbridge.rb +1 -1
  92. data/lib/datadog/tracing/contrib/aws/service/kinesis.rb +1 -1
  93. data/lib/datadog/tracing/contrib/aws/service/s3.rb +1 -1
  94. data/lib/datadog/tracing/contrib/aws/service/sns.rb +1 -1
  95. data/lib/datadog/tracing/contrib/aws/service/sqs.rb +1 -1
  96. data/lib/datadog/tracing/contrib/aws/service/states.rb +1 -1
  97. data/lib/datadog/tracing/contrib/aws/services.rb +7 -7
  98. data/lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb +1 -1
  99. data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb +1 -1
  100. data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb +1 -1
  101. data/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb +1 -1
  102. data/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb +1 -1
  103. data/lib/datadog/tracing/contrib/configurable.rb +6 -6
  104. data/lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb +4 -4
  105. data/lib/datadog/tracing/contrib/dalli/ext.rb +3 -2
  106. data/lib/datadog/tracing/contrib/dalli/integration.rb +1 -1
  107. data/lib/datadog/tracing/contrib/delayed_job/integration.rb +1 -1
  108. data/lib/datadog/tracing/contrib/elasticsearch/ext.rb +3 -2
  109. data/lib/datadog/tracing/contrib/elasticsearch/integration.rb +4 -4
  110. data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +51 -53
  111. data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb +5 -5
  112. data/lib/datadog/tracing/contrib/ethon/easy_patch.rb +2 -2
  113. data/lib/datadog/tracing/contrib/ethon/ext.rb +3 -2
  114. data/lib/datadog/tracing/contrib/ethon/integration.rb +1 -1
  115. data/lib/datadog/tracing/contrib/excon/ext.rb +3 -2
  116. data/lib/datadog/tracing/contrib/excon/integration.rb +1 -1
  117. data/lib/datadog/tracing/contrib/excon/middleware.rb +2 -2
  118. data/lib/datadog/tracing/contrib/ext.rb +3 -3
  119. data/lib/datadog/tracing/contrib/extensions.rb +9 -9
  120. data/lib/datadog/tracing/contrib/faraday/ext.rb +3 -2
  121. data/lib/datadog/tracing/contrib/faraday/integration.rb +1 -1
  122. data/lib/datadog/tracing/contrib/faraday/middleware.rb +4 -2
  123. data/lib/datadog/tracing/contrib/grape/endpoint.rb +8 -8
  124. data/lib/datadog/tracing/contrib/grape/integration.rb +1 -1
  125. data/lib/datadog/tracing/contrib/graphql/integration.rb +1 -1
  126. data/lib/datadog/tracing/contrib/graphql/patcher.rb +2 -2
  127. data/lib/datadog/tracing/contrib/graphql/unified_trace.rb +24 -24
  128. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb +8 -8
  129. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb +3 -3
  130. data/lib/datadog/tracing/contrib/grpc/distributed/fetcher.rb +1 -1
  131. data/lib/datadog/tracing/contrib/grpc/integration.rb +1 -1
  132. data/lib/datadog/tracing/contrib/hanami/ext.rb +2 -2
  133. data/lib/datadog/tracing/contrib/hanami/integration.rb +1 -1
  134. data/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb +1 -1
  135. data/lib/datadog/tracing/contrib/hanami/router_tracing.rb +9 -11
  136. data/lib/datadog/tracing/contrib/http/distributed/fetcher.rb +4 -4
  137. data/lib/datadog/tracing/contrib/http/ext.rb +3 -2
  138. data/lib/datadog/tracing/contrib/http/instrumentation.rb +5 -5
  139. data/lib/datadog/tracing/contrib/httpclient/ext.rb +3 -2
  140. data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb +3 -3
  141. data/lib/datadog/tracing/contrib/httpclient/integration.rb +1 -1
  142. data/lib/datadog/tracing/contrib/httprb/ext.rb +3 -2
  143. data/lib/datadog/tracing/contrib/httprb/instrumentation.rb +4 -4
  144. data/lib/datadog/tracing/contrib/httprb/integration.rb +1 -1
  145. data/lib/datadog/tracing/contrib/kafka/event.rb +1 -1
  146. data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb +1 -1
  147. data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb +1 -1
  148. data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb +1 -1
  149. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb +1 -1
  150. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb +1 -1
  151. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb +1 -1
  152. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb +1 -1
  153. data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb +1 -1
  154. data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb +1 -1
  155. data/lib/datadog/tracing/contrib/kafka/integration.rb +1 -1
  156. data/lib/datadog/tracing/contrib/karafka/monitor.rb +13 -13
  157. data/lib/datadog/tracing/contrib/karafka/patcher.rb +4 -4
  158. data/lib/datadog/tracing/contrib/lograge/instrumentation.rb +1 -1
  159. data/lib/datadog/tracing/contrib/lograge/integration.rb +1 -1
  160. data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +1 -1
  161. data/lib/datadog/tracing/contrib/mongodb/ext.rb +1 -1
  162. data/lib/datadog/tracing/contrib/mongodb/integration.rb +1 -1
  163. data/lib/datadog/tracing/contrib/mongodb/parsers.rb +1 -1
  164. data/lib/datadog/tracing/contrib/mongodb/subscribers.rb +6 -6
  165. data/lib/datadog/tracing/contrib/mysql2/ext.rb +1 -1
  166. data/lib/datadog/tracing/contrib/mysql2/integration.rb +1 -1
  167. data/lib/datadog/tracing/contrib/opensearch/configuration/settings.rb +1 -1
  168. data/lib/datadog/tracing/contrib/opensearch/ext.rb +3 -2
  169. data/lib/datadog/tracing/contrib/opensearch/integration.rb +1 -2
  170. data/lib/datadog/tracing/contrib/opensearch/patcher.rb +68 -70
  171. data/lib/datadog/tracing/contrib/opensearch/quantize.rb +5 -5
  172. data/lib/datadog/tracing/contrib/patcher.rb +7 -9
  173. data/lib/datadog/tracing/contrib/pg/integration.rb +1 -1
  174. data/lib/datadog/tracing/contrib/presto/ext.rb +1 -1
  175. data/lib/datadog/tracing/contrib/presto/instrumentation.rb +3 -3
  176. data/lib/datadog/tracing/contrib/presto/integration.rb +1 -1
  177. data/lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb +1 -1
  178. data/lib/datadog/tracing/contrib/propagation/sql_comment.rb +1 -1
  179. data/lib/datadog/tracing/contrib/que/integration.rb +1 -1
  180. data/lib/datadog/tracing/contrib/racecar/event.rb +1 -1
  181. data/lib/datadog/tracing/contrib/racecar/events/batch.rb +2 -2
  182. data/lib/datadog/tracing/contrib/racecar/events/consume.rb +1 -1
  183. data/lib/datadog/tracing/contrib/racecar/events/message.rb +2 -2
  184. data/lib/datadog/tracing/contrib/racecar/integration.rb +1 -1
  185. data/lib/datadog/tracing/contrib/rack/header_collection.rb +1 -1
  186. data/lib/datadog/tracing/contrib/rack/header_tagging.rb +32 -32
  187. data/lib/datadog/tracing/contrib/rack/integration.rb +1 -1
  188. data/lib/datadog/tracing/contrib/rack/middlewares.rb +21 -17
  189. data/lib/datadog/tracing/contrib/rack/patcher.rb +1 -1
  190. data/lib/datadog/tracing/contrib/rack/request_queue.rb +2 -2
  191. data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +1 -1
  192. data/lib/datadog/tracing/contrib/rails/integration.rb +1 -1
  193. data/lib/datadog/tracing/contrib/rails/log_injection.rb +1 -1
  194. data/lib/datadog/tracing/contrib/rails/middlewares.rb +1 -1
  195. data/lib/datadog/tracing/contrib/rails/runner.rb +5 -4
  196. data/lib/datadog/tracing/contrib/rake/instrumentation.rb +4 -4
  197. data/lib/datadog/tracing/contrib/rake/integration.rb +1 -1
  198. data/lib/datadog/tracing/contrib/redis/configuration/resolver.rb +2 -2
  199. data/lib/datadog/tracing/contrib/redis/ext.rb +3 -2
  200. data/lib/datadog/tracing/contrib/redis/integration.rb +2 -2
  201. data/lib/datadog/tracing/contrib/redis/patcher.rb +4 -4
  202. data/lib/datadog/tracing/contrib/redis/quantize.rb +1 -1
  203. data/lib/datadog/tracing/contrib/redis/tags.rb +1 -1
  204. data/lib/datadog/tracing/contrib/redis/trace_middleware.rb +4 -4
  205. data/lib/datadog/tracing/contrib/registry.rb +1 -1
  206. data/lib/datadog/tracing/contrib/resque/integration.rb +1 -1
  207. data/lib/datadog/tracing/contrib/resque/resque_job.rb +1 -1
  208. data/lib/datadog/tracing/contrib/rest_client/ext.rb +3 -2
  209. data/lib/datadog/tracing/contrib/rest_client/integration.rb +1 -1
  210. data/lib/datadog/tracing/contrib/rest_client/request_patch.rb +3 -3
  211. data/lib/datadog/tracing/contrib/roda/instrumentation.rb +1 -1
  212. data/lib/datadog/tracing/contrib/roda/integration.rb +1 -1
  213. data/lib/datadog/tracing/contrib/semantic_logger/instrumentation.rb +1 -1
  214. data/lib/datadog/tracing/contrib/semantic_logger/integration.rb +1 -1
  215. data/lib/datadog/tracing/contrib/sequel/database.rb +5 -5
  216. data/lib/datadog/tracing/contrib/sequel/dataset.rb +1 -1
  217. data/lib/datadog/tracing/contrib/sequel/integration.rb +1 -1
  218. data/lib/datadog/tracing/contrib/sequel/utils.rb +1 -1
  219. data/lib/datadog/tracing/contrib/shoryuken/integration.rb +1 -1
  220. data/lib/datadog/tracing/contrib/sidekiq/integration.rb +1 -1
  221. data/lib/datadog/tracing/contrib/sidekiq/utils.rb +1 -1
  222. data/lib/datadog/tracing/contrib/sinatra/integration.rb +1 -1
  223. data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb +38 -40
  224. data/lib/datadog/tracing/contrib/sneakers/integration.rb +1 -1
  225. data/lib/datadog/tracing/contrib/stripe/integration.rb +1 -1
  226. data/lib/datadog/tracing/contrib/stripe/request.rb +1 -1
  227. data/lib/datadog/tracing/contrib/sucker_punch/integration.rb +1 -1
  228. data/lib/datadog/tracing/contrib/trilogy/ext.rb +1 -1
  229. data/lib/datadog/tracing/contrib/trilogy/integration.rb +1 -1
  230. data/lib/datadog/tracing/contrib/utils/quantization/hash.rb +11 -11
  231. data/lib/datadog/tracing/contrib/utils/quantization/http.rb +6 -6
  232. data/lib/datadog/tracing/diagnostics/environment_logger.rb +5 -1
  233. data/lib/datadog/tracing/distributed/b3_single.rb +1 -1
  234. data/lib/datadog/tracing/distributed/baggage.rb +73 -8
  235. data/lib/datadog/tracing/distributed/datadog.rb +4 -5
  236. data/lib/datadog/tracing/distributed/datadog_tags_codec.rb +11 -13
  237. data/lib/datadog/tracing/distributed/helpers.rb +1 -1
  238. data/lib/datadog/tracing/distributed/none.rb +4 -2
  239. data/lib/datadog/tracing/distributed/propagation.rb +4 -1
  240. data/lib/datadog/tracing/distributed/propagation_policy.rb +1 -1
  241. data/lib/datadog/tracing/distributed/trace_context.rb +22 -16
  242. data/lib/datadog/tracing/event.rb +5 -7
  243. data/lib/datadog/tracing/flush.rb +1 -1
  244. data/lib/datadog/tracing/metadata/analytics.rb +1 -1
  245. data/lib/datadog/tracing/metadata/tagging.rb +4 -4
  246. data/lib/datadog/tracing/pipeline/span_filter.rb +3 -1
  247. data/lib/datadog/tracing/pipeline/span_processor.rb +3 -1
  248. data/lib/datadog/tracing/pipeline.rb +1 -1
  249. data/lib/datadog/tracing/sampling/ext.rb +0 -2
  250. data/lib/datadog/tracing/sampling/rule_sampler.rb +30 -30
  251. data/lib/datadog/tracing/sampling/span/rule_parser.rb +1 -1
  252. data/lib/datadog/tracing/sampling/span/sampler.rb +0 -7
  253. data/lib/datadog/tracing/span.rb +1 -1
  254. data/lib/datadog/tracing/span_event.rb +10 -10
  255. data/lib/datadog/tracing/span_link.rb +12 -12
  256. data/lib/datadog/tracing/span_operation.rb +9 -11
  257. data/lib/datadog/tracing/trace_digest.rb +21 -23
  258. data/lib/datadog/tracing/trace_operation.rb +84 -88
  259. data/lib/datadog/tracing/trace_segment.rb +2 -2
  260. data/lib/datadog/tracing/tracer.rb +36 -38
  261. data/lib/datadog/tracing/transport/http/client.rb +1 -1
  262. data/lib/datadog/tracing/transport/http/traces.rb +2 -2
  263. data/lib/datadog/tracing/transport/io/client.rb +5 -5
  264. data/lib/datadog/tracing/transport/io/traces.rb +4 -4
  265. data/lib/datadog/tracing/transport/statistics.rb +1 -1
  266. data/lib/datadog/tracing/transport/traces.rb +5 -5
  267. data/lib/datadog/tracing/workers/trace_writer.rb +12 -12
  268. data/lib/datadog/tracing/workers.rb +2 -2
  269. data/lib/datadog/tracing.rb +2 -2
  270. data/lib/datadog/version.rb +1 -1
  271. metadata +15 -6
@@ -19,7 +19,7 @@ module Datadog
19
19
  # post method runs the task within composited executor - in a different thread. The original arguments are
20
20
  # captured to be propagated to the composited executor post method
21
21
  def post(*args, &task)
22
- digest = Tracing.active_trace && Tracing.active_trace.to_digest
22
+ digest = Tracing.active_trace&.to_digest
23
23
  executor = @composited_executor.is_a?(Symbol) ? Concurrent.executor(@composited_executor) : @composited_executor
24
24
 
25
25
  # Pass the original arguments to the composited executor, which
@@ -9,7 +9,7 @@ module Datadog
9
9
  # This patches the Future - to wrap executor service using ContextCompositeExecutorService
10
10
  module FuturePatch
11
11
  def ns_initialize(value, opts)
12
- super(value, opts)
12
+ super
13
13
 
14
14
  @executor = ContextCompositeExecutorService.new(@executor)
15
15
  end
@@ -21,7 +21,7 @@ module Datadog
21
21
  end
22
22
 
23
23
  def self.version
24
- Gem.loaded_specs['concurrent-ruby'] && Gem.loaded_specs['concurrent-ruby'].version
24
+ Gem.loaded_specs['concurrent-ruby']&.version
25
25
  end
26
26
 
27
27
  def self.loaded?
@@ -13,7 +13,7 @@ module Datadog
13
13
  default_executor = ContextCompositeExecutorService.new(default_executor)
14
14
  end
15
15
 
16
- super(default_executor, *args, &task)
16
+ super
17
17
  end
18
18
  end
19
19
  end
@@ -43,14 +43,14 @@ module Datadog
43
43
  # the provided `options` and `&block`.
44
44
  def configure(matcher = :default, options = {}, &block)
45
45
  config = if matcher == :default
46
- default_configuration
47
- else
48
- # Get or add the configuration
49
- resolver.get(matcher) || resolver.add(matcher, new_configuration)
50
- end
46
+ default_configuration
47
+ else
48
+ # Get or add the configuration
49
+ resolver.get(matcher) || resolver.add(matcher, new_configuration)
50
+ end
51
51
 
52
52
  # Apply the settings
53
- config.configure(options, &block) if config
53
+ config&.configure(options, &block)
54
54
  config
55
55
  end
56
56
 
@@ -17,10 +17,10 @@ module Datadog
17
17
  # Try to find a matching pattern
18
18
  _, config = configurations.reverse_each.find do |matcher, _|
19
19
  matcher === if matcher.is_a?(Proc)
20
- value
21
- else
22
- value.to_s
23
- end
20
+ value
21
+ else
22
+ value.to_s
23
+ end
24
24
  end
25
25
 
26
26
  config
@@ -29,10 +29,11 @@ module Datadog
29
29
  TAG_COMPONENT = 'dalli'
30
30
  TAG_OPERATION_COMMAND = 'command'
31
31
  TAG_SYSTEM = 'memcached'
32
- PEER_SERVICE_SOURCES = Array[
32
+ PEER_SERVICE_SOURCES = [
33
33
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
34
34
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
35
- Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
35
+ Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
36
+ ].freeze
36
37
  end
37
38
  end
38
39
  end
@@ -19,7 +19,7 @@ module Datadog
19
19
  register_as :dalli, auto_patch: true
20
20
 
21
21
  def self.version
22
- Gem.loaded_specs['dalli'] && Gem.loaded_specs['dalli'].version
22
+ Gem.loaded_specs['dalli']&.version
23
23
  end
24
24
 
25
25
  def self.loaded?
@@ -18,7 +18,7 @@ module Datadog
18
18
  register_as :delayed_job
19
19
 
20
20
  def self.version
21
- Gem.loaded_specs['delayed_job'] && Gem.loaded_specs['delayed_job'].version
21
+ Gem.loaded_specs['delayed_job']&.version
22
22
  end
23
23
 
24
24
  def self.loaded?
@@ -23,10 +23,11 @@ module Datadog
23
23
  TAG_COMPONENT = 'elasticsearch'
24
24
  TAG_OPERATION_QUERY = 'query'
25
25
  TAG_SYSTEM = 'elasticsearch'
26
- PEER_SERVICE_SOURCES = Array[
26
+ PEER_SERVICE_SOURCES = [
27
27
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
28
28
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
29
- Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
29
+ Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
30
+ ].freeze
30
31
  end
31
32
  end
32
33
  end
@@ -20,10 +20,10 @@ module Datadog
20
20
  def self.version
21
21
  # elastic-transport gem for version >= 8.0.0
22
22
  # elasticsearch-transport gem for version < 8.0.0
23
- Gem.loaded_specs['elastic-transport'] \
24
- && Gem.loaded_specs['elastic-transport'].version || \
25
- Gem.loaded_specs['elasticsearch-transport'] \
26
- && Gem.loaded_specs['elasticsearch-transport'].version
23
+
24
+ Gem.loaded_specs['elastic-transport']&.version ||
25
+
26
+ Gem.loaded_specs['elasticsearch-transport']&.version
27
27
  end
28
28
 
29
29
  def self.loaded?
@@ -55,59 +55,57 @@ module Datadog
55
55
  service: service,
56
56
  on_error: on_error
57
57
  ) do |span|
58
- begin
59
- connection = transport.connections.first
60
- host = connection.host[:host] if connection
61
- port = connection.host[:port] if connection
62
-
63
- if datadog_configuration[:peer_service]
64
- span.set_tag(
65
- Tracing::Metadata::Ext::TAG_PEER_SERVICE,
66
- datadog_configuration[:peer_service]
67
- )
68
- end
69
-
70
- # Tag original global service name if not used
71
- if span.service != Datadog.configuration.service
72
- span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
73
- end
74
-
75
- span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
76
-
77
- span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
78
- span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
79
- span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
80
-
81
- span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
82
-
83
- span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
84
-
85
- # Set analytics sample rate
86
- if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
87
- Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
88
- end
89
-
90
- span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
91
- tag_params(params, span)
92
- tag_body(body, span)
93
- span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
94
- span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
95
- span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
96
-
97
- quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
98
- span.resource = "#{method} #{quantized_url}"
99
- Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
100
- rescue StandardError => e
101
- # TODO: Refactor the code to streamline the execution without ensure
102
- Datadog.logger.error(e.message)
103
- Datadog::Core::Telemetry::Logger.report(e)
104
- ensure
105
- # the call is still executed
106
- response = super
107
-
108
- if response && response.respond_to?(:status)
109
- span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
110
- end
58
+ connection = transport.connections.first
59
+ host = connection.host[:host] if connection
60
+ port = connection.host[:port] if connection
61
+
62
+ if datadog_configuration[:peer_service]
63
+ span.set_tag(
64
+ Tracing::Metadata::Ext::TAG_PEER_SERVICE,
65
+ datadog_configuration[:peer_service]
66
+ )
67
+ end
68
+
69
+ # Tag original global service name if not used
70
+ if span.service != Datadog.configuration.service
71
+ span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
72
+ end
73
+
74
+ span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
75
+
76
+ span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
77
+ span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
78
+ span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
79
+
80
+ span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
81
+
82
+ span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
83
+
84
+ # Set analytics sample rate
85
+ if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
86
+ Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
87
+ end
88
+
89
+ span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
90
+ tag_params(params, span)
91
+ tag_body(body, span)
92
+ span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
93
+ span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
94
+ span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
95
+
96
+ quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
97
+ span.resource = "#{method} #{quantized_url}"
98
+ Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
99
+ rescue => e
100
+ # TODO: Refactor the code to streamline the execution without ensure
101
+ Datadog.logger.error(e.message)
102
+ Datadog::Core::Telemetry::Logger.report(e)
103
+ ensure
104
+ # the call is still executed
105
+ response = super
106
+
107
+ if response&.respond_to?(:status)
108
+ span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
111
109
  end
112
110
  end
113
111
  response
@@ -27,7 +27,7 @@ module Datadog
27
27
 
28
28
  def format_body(body, options = {})
29
29
  format_body!(body, options)
30
- rescue StandardError
30
+ rescue
31
31
  options[:placeholder] || PLACEHOLDER
32
32
  end
33
33
 
@@ -50,10 +50,10 @@ module Datadog
50
50
  # Show
51
51
  # If either is :all, value becomes :all
52
52
  options[:show] = if original[:show] == :all || additional[:show] == :all
53
- :all
54
- else
55
- (original[:show] || []).dup.concat(additional[:show] || []).uniq
56
- end
53
+ :all
54
+ else
55
+ (original[:show] || []).dup.concat(additional[:show] || []).uniq
56
+ end
57
57
 
58
58
  # Exclude
59
59
  options[:exclude] = (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq
@@ -97,7 +97,7 @@ module Datadog
97
97
  def datadog_before_request(continue_from: nil)
98
98
  load_datadog_configuration_for(url)
99
99
 
100
- trace_options = continue_from ? { continue_from: continue_from } : {}
100
+ trace_options = continue_from ? {continue_from: continue_from} : {}
101
101
  uri = try_parse_uri
102
102
 
103
103
  @datadog_span = Tracing.trace(
@@ -215,7 +215,7 @@ module Datadog
215
215
  # Find only well-behaved HTTP headers.
216
216
  lines.map do |line|
217
217
  header = line.split(':', 2)
218
- header.size != 2 ? nil : header
218
+ (header.size != 2) ? nil : header
219
219
  end.compact.to_h
220
220
  end
221
221
  end
@@ -21,10 +21,11 @@ module Datadog
21
21
  TAG_COMPONENT = 'ethon'
22
22
  TAG_OPERATION_REQUEST = 'request'
23
23
  TAG_OPERATION_MULTI_REQUEST = 'multi.request'
24
- PEER_SERVICE_SOURCES = Array[
24
+ PEER_SERVICE_SOURCES = [
25
25
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
26
26
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
27
- Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
27
+ Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
28
+ ].freeze
28
29
  end
29
30
  end
30
31
  end
@@ -19,7 +19,7 @@ module Datadog
19
19
  register_as :ethon
20
20
 
21
21
  def self.version
22
- Gem.loaded_specs['ethon'] && Gem.loaded_specs['ethon'].version
22
+ Gem.loaded_specs['ethon']&.version
23
23
  end
24
24
 
25
25
  def self.loaded?
@@ -19,10 +19,11 @@ module Datadog
19
19
  SPAN_REQUEST = 'excon.request'
20
20
  TAG_COMPONENT = 'excon'
21
21
  TAG_OPERATION_REQUEST = 'request'
22
- PEER_SERVICE_SOURCES = Array[
22
+ PEER_SERVICE_SOURCES = [
23
23
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
24
24
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
25
- Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
25
+ Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
26
+ ].freeze
26
27
  end
27
28
  end
28
29
  end
@@ -19,7 +19,7 @@ module Datadog
19
19
  register_as :excon
20
20
 
21
21
  def self.version
22
- Gem.loaded_specs['excon'] && Gem.loaded_specs['excon'].version
22
+ Gem.loaded_specs['excon']&.version
23
23
  end
24
24
 
25
25
  def self.loaded?
@@ -39,7 +39,7 @@ module Datadog
39
39
 
40
40
  span
41
41
  end
42
- rescue StandardError => e
42
+ rescue => e
43
43
  Datadog.logger.debug(e.message)
44
44
  end
45
45
 
@@ -179,7 +179,7 @@ module Datadog
179
179
  datum.delete(:datadog_span)
180
180
  end
181
181
  end
182
- rescue StandardError => e
182
+ rescue => e
183
183
  Datadog.logger.debug(e.message)
184
184
  end
185
185
 
@@ -26,7 +26,7 @@ module Datadog
26
26
  TAG_SYSTEM = 'db.system'
27
27
  TAG_STATEMENT = 'db.statement'
28
28
  TAG_ROW_COUNT = 'db.row_count'
29
- PEER_SERVICE_SOURCES = Array[TAG_INSTANCE,
29
+ PEER_SERVICE_SOURCES = [TAG_INSTANCE,
30
30
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
31
31
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
32
32
  Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
@@ -36,7 +36,7 @@ module Datadog
36
36
  TAG_SYSTEM = 'rpc.system'
37
37
  TAG_SERVICE = 'rpc.service'
38
38
  TAG_METHOD = 'rpc.method'
39
- PEER_SERVICE_SOURCES = Array[TAG_SERVICE,
39
+ PEER_SERVICE_SOURCES = [TAG_SERVICE,
40
40
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
41
41
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
42
42
  Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
@@ -49,7 +49,7 @@ module Datadog
49
49
  module Messaging
50
50
  TAG_SYSTEM = 'messaging.system'
51
51
  TAG_DESTINATION = 'messaging.destination'
52
- PEER_SERVICE_SOURCES = Array[Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
52
+ PEER_SERVICE_SOURCES = [Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
53
53
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
54
54
  Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
55
55
  end
@@ -63,17 +63,17 @@ module Datadog
63
63
  # TODO: We should promote most of this logic to core parts of datadog.
64
64
  def configure(&block)
65
65
  # Reconfigure core settings
66
- super(&block)
66
+ super
67
67
 
68
68
  # Activate integrations
69
69
  configuration = self.configuration.tracing
70
70
 
71
71
  if configuration.respond_to?(:integrations_pending_activation)
72
72
  ignore_integration_load_errors = if configuration.respond_to?(:ignore_integration_load_errors?)
73
- configuration.ignore_integration_load_errors?
74
- else
75
- false
76
- end
73
+ configuration.ignore_integration_load_errors?
74
+ else
75
+ false
76
+ end
77
77
 
78
78
  configuration.integrations_pending_activation.each do |integration|
79
79
  next unless integration.respond_to?(:patch)
@@ -85,9 +85,9 @@ module Datadog
85
85
 
86
86
  # if patching failed, only log output if verbosity is unset
87
87
  # or if patching failure is due to compatibility or integration specific reasons
88
- next unless !ignore_integration_load_errors ||
89
- ((patch_results[:available] && patch_results[:loaded]) &&
90
- (!patch_results[:compatible] || !patch_results[:patchable]))
88
+ next if ignore_integration_load_errors &&
89
+ (!patch_results[:available] || !patch_results[:loaded] ||
90
+ (patch_results[:compatible] && patch_results[:patchable]))
91
91
 
92
92
  desc = "Available?: #{patch_results[:available]}"
93
93
  desc += ", Loaded? #{patch_results[:loaded]}"
@@ -208,7 +208,7 @@ module Datadog
208
208
  # @return [Datadog::Tracing::Contrib::Configuration::Settings]
209
209
  def [](integration_name, key = :default)
210
210
  integration = fetch_integration(integration_name)
211
- integration.resolve(key) unless integration.nil?
211
+ integration&.resolve(key)
212
212
  end
213
213
 
214
214
  # @!visibility private
@@ -19,10 +19,11 @@ module Datadog
19
19
  SPAN_REQUEST = 'faraday.request'
20
20
  TAG_COMPONENT = 'faraday'
21
21
  TAG_OPERATION_REQUEST = 'request'
22
- PEER_SERVICE_SOURCES = Array[
22
+ PEER_SERVICE_SOURCES = [
23
23
  Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
24
24
  Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
25
- Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
25
+ Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
26
+ ].freeze
26
27
  end
27
28
  end
28
29
  end
@@ -19,7 +19,7 @@ module Datadog
19
19
  register_as :faraday, auto_patch: true
20
20
 
21
21
  def self.version
22
- Gem.loaded_specs['faraday'] && Gem.loaded_specs['faraday'].version
22
+ Gem.loaded_specs['faraday']&.version
23
23
  end
24
24
 
25
25
  def self.loaded?
@@ -82,12 +82,13 @@ module Datadog
82
82
  )
83
83
 
84
84
  Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
85
- rescue StandardError => e
85
+ rescue => e
86
86
  Datadog.logger.error(e.message)
87
87
  Datadog::Core::Telemetry::Logger.report(e)
88
88
  end
89
89
  # rubocop:enable Metrics/AbcSize
90
90
 
91
+ # rubocop:disable Metrics/AbcSize
91
92
  def handle_response(span, env, options)
92
93
  span.set_error(["Error #{env[:status]}", env[:body]]) if options[:error_status_codes].include? env[:status]
93
94
 
@@ -96,10 +97,11 @@ module Datadog
96
97
  span.set_tags(
97
98
  Datadog.configuration.tracing.header_tags.response_tags(env[:response_headers])
98
99
  )
99
- rescue StandardError => e
100
+ rescue => e
100
101
  Datadog.logger.error(e.message)
101
102
  Datadog::Core::Telemetry::Logger.report(e)
102
103
  end
104
+ # rubocop:enable Metrics/AbcSize
103
105
 
104
106
  def propagate!(trace, span, env)
105
107
  Contrib::HTTP.inject(trace, env[:request_headers])
@@ -76,7 +76,7 @@ module Datadog
76
76
  end
77
77
 
78
78
  Thread.current[KEY_RUN] = true
79
- rescue StandardError => e
79
+ rescue => e
80
80
  Datadog.logger.error(e.message)
81
81
  Datadog::Core::Telemetry::Logger.report(e)
82
82
  end
@@ -120,7 +120,7 @@ module Datadog
120
120
  span.start(start)
121
121
  span.finish(finish)
122
122
  end
123
- rescue StandardError => e
123
+ rescue => e
124
124
  Datadog.logger.error(e.message)
125
125
  Datadog::Core::Telemetry::Logger.report(e)
126
126
  end
@@ -164,7 +164,7 @@ module Datadog
164
164
  span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENDPOINT_RENDER)
165
165
 
166
166
  Thread.current[KEY_RENDER] = true
167
- rescue StandardError => e
167
+ rescue => e
168
168
  Datadog.logger.error(e.message)
169
169
  Datadog::Core::Telemetry::Logger.report(e)
170
170
  end
@@ -189,7 +189,7 @@ module Datadog
189
189
  span.start(start)
190
190
  span.finish(finish)
191
191
  end
192
- rescue StandardError => e
192
+ rescue => e
193
193
  Datadog.logger.error(e.message)
194
194
  Datadog::Core::Telemetry::Logger.report(e)
195
195
  end
@@ -228,7 +228,7 @@ module Datadog
228
228
  span.start(start)
229
229
  span.finish(finish)
230
230
  end
231
- rescue StandardError => e
231
+ rescue => e
232
232
  Datadog.logger.error(e.message)
233
233
  Datadog::Core::Telemetry::Logger.report(e)
234
234
  end
@@ -265,7 +265,7 @@ module Datadog
265
265
 
266
266
  def endpoint_expand_path(endpoint)
267
267
  route_path = endpoint.options[:path]
268
- namespace = endpoint.routes.first && endpoint.routes.first.namespace || ''
268
+ namespace = endpoint.routes.first&.namespace || ''
269
269
 
270
270
  path = (namespace.split('/') + route_path)
271
271
  .reject { |p| p.blank? || p.eql?('/') }
@@ -297,11 +297,11 @@ module Datadog
297
297
  matcher = datadog_configuration[:error_statuses]
298
298
  return true unless matcher
299
299
 
300
- matcher.include?(status) if matcher
300
+ matcher&.include?(status)
301
301
  end
302
302
 
303
303
  def enabled?
304
- Datadog.configuration.tracing.enabled && \
304
+ Datadog.configuration.tracing.enabled &&
305
305
  datadog_configuration[:enabled] == true
306
306
  end
307
307
 
@@ -18,7 +18,7 @@ module Datadog
18
18
  register_as :grape, auto_patch: true
19
19
 
20
20
  def self.version
21
- Gem.loaded_specs['grape'] && Gem.loaded_specs['grape'].version
21
+ Gem.loaded_specs['grape']&.version
22
22
  end
23
23
 
24
24
  def self.loaded?
@@ -16,7 +16,7 @@ module Datadog
16
16
  register_as :graphql, auto_patch: true
17
17
 
18
18
  def self.version
19
- Gem.loaded_specs['graphql'] && Gem.loaded_specs['graphql'].version
19
+ Gem.loaded_specs['graphql']&.version
20
20
  end
21
21
 
22
22
  def self.loaded?
@@ -36,8 +36,8 @@ module Datadog
36
36
  end
37
37
  else
38
38
  Datadog.logger.warn(
39
- "GraphQL version (#{target_version}) does not support GraphQL::Tracing::DataDogTrace"\
40
- 'or Datadog::Tracing::Contrib::GraphQL::UnifiedTrace.'\
39
+ "GraphQL version (#{target_version}) does not support GraphQL::Tracing::DataDogTrace" \
40
+ 'or Datadog::Tracing::Contrib::GraphQL::UnifiedTrace.' \
41
41
  'Falling back to GraphQL::Tracing::DataDogTracing.'
42
42
  )
43
43
  TracingPatcher.patch!(schemas)