ddtrace 1.12.1 → 1.18.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (448) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +388 -10
  3. data/ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md +3 -5
  4. data/ext/ddtrace_profiling_native_extension/clock_id.h +0 -3
  5. data/ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c +3 -22
  6. data/ext/ddtrace_profiling_native_extension/clock_id_noop.c +0 -1
  7. data/ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time_worker.c +41 -6
  8. data/ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.c +3 -0
  9. data/ext/ddtrace_profiling_native_extension/collectors_stack.c +76 -24
  10. data/ext/ddtrace_profiling_native_extension/collectors_stack.h +1 -1
  11. data/ext/ddtrace_profiling_native_extension/collectors_thread_context.c +292 -27
  12. data/ext/ddtrace_profiling_native_extension/collectors_thread_context.h +1 -1
  13. data/ext/ddtrace_profiling_native_extension/extconf.rb +40 -10
  14. data/ext/ddtrace_profiling_native_extension/http_transport.c +48 -16
  15. data/ext/ddtrace_profiling_native_extension/libdatadog_helpers.c +42 -0
  16. data/ext/ddtrace_profiling_native_extension/libdatadog_helpers.h +6 -0
  17. data/ext/ddtrace_profiling_native_extension/native_extension_helpers.rb +1 -1
  18. data/ext/ddtrace_profiling_native_extension/pid_controller.c +57 -0
  19. data/ext/ddtrace_profiling_native_extension/pid_controller.h +45 -0
  20. data/ext/ddtrace_profiling_native_extension/private_vm_api_access.c +136 -32
  21. data/ext/ddtrace_profiling_native_extension/private_vm_api_access.h +12 -0
  22. data/ext/ddtrace_profiling_native_extension/profiling.c +1 -2
  23. data/ext/ddtrace_profiling_native_extension/stack_recorder.c +81 -50
  24. data/ext/ddtrace_profiling_native_extension/stack_recorder.h +13 -3
  25. data/ext/ddtrace_profiling_native_extension/time_helpers.c +40 -4
  26. data/ext/ddtrace_profiling_native_extension/time_helpers.h +14 -0
  27. data/lib/datadog/appsec/assets/waf_rules/processors.json +92 -0
  28. data/lib/datadog/appsec/assets/waf_rules/recommended.json +698 -75
  29. data/lib/datadog/appsec/assets/waf_rules/scanners.json +114 -0
  30. data/lib/datadog/appsec/assets/waf_rules/strict.json +98 -8
  31. data/lib/datadog/appsec/assets.rb +8 -0
  32. data/lib/datadog/appsec/component.rb +21 -2
  33. data/lib/datadog/appsec/configuration/settings.rb +167 -189
  34. data/lib/datadog/appsec/configuration.rb +0 -79
  35. data/lib/datadog/appsec/contrib/auto_instrument.rb +2 -4
  36. data/lib/datadog/appsec/contrib/devise/event.rb +57 -0
  37. data/lib/datadog/appsec/contrib/devise/ext.rb +13 -0
  38. data/lib/datadog/appsec/contrib/devise/integration.rb +42 -0
  39. data/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb +76 -0
  40. data/lib/datadog/appsec/contrib/devise/patcher/registration_controller_patch.rb +54 -0
  41. data/lib/datadog/appsec/contrib/devise/patcher.rb +45 -0
  42. data/lib/datadog/appsec/contrib/devise/resource.rb +35 -0
  43. data/lib/datadog/appsec/contrib/devise/tracking.rb +49 -0
  44. data/lib/datadog/appsec/contrib/rack/ext.rb +2 -1
  45. data/lib/datadog/appsec/contrib/rack/gateway/request.rb +6 -2
  46. data/lib/datadog/appsec/contrib/rack/gateway/watcher.rb +8 -6
  47. data/lib/datadog/appsec/contrib/rack/reactive/request.rb +3 -8
  48. data/lib/datadog/appsec/contrib/rack/reactive/request_body.rb +3 -6
  49. data/lib/datadog/appsec/contrib/rack/reactive/response.rb +3 -6
  50. data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +3 -2
  51. data/lib/datadog/appsec/contrib/rack/request_middleware.rb +36 -17
  52. data/lib/datadog/appsec/contrib/rails/ext.rb +3 -2
  53. data/lib/datadog/appsec/contrib/rails/framework.rb +1 -3
  54. data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb +3 -2
  55. data/lib/datadog/appsec/contrib/rails/patcher.rb +17 -11
  56. data/lib/datadog/appsec/contrib/rails/reactive/action.rb +3 -6
  57. data/lib/datadog/appsec/contrib/sinatra/ext.rb +2 -1
  58. data/lib/datadog/appsec/contrib/sinatra/framework.rb +1 -3
  59. data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb +6 -4
  60. data/lib/datadog/appsec/contrib/sinatra/patcher.rb +13 -7
  61. data/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb +3 -6
  62. data/lib/datadog/appsec/event.rb +106 -50
  63. data/lib/datadog/appsec/extensions.rb +1 -130
  64. data/lib/datadog/appsec/monitor/gateway/watcher.rb +3 -3
  65. data/lib/datadog/appsec/monitor/reactive/set_user.rb +3 -6
  66. data/lib/datadog/appsec/processor/actions.rb +49 -0
  67. data/lib/datadog/appsec/processor/rule_loader.rb +60 -0
  68. data/lib/datadog/appsec/processor/rule_merger.rb +22 -2
  69. data/lib/datadog/appsec/processor.rb +35 -7
  70. data/lib/datadog/appsec/rate_limiter.rb +1 -1
  71. data/lib/datadog/appsec/remote.rb +17 -11
  72. data/lib/datadog/appsec/response.rb +82 -4
  73. data/lib/datadog/appsec/sample_rate.rb +21 -0
  74. data/lib/datadog/appsec.rb +3 -4
  75. data/lib/datadog/core/backport.rb +51 -0
  76. data/lib/datadog/core/configuration/agent_settings_resolver.rb +38 -29
  77. data/lib/datadog/core/configuration/base.rb +6 -16
  78. data/lib/datadog/core/configuration/components.rb +15 -3
  79. data/lib/datadog/core/configuration/ext.rb +28 -5
  80. data/lib/datadog/core/configuration/option.rb +269 -21
  81. data/lib/datadog/core/configuration/option_definition.rb +73 -32
  82. data/lib/datadog/core/configuration/options.rb +27 -15
  83. data/lib/datadog/core/configuration/settings.rb +182 -102
  84. data/lib/datadog/core/configuration.rb +4 -0
  85. data/lib/datadog/core/diagnostics/environment_logger.rb +130 -234
  86. data/lib/datadog/core/environment/execution.rb +103 -0
  87. data/lib/datadog/core/environment/ext.rb +13 -11
  88. data/lib/datadog/core/environment/variable_helpers.rb +0 -69
  89. data/lib/datadog/core/environment/yjit.rb +58 -0
  90. data/lib/datadog/core/error.rb +1 -0
  91. data/lib/datadog/core/git/ext.rb +26 -22
  92. data/lib/datadog/core/logging/ext.rb +3 -1
  93. data/lib/datadog/core/metrics/ext.rb +7 -5
  94. data/lib/datadog/core/remote/client/capabilities.rb +6 -1
  95. data/lib/datadog/core/remote/client.rb +3 -0
  96. data/lib/datadog/core/remote/component.rb +27 -36
  97. data/lib/datadog/core/remote/configuration/content.rb +28 -1
  98. data/lib/datadog/core/remote/configuration/repository.rb +3 -1
  99. data/lib/datadog/core/remote/ext.rb +1 -1
  100. data/lib/datadog/core/remote/negotiation.rb +19 -6
  101. data/lib/datadog/core/remote/transport/config.rb +60 -0
  102. data/lib/datadog/core/remote/transport/http/api/instance.rb +39 -0
  103. data/lib/datadog/core/remote/transport/http/api/spec.rb +21 -0
  104. data/lib/datadog/core/remote/transport/http/api.rb +58 -0
  105. data/lib/datadog/core/remote/transport/http/builder.rb +219 -0
  106. data/lib/datadog/core/remote/transport/http/client.rb +48 -0
  107. data/lib/datadog/core/remote/transport/http/config.rb +280 -0
  108. data/lib/datadog/core/remote/transport/http/negotiation.rb +146 -0
  109. data/lib/datadog/core/remote/transport/http.rb +179 -0
  110. data/lib/datadog/core/{transport → remote/transport}/negotiation.rb +25 -23
  111. data/lib/datadog/core/remote/worker.rb +4 -1
  112. data/lib/datadog/core/runtime/ext.rb +22 -12
  113. data/lib/datadog/core/runtime/metrics.rb +43 -0
  114. data/lib/datadog/core/telemetry/client.rb +12 -2
  115. data/lib/datadog/core/telemetry/collector.rb +13 -4
  116. data/lib/datadog/core/telemetry/emitter.rb +4 -2
  117. data/lib/datadog/core/telemetry/event.rb +19 -4
  118. data/lib/datadog/core/telemetry/ext.rb +4 -1
  119. data/lib/datadog/core/telemetry/heartbeat.rb +2 -4
  120. data/lib/datadog/core/telemetry/http/ext.rb +10 -8
  121. data/lib/datadog/core/telemetry/http/transport.rb +2 -0
  122. data/lib/datadog/core/telemetry/v2/app_client_configuration_change.rb +41 -0
  123. data/lib/datadog/core/telemetry/v2/request.rb +29 -0
  124. data/lib/datadog/core/transport/ext.rb +47 -0
  125. data/lib/datadog/core/transport/http/adapters/net.rb +168 -0
  126. data/lib/datadog/core/transport/http/adapters/registry.rb +29 -0
  127. data/lib/datadog/core/transport/http/adapters/test.rb +89 -0
  128. data/lib/datadog/core/transport/http/adapters/unix_socket.rb +83 -0
  129. data/lib/datadog/core/transport/http/api/endpoint.rb +31 -0
  130. data/lib/datadog/core/transport/http/api/fallbacks.rb +26 -0
  131. data/lib/datadog/core/transport/http/api/map.rb +18 -0
  132. data/lib/datadog/core/transport/http/env.rb +62 -0
  133. data/lib/datadog/core/transport/http/response.rb +60 -0
  134. data/lib/datadog/core/transport/parcel.rb +22 -0
  135. data/lib/datadog/core/transport/request.rb +17 -0
  136. data/lib/datadog/core/transport/response.rb +64 -0
  137. data/lib/datadog/core/utils/duration.rb +52 -0
  138. data/lib/datadog/core/utils/hash.rb +47 -0
  139. data/lib/datadog/core/utils/network.rb +1 -1
  140. data/lib/datadog/core/utils/safe_dup.rb +27 -20
  141. data/lib/datadog/core/utils.rb +1 -1
  142. data/lib/datadog/core/workers/async.rb +3 -2
  143. data/lib/datadog/core/workers/polling.rb +2 -2
  144. data/lib/datadog/kit/appsec/events.rb +139 -89
  145. data/lib/datadog/kit/enable_core_dumps.rb +5 -6
  146. data/lib/datadog/kit/identity.rb +80 -65
  147. data/lib/datadog/opentelemetry/api/context.rb +10 -3
  148. data/lib/datadog/opentelemetry/sdk/propagator.rb +2 -1
  149. data/lib/datadog/opentelemetry/sdk/span_processor.rb +48 -5
  150. data/lib/datadog/opentelemetry/sdk/trace/span.rb +167 -0
  151. data/lib/datadog/opentelemetry/trace.rb +58 -0
  152. data/lib/datadog/opentelemetry.rb +1 -0
  153. data/lib/datadog/opentracer/text_map_propagator.rb +2 -1
  154. data/lib/datadog/opentracer.rb +9 -0
  155. data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +16 -17
  156. data/lib/datadog/profiling/collectors/idle_sampling_helper.rb +3 -1
  157. data/lib/datadog/profiling/collectors/thread_context.rb +17 -2
  158. data/lib/datadog/profiling/component.rb +69 -94
  159. data/lib/datadog/profiling/diagnostics/environment_logger.rb +39 -0
  160. data/lib/datadog/profiling/exporter.rb +5 -1
  161. data/lib/datadog/profiling/ext.rb +0 -12
  162. data/lib/datadog/profiling/flush.rb +7 -5
  163. data/lib/datadog/profiling/http_transport.rb +19 -6
  164. data/lib/datadog/profiling/load_native_extension.rb +7 -1
  165. data/lib/datadog/profiling/native_extension.rb +0 -21
  166. data/lib/datadog/profiling/profiler.rb +36 -13
  167. data/lib/datadog/profiling/scheduler.rb +16 -9
  168. data/lib/datadog/profiling.rb +16 -78
  169. data/lib/datadog/tracing/component.rb +70 -11
  170. data/lib/datadog/tracing/configuration/agent_settings_resolver.rb +13 -0
  171. data/lib/datadog/tracing/configuration/dynamic/option.rb +71 -0
  172. data/lib/datadog/tracing/configuration/dynamic.rb +64 -0
  173. data/lib/datadog/tracing/configuration/ext.rb +40 -32
  174. data/lib/datadog/tracing/configuration/http.rb +74 -0
  175. data/lib/datadog/tracing/configuration/settings.rb +134 -98
  176. data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb +9 -6
  177. data/lib/datadog/tracing/contrib/action_cable/ext.rb +20 -18
  178. data/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb +9 -6
  179. data/lib/datadog/tracing/contrib/action_mailer/ext.rb +20 -18
  180. data/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb +9 -7
  181. data/lib/datadog/tracing/contrib/action_pack/ext.rb +10 -8
  182. data/lib/datadog/tracing/contrib/action_view/configuration/settings.rb +9 -6
  183. data/lib/datadog/tracing/contrib/action_view/ext.rb +12 -10
  184. data/lib/datadog/tracing/contrib/active_job/configuration/settings.rb +13 -7
  185. data/lib/datadog/tracing/contrib/active_job/ext.rb +25 -23
  186. data/lib/datadog/tracing/contrib/active_job/log_injection.rb +1 -1
  187. data/lib/datadog/tracing/contrib/active_job/patcher.rb +1 -1
  188. data/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb +9 -6
  189. data/lib/datadog/tracing/contrib/active_model_serializers/ext.rb +12 -10
  190. data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb +18 -11
  191. data/lib/datadog/tracing/contrib/active_record/configuration/settings.rb +9 -7
  192. data/lib/datadog/tracing/contrib/active_record/events/sql.rb +2 -6
  193. data/lib/datadog/tracing/contrib/active_record/ext.rb +17 -15
  194. data/lib/datadog/tracing/contrib/active_record/utils.rb +1 -1
  195. data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +106 -202
  196. data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +3 -0
  197. data/lib/datadog/tracing/contrib/active_support/configuration/settings.rb +9 -7
  198. data/lib/datadog/tracing/contrib/active_support/ext.rb +18 -16
  199. data/lib/datadog/tracing/contrib/aws/configuration/settings.rb +14 -7
  200. data/lib/datadog/tracing/contrib/aws/ext.rb +37 -24
  201. data/lib/datadog/tracing/contrib/aws/instrumentation.rb +16 -5
  202. data/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb +3 -2
  203. data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb +14 -14
  204. data/lib/datadog/tracing/contrib/concurrent_ruby/ext.rb +4 -2
  205. data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb +3 -10
  206. data/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb +2 -1
  207. data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +8 -1
  208. data/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb +22 -0
  209. data/lib/datadog/tracing/contrib/configuration/settings.rb +1 -1
  210. data/lib/datadog/tracing/contrib/dalli/configuration/settings.rb +20 -7
  211. data/lib/datadog/tracing/contrib/dalli/ext.rb +26 -11
  212. data/lib/datadog/tracing/contrib/dalli/instrumentation.rb +17 -8
  213. data/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb +13 -7
  214. data/lib/datadog/tracing/contrib/delayed_job/ext.rb +16 -14
  215. data/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb +14 -7
  216. data/lib/datadog/tracing/contrib/elasticsearch/ext.rb +21 -15
  217. data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +104 -99
  218. data/lib/datadog/tracing/contrib/ethon/configuration/settings.rb +16 -9
  219. data/lib/datadog/tracing/contrib/ethon/easy_patch.rb +48 -3
  220. data/lib/datadog/tracing/contrib/ethon/ext.rb +19 -11
  221. data/lib/datadog/tracing/contrib/ethon/multi_patch.rb +6 -3
  222. data/lib/datadog/tracing/contrib/excon/configuration/settings.rb +19 -10
  223. data/lib/datadog/tracing/contrib/excon/ext.rb +16 -8
  224. data/lib/datadog/tracing/contrib/excon/middleware.rb +25 -5
  225. data/lib/datadog/tracing/contrib/ext.rb +26 -1
  226. data/lib/datadog/tracing/contrib/extensions.rb +32 -0
  227. data/lib/datadog/tracing/contrib/faraday/configuration/settings.rb +20 -10
  228. data/lib/datadog/tracing/contrib/faraday/ext.rb +16 -8
  229. data/lib/datadog/tracing/contrib/faraday/middleware.rb +21 -5
  230. data/lib/datadog/tracing/contrib/grape/configuration/settings.rb +8 -6
  231. data/lib/datadog/tracing/contrib/grape/ext.rb +16 -14
  232. data/lib/datadog/tracing/contrib/graphql/configuration/settings.rb +8 -6
  233. data/lib/datadog/tracing/contrib/graphql/ext.rb +7 -5
  234. data/lib/datadog/tracing/contrib/grpc/configuration/settings.rb +39 -9
  235. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb +39 -20
  236. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb +37 -18
  237. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb +0 -4
  238. data/lib/datadog/tracing/contrib/grpc/ext.rb +16 -13
  239. data/lib/datadog/tracing/contrib/grpc/formatting.rb +127 -0
  240. data/lib/datadog/tracing/contrib/hanami/configuration/settings.rb +3 -2
  241. data/lib/datadog/tracing/contrib/hanami/ext.rb +10 -8
  242. data/lib/datadog/tracing/contrib/http/circuit_breaker.rb +5 -8
  243. data/lib/datadog/tracing/contrib/http/configuration/settings.rb +33 -11
  244. data/lib/datadog/tracing/contrib/http/ext.rb +16 -9
  245. data/lib/datadog/tracing/contrib/http/instrumentation.rb +27 -7
  246. data/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb +33 -11
  247. data/lib/datadog/tracing/contrib/httpclient/ext.rb +17 -9
  248. data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb +22 -5
  249. data/lib/datadog/tracing/contrib/httprb/configuration/settings.rb +33 -11
  250. data/lib/datadog/tracing/contrib/httprb/ext.rb +16 -9
  251. data/lib/datadog/tracing/contrib/httprb/instrumentation.rb +22 -5
  252. data/lib/datadog/tracing/contrib/kafka/configuration/settings.rb +9 -6
  253. data/lib/datadog/tracing/contrib/kafka/ext.rb +42 -39
  254. data/lib/datadog/tracing/contrib/lograge/configuration/settings.rb +3 -2
  255. data/lib/datadog/tracing/contrib/lograge/ext.rb +3 -1
  256. data/lib/datadog/tracing/contrib/lograge/instrumentation.rb +2 -17
  257. data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +14 -7
  258. data/lib/datadog/tracing/contrib/mongodb/ext.rb +20 -16
  259. data/lib/datadog/tracing/contrib/mongodb/subscribers.rb +16 -5
  260. data/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb +17 -14
  261. data/lib/datadog/tracing/contrib/mysql2/ext.rb +15 -10
  262. data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb +20 -6
  263. data/lib/datadog/tracing/contrib/opensearch/configuration/settings.rb +52 -0
  264. data/lib/datadog/tracing/contrib/opensearch/ext.rb +37 -0
  265. data/lib/datadog/tracing/contrib/opensearch/integration.rb +44 -0
  266. data/lib/datadog/tracing/contrib/opensearch/patcher.rb +135 -0
  267. data/lib/datadog/tracing/contrib/opensearch/quantize.rb +81 -0
  268. data/lib/datadog/tracing/contrib/pg/configuration/settings.rb +22 -14
  269. data/lib/datadog/tracing/contrib/pg/ext.rb +22 -19
  270. data/lib/datadog/tracing/contrib/pg/instrumentation.rb +38 -5
  271. data/lib/datadog/tracing/contrib/presto/configuration/settings.rb +14 -7
  272. data/lib/datadog/tracing/contrib/presto/ext.rb +25 -20
  273. data/lib/datadog/tracing/contrib/presto/instrumentation.rb +14 -5
  274. data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb +12 -10
  275. data/lib/datadog/tracing/contrib/propagation/sql_comment.rb +1 -1
  276. data/lib/datadog/tracing/contrib/qless/configuration/settings.rb +12 -8
  277. data/lib/datadog/tracing/contrib/qless/ext.rb +14 -12
  278. data/lib/datadog/tracing/contrib/que/configuration/settings.rb +21 -12
  279. data/lib/datadog/tracing/contrib/racecar/configuration/settings.rb +9 -7
  280. data/lib/datadog/tracing/contrib/racecar/event.rb +5 -5
  281. data/lib/datadog/tracing/contrib/racecar/ext.rb +20 -18
  282. data/lib/datadog/tracing/contrib/rack/configuration/settings.rb +16 -12
  283. data/lib/datadog/tracing/contrib/rack/ext.rb +18 -16
  284. data/lib/datadog/tracing/contrib/rack/header_collection.rb +3 -0
  285. data/lib/datadog/tracing/contrib/rack/header_tagging.rb +63 -0
  286. data/lib/datadog/tracing/contrib/rack/middlewares.rb +8 -49
  287. data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +19 -15
  288. data/lib/datadog/tracing/contrib/rails/ext.rb +7 -5
  289. data/lib/datadog/tracing/contrib/rails/log_injection.rb +7 -10
  290. data/lib/datadog/tracing/contrib/rails/patcher.rb +10 -41
  291. data/lib/datadog/tracing/contrib/rails/railtie.rb +3 -3
  292. data/lib/datadog/tracing/contrib/rake/configuration/settings.rb +13 -10
  293. data/lib/datadog/tracing/contrib/rake/ext.rb +14 -12
  294. data/lib/datadog/tracing/contrib/redis/configuration/settings.rb +17 -9
  295. data/lib/datadog/tracing/contrib/redis/ext.rb +22 -15
  296. data/lib/datadog/tracing/contrib/redis/instrumentation.rb +3 -38
  297. data/lib/datadog/tracing/contrib/redis/tags.rb +16 -7
  298. data/lib/datadog/tracing/contrib/redis/trace_middleware.rb +46 -33
  299. data/lib/datadog/tracing/contrib/resque/configuration/settings.rb +13 -7
  300. data/lib/datadog/tracing/contrib/resque/ext.rb +9 -7
  301. data/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb +16 -9
  302. data/lib/datadog/tracing/contrib/rest_client/ext.rb +15 -8
  303. data/lib/datadog/tracing/contrib/rest_client/request_patch.rb +25 -5
  304. data/lib/datadog/tracing/contrib/roda/configuration/settings.rb +9 -6
  305. data/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb +3 -2
  306. data/lib/datadog/tracing/contrib/semantic_logger/ext.rb +3 -1
  307. data/lib/datadog/tracing/contrib/semantic_logger/instrumentation.rb +4 -20
  308. data/lib/datadog/tracing/contrib/sequel/configuration/settings.rb +9 -6
  309. data/lib/datadog/tracing/contrib/sequel/ext.rb +10 -8
  310. data/lib/datadog/tracing/contrib/sequel/utils.rb +7 -7
  311. data/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb +14 -8
  312. data/lib/datadog/tracing/contrib/shoryuken/ext.rb +14 -12
  313. data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb +18 -11
  314. data/lib/datadog/tracing/contrib/sidekiq/ext.rb +32 -30
  315. data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb +11 -9
  316. data/lib/datadog/tracing/contrib/sinatra/env.rb +0 -17
  317. data/lib/datadog/tracing/contrib/sinatra/ext.rb +21 -19
  318. data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb +3 -14
  319. data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb +14 -8
  320. data/lib/datadog/tracing/contrib/sneakers/ext.rb +1 -0
  321. data/lib/datadog/tracing/contrib/sneakers/tracer.rb +1 -1
  322. data/lib/datadog/tracing/contrib/span_attribute_schema.rb +74 -10
  323. data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb +9 -6
  324. data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb +9 -6
  325. data/lib/datadog/tracing/contrib/sucker_punch/ext.rb +15 -13
  326. data/lib/datadog/tracing/contrib/utils/database.rb +5 -3
  327. data/lib/datadog/tracing/contrib/utils/quantization/http.rb +11 -11
  328. data/lib/datadog/tracing/contrib.rb +1 -0
  329. data/lib/datadog/tracing/correlation.rb +29 -12
  330. data/lib/datadog/tracing/diagnostics/environment_logger.rb +165 -0
  331. data/lib/datadog/tracing/diagnostics/ext.rb +21 -19
  332. data/lib/datadog/tracing/distributed/b3_multi.rb +2 -2
  333. data/lib/datadog/tracing/distributed/b3_single.rb +1 -1
  334. data/lib/datadog/tracing/distributed/datadog.rb +0 -1
  335. data/lib/datadog/tracing/distributed/propagation.rb +35 -34
  336. data/lib/datadog/tracing/distributed/trace_context.rb +52 -17
  337. data/lib/datadog/tracing/metadata/ext.rb +9 -6
  338. data/lib/datadog/tracing/metadata/tagging.rb +3 -3
  339. data/lib/datadog/tracing/remote.rb +78 -0
  340. data/lib/datadog/tracing/sampling/rule_sampler.rb +29 -0
  341. data/lib/datadog/tracing/span_operation.rb +3 -15
  342. data/lib/datadog/tracing/sync_writer.rb +3 -3
  343. data/lib/datadog/tracing/trace_digest.rb +31 -0
  344. data/lib/datadog/tracing/trace_operation.rb +16 -3
  345. data/lib/datadog/tracing/trace_segment.rb +5 -2
  346. data/lib/datadog/tracing/tracer.rb +12 -1
  347. data/lib/datadog/{core → tracing}/transport/http/api/instance.rb +1 -1
  348. data/lib/datadog/{core → tracing}/transport/http/api/spec.rb +1 -1
  349. data/lib/datadog/tracing/transport/http/api.rb +43 -0
  350. data/lib/datadog/{core → tracing}/transport/http/builder.rb +13 -68
  351. data/lib/datadog/tracing/transport/http/client.rb +57 -0
  352. data/lib/datadog/tracing/transport/http/statistics.rb +47 -0
  353. data/lib/datadog/tracing/transport/http/traces.rb +152 -0
  354. data/lib/datadog/tracing/transport/http.rb +124 -0
  355. data/lib/datadog/tracing/transport/io/client.rb +89 -0
  356. data/lib/datadog/tracing/transport/io/response.rb +27 -0
  357. data/lib/datadog/tracing/transport/io/traces.rb +101 -0
  358. data/lib/datadog/tracing/transport/io.rb +30 -0
  359. data/lib/datadog/tracing/transport/serializable_trace.rb +126 -0
  360. data/lib/datadog/tracing/transport/statistics.rb +77 -0
  361. data/lib/datadog/tracing/transport/trace_formatter.rb +209 -0
  362. data/lib/datadog/tracing/transport/traces.rb +224 -0
  363. data/lib/datadog/tracing/workers/trace_writer.rb +6 -4
  364. data/lib/datadog/tracing/workers.rb +4 -2
  365. data/lib/datadog/tracing/writer.rb +5 -2
  366. data/lib/ddtrace/transport/ext.rb +22 -14
  367. data/lib/ddtrace/version.rb +9 -12
  368. data/lib/ddtrace.rb +1 -1
  369. metadata +101 -93
  370. data/lib/datadog/ci/configuration/components.rb +0 -32
  371. data/lib/datadog/ci/configuration/settings.rb +0 -53
  372. data/lib/datadog/ci/contrib/cucumber/configuration/settings.rb +0 -33
  373. data/lib/datadog/ci/contrib/cucumber/ext.rb +0 -20
  374. data/lib/datadog/ci/contrib/cucumber/formatter.rb +0 -94
  375. data/lib/datadog/ci/contrib/cucumber/instrumentation.rb +0 -28
  376. data/lib/datadog/ci/contrib/cucumber/integration.rb +0 -47
  377. data/lib/datadog/ci/contrib/cucumber/patcher.rb +0 -27
  378. data/lib/datadog/ci/contrib/rspec/configuration/settings.rb +0 -33
  379. data/lib/datadog/ci/contrib/rspec/example.rb +0 -68
  380. data/lib/datadog/ci/contrib/rspec/ext.rb +0 -19
  381. data/lib/datadog/ci/contrib/rspec/integration.rb +0 -48
  382. data/lib/datadog/ci/contrib/rspec/patcher.rb +0 -27
  383. data/lib/datadog/ci/ext/app_types.rb +0 -9
  384. data/lib/datadog/ci/ext/environment.rb +0 -575
  385. data/lib/datadog/ci/ext/settings.rb +0 -10
  386. data/lib/datadog/ci/ext/test.rb +0 -35
  387. data/lib/datadog/ci/extensions.rb +0 -19
  388. data/lib/datadog/ci/flush.rb +0 -38
  389. data/lib/datadog/ci/test.rb +0 -81
  390. data/lib/datadog/ci.rb +0 -20
  391. data/lib/datadog/core/configuration/dependency_resolver.rb +0 -28
  392. data/lib/datadog/core/configuration/option_definition_set.rb +0 -22
  393. data/lib/datadog/core/configuration/option_set.rb +0 -10
  394. data/lib/datadog/core/transport/config.rb +0 -58
  395. data/lib/datadog/core/transport/http/api.rb +0 -57
  396. data/lib/datadog/core/transport/http/client.rb +0 -45
  397. data/lib/datadog/core/transport/http/config.rb +0 -268
  398. data/lib/datadog/core/transport/http/negotiation.rb +0 -144
  399. data/lib/datadog/core/transport/http.rb +0 -169
  400. data/lib/datadog/core/utils/object_set.rb +0 -43
  401. data/lib/datadog/core/utils/string_table.rb +0 -47
  402. data/lib/datadog/profiling/backtrace_location.rb +0 -34
  403. data/lib/datadog/profiling/buffer.rb +0 -43
  404. data/lib/datadog/profiling/collectors/old_stack.rb +0 -301
  405. data/lib/datadog/profiling/encoding/profile.rb +0 -41
  406. data/lib/datadog/profiling/event.rb +0 -15
  407. data/lib/datadog/profiling/events/stack.rb +0 -82
  408. data/lib/datadog/profiling/old_recorder.rb +0 -107
  409. data/lib/datadog/profiling/pprof/builder.rb +0 -125
  410. data/lib/datadog/profiling/pprof/converter.rb +0 -102
  411. data/lib/datadog/profiling/pprof/message_set.rb +0 -16
  412. data/lib/datadog/profiling/pprof/payload.rb +0 -20
  413. data/lib/datadog/profiling/pprof/pprof.proto +0 -212
  414. data/lib/datadog/profiling/pprof/pprof_pb.rb +0 -81
  415. data/lib/datadog/profiling/pprof/stack_sample.rb +0 -139
  416. data/lib/datadog/profiling/pprof/string_table.rb +0 -12
  417. data/lib/datadog/profiling/pprof/template.rb +0 -118
  418. data/lib/datadog/profiling/trace_identifiers/ddtrace.rb +0 -43
  419. data/lib/datadog/profiling/trace_identifiers/helper.rb +0 -45
  420. data/lib/datadog/tracing/contrib/sinatra/headers.rb +0 -35
  421. data/lib/ddtrace/transport/http/adapters/net.rb +0 -168
  422. data/lib/ddtrace/transport/http/adapters/registry.rb +0 -27
  423. data/lib/ddtrace/transport/http/adapters/test.rb +0 -85
  424. data/lib/ddtrace/transport/http/adapters/unix_socket.rb +0 -77
  425. data/lib/ddtrace/transport/http/api/endpoint.rb +0 -29
  426. data/lib/ddtrace/transport/http/api/fallbacks.rb +0 -24
  427. data/lib/ddtrace/transport/http/api/instance.rb +0 -35
  428. data/lib/ddtrace/transport/http/api/map.rb +0 -16
  429. data/lib/ddtrace/transport/http/api/spec.rb +0 -17
  430. data/lib/ddtrace/transport/http/api.rb +0 -39
  431. data/lib/ddtrace/transport/http/builder.rb +0 -176
  432. data/lib/ddtrace/transport/http/client.rb +0 -52
  433. data/lib/ddtrace/transport/http/env.rb +0 -58
  434. data/lib/ddtrace/transport/http/response.rb +0 -58
  435. data/lib/ddtrace/transport/http/statistics.rb +0 -43
  436. data/lib/ddtrace/transport/http/traces.rb +0 -144
  437. data/lib/ddtrace/transport/http.rb +0 -117
  438. data/lib/ddtrace/transport/io/client.rb +0 -85
  439. data/lib/ddtrace/transport/io/response.rb +0 -25
  440. data/lib/ddtrace/transport/io/traces.rb +0 -99
  441. data/lib/ddtrace/transport/io.rb +0 -28
  442. data/lib/ddtrace/transport/parcel.rb +0 -20
  443. data/lib/ddtrace/transport/request.rb +0 -15
  444. data/lib/ddtrace/transport/response.rb +0 -60
  445. data/lib/ddtrace/transport/serializable_trace.rb +0 -122
  446. data/lib/ddtrace/transport/statistics.rb +0 -75
  447. data/lib/ddtrace/transport/trace_formatter.rb +0 -198
  448. data/lib/ddtrace/transport/traces.rb +0 -216
@@ -10,271 +10,175 @@ module Datadog
10
10
  module ActiveSupport
11
11
  module Cache
12
12
  # Defines instrumentation for ActiveSupport caching
13
- # rubocop:disable Lint/RescueException
14
13
  module Instrumentation
15
14
  module_function
16
15
 
17
- def start_trace_cache(payload)
18
- return unless enabled?
19
-
20
- # In most of the cases Rails ``fetch()`` and ``read()`` calls are nested.
21
- # This check ensures that two reads are not nested since they don't provide
22
- # interesting details.
23
- # NOTE: the ``finish_trace_cache()`` is fired but it already has a safe-guard
24
- # to avoid any kind of issue.
25
- current_span = Tracing.active_span
26
- return if current_span.try(:name) == Ext::SPAN_CACHE &&
27
- (
28
- payload[:action] == Ext::RESOURCE_CACHE_GET &&
29
- current_span.try(:resource) == Ext::RESOURCE_CACHE_GET ||
30
- payload[:action] == Ext::RESOURCE_CACHE_MGET &&
31
- current_span.try(:resource) == Ext::RESOURCE_CACHE_MGET
32
- )
33
-
34
- tracing_context = payload.fetch(:tracing_context)
16
+ # @param action [String] type of cache operation. Will be set as the span resource.
17
+ # @param key [Object] redis cache key. Used for actions with a single key locator.
18
+ # @param multi_key [Array<Object>] list of redis cache keys. Used for actions with a multiple key locators.
19
+ def trace(action, store, key: nil, multi_key: nil)
20
+ return yield unless enabled?
35
21
 
36
22
  # create a new ``Span`` and add it to the tracing context
37
- service = Datadog.configuration.tracing[:active_support][:cache_service]
38
- type = Ext::SPAN_TYPE_CACHE
39
- span = Tracing.trace(Ext::SPAN_CACHE, service: service, span_type: type)
40
- span.resource = payload.fetch(:action)
41
-
42
- span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
43
- span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
44
-
45
- if Contrib::SpanAttributeSchema.default_span_attribute_schema?
46
- # Tag as an external peer service
47
- span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, service)
48
- end
49
-
50
- tracing_context[:dd_cache_span] = span
51
- rescue StandardError => e
52
- Datadog.logger.debug(e.message)
53
- end
54
-
55
- def finish_trace_cache(payload)
56
- return unless enabled?
57
-
58
- # retrieve the tracing context and continue the trace
59
- tracing_context = payload.fetch(:tracing_context)
60
- span = tracing_context[:dd_cache_span]
61
- return unless span && !span.finished?
62
-
63
- begin
64
- # discard parameters from the cache_store configuration
65
- if defined?(::Rails)
66
- store, = *Array.wrap(::Rails.configuration.cache_store).flatten
67
- span.set_tag(Ext::TAG_CACHE_BACKEND, store)
23
+ Tracing.trace(
24
+ Ext::SPAN_CACHE,
25
+ span_type: Ext::SPAN_TYPE_CACHE,
26
+ service: Datadog.configuration.tracing[:active_support][:cache_service],
27
+ resource: action
28
+ ) do |span|
29
+ span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
30
+ span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
31
+
32
+ if span.service != Datadog.configuration.service
33
+ span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
68
34
  end
69
35
 
70
- normalized_key = ::ActiveSupport::Cache.expand_cache_key(payload.fetch(:key))
71
- cache_key = Core::Utils.truncate(normalized_key, Ext::QUANTIZE_CACHE_MAX_KEY_SIZE)
72
- span.set_tag(Ext::TAG_CACHE_KEY, cache_key)
36
+ span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
37
+ set_cache_key(span, key, multi_key)
73
38
 
74
- span.set_error(payload[:exception]) if payload[:exception]
75
- ensure
76
- span.finish
39
+ yield
77
40
  end
78
- rescue StandardError => e
79
- Datadog.logger.debug(e.message)
80
41
  end
81
42
 
82
- def finish_trace_cache_multi(payload)
83
- return unless enabled?
84
-
85
- # retrieve the tracing context and continue the trace
86
- tracing_context = payload.fetch(:tracing_context)
87
- span = tracing_context[:dd_cache_span]
88
- return unless span && !span.finished?
43
+ # In most of the cases, `#fetch()` and `#read()` calls are nested.
44
+ # Instrument both does not add any value.
45
+ # This method checks if these two operations are nested.
46
+ def nested_read?
47
+ current_span = Tracing.active_span
48
+ current_span && current_span.name == Ext::SPAN_CACHE && current_span.resource == Ext::RESOURCE_CACHE_GET
49
+ end
89
50
 
90
- begin
91
- # discard parameters from the cache_store configuration
92
- if defined?(::Rails)
93
- store, = *Array.wrap(::Rails.configuration.cache_store).flatten
94
- span.set_tag(Ext::TAG_CACHE_BACKEND, store)
95
- end
96
- normalized_keys = payload.fetch(:keys, []).map do |key|
97
- ::ActiveSupport::Cache.expand_cache_key(key)
98
- end
99
- cache_keys = Core::Utils.truncate(normalized_keys, Ext::QUANTIZE_CACHE_MAX_KEY_SIZE)
100
- span.set_tag(Ext::TAG_CACHE_KEY_MULTI, cache_keys)
51
+ # (see #nested_read?)
52
+ def nested_multiread?
53
+ current_span = Tracing.active_span
54
+ current_span && current_span.name == Ext::SPAN_CACHE && current_span.resource == Ext::RESOURCE_CACHE_MGET
55
+ end
101
56
 
102
- span.set_error(payload[:exception]) if payload[:exception]
103
- ensure
104
- span.finish
57
+ def set_cache_key(span, single_key, multi_key)
58
+ if multi_key
59
+ resolved_key = multi_key.map { |key| ::ActiveSupport::Cache.expand_cache_key(key) }
60
+ cache_key = Core::Utils.truncate(resolved_key, Ext::QUANTIZE_CACHE_MAX_KEY_SIZE)
61
+ span.set_tag(Ext::TAG_CACHE_KEY_MULTI, cache_key)
62
+ else
63
+ resolved_key = ::ActiveSupport::Cache.expand_cache_key(single_key)
64
+ cache_key = Core::Utils.truncate(resolved_key, Ext::QUANTIZE_CACHE_MAX_KEY_SIZE)
65
+ span.set_tag(Ext::TAG_CACHE_KEY, cache_key)
105
66
  end
106
- rescue StandardError => e
107
- Datadog.logger.debug(e.message)
108
67
  end
109
68
 
110
69
  def enabled?
111
70
  Tracing.enabled? && Datadog.configuration.tracing[:active_support][:enabled]
112
71
  end
113
72
 
73
+ # Instance methods injected into the cache client
74
+ module InstanceMethods
75
+ private
76
+
77
+ # The name of the store is never saved.
78
+ # ActiveSupport looks up stores by converting a symbol into a 'require' path,
79
+ # then "camelizing" it for a `const_get` call:
80
+ # ```
81
+ # require "active_support/cache/#{store}"
82
+ # ActiveSupport::Cache.const_get(store.to_s.camelize)
83
+ # ```
84
+ # @see https://github.com/rails/rails/blob/261975dbef77731d2c76f907f1076c5132ebc0e4/activesupport/lib/active_support/cache.rb#L139-L149
85
+ #
86
+ # As `self` is the store object, we can reverse engineer
87
+ # the original symbol by converting the class name to snake case:
88
+ # e.g. ActiveSupport::Cache::RedisStore -> active_support/cache/redis_store
89
+ # In this case, `redis_store` is the store name.
90
+ #
91
+ # Because there's no API retrieve only the class name
92
+ # (only `RedisStore`, and not `ActiveSupport::Cache::RedisStore`)
93
+ # the easiest way to retrieve the store symbol is to convert the fully qualified
94
+ # name using the Rails-provided method `#underscore`, which is the reverse of `#camelize`,
95
+ # then extracting the last part of it.
96
+ #
97
+ # Also, this method caches the store name, given this value will be retrieve
98
+ # multiple times and involves string manipulation.
99
+ def dd_store_name
100
+ return @store_name if defined?(@store_name)
101
+
102
+ # DEV: String#underscore is available through ActiveSupport, and is
103
+ # DEV: the exact reverse operation to `#camelize`.
104
+ # DEV: String#demodulize is available through ActiveSupport, and is
105
+ # DEV: used to remove the module ('*::') part of a constant name.
106
+ @store_name = self.class.name.demodulize.underscore
107
+ end
108
+ end
109
+
114
110
  # Defines instrumentation for ActiveSupport cache reading
115
111
  module Read
112
+ include InstanceMethods
113
+
116
114
  def read(*args, &block)
117
- payload = {
118
- action: Ext::RESOURCE_CACHE_GET,
119
- key: args[0],
120
- tracing_context: {}
121
- }
122
-
123
- begin
124
- # process and catch cache exceptions
125
- Instrumentation.start_trace_cache(payload)
126
- super
127
- rescue Exception => e
128
- payload[:exception] = [e.class.name, e.message]
129
- payload[:exception_object] = e
130
- raise e
131
- end
132
- ensure
133
- Instrumentation.finish_trace_cache(payload)
115
+ return super if Instrumentation.nested_read?
116
+
117
+ Instrumentation.trace(Ext::RESOURCE_CACHE_GET, dd_store_name, key: args[0]) { super }
134
118
  end
135
119
  end
136
120
 
137
121
  # Defines instrumentation for ActiveSupport cache reading of multiple keys
138
122
  module ReadMulti
123
+ include InstanceMethods
124
+
139
125
  def read_multi(*keys, &block)
140
- payload = {
141
- action: Ext::RESOURCE_CACHE_MGET,
142
- keys: keys,
143
- tracing_context: {}
144
- }
145
-
146
- begin
147
- # process and catch cache exceptions
148
- Instrumentation.start_trace_cache(payload)
149
- super
150
- rescue Exception => e
151
- payload[:exception] = [e.class.name, e.message]
152
- payload[:exception_object] = e
153
- raise e
154
- end
155
- ensure
156
- Instrumentation.finish_trace_cache_multi(payload)
126
+ return super if Instrumentation.nested_multiread?
127
+
128
+ Instrumentation.trace(Ext::RESOURCE_CACHE_MGET, dd_store_name, multi_key: keys) { super }
157
129
  end
158
130
  end
159
131
 
160
132
  # Defines instrumentation for ActiveSupport cache fetching
161
133
  module Fetch
134
+ include InstanceMethods
135
+
162
136
  def fetch(*args, &block)
163
- payload = {
164
- action: Ext::RESOURCE_CACHE_GET,
165
- key: args[0],
166
- tracing_context: {}
167
- }
168
-
169
- begin
170
- # process and catch cache exceptions
171
- Instrumentation.start_trace_cache(payload)
172
- super
173
- rescue Exception => e
174
- payload[:exception] = [e.class.name, e.message]
175
- payload[:exception_object] = e
176
- raise e
177
- end
178
- ensure
179
- Instrumentation.finish_trace_cache(payload)
137
+ return super if Instrumentation.nested_read?
138
+
139
+ Instrumentation.trace(Ext::RESOURCE_CACHE_GET, dd_store_name, key: args[0]) { super }
180
140
  end
181
141
  end
182
142
 
183
143
  # Defines instrumentation for ActiveSupport cache fetching of multiple keys
184
144
  module FetchMulti
145
+ include InstanceMethods
146
+
185
147
  def fetch_multi(*args, &block)
186
- # extract options hash
148
+ return super if Instrumentation.nested_multiread?
149
+
187
150
  keys = args[-1].instance_of?(Hash) ? args[0..-2] : args
188
- payload = {
189
- action: Ext::RESOURCE_CACHE_MGET,
190
- keys: keys,
191
- tracing_context: {}
192
- }
193
-
194
- begin
195
- # process and catch cache exceptions
196
- Instrumentation.start_trace_cache(payload)
197
- super
198
- rescue Exception => e
199
- payload[:exception] = [e.class.name, e.message]
200
- payload[:exception_object] = e
201
- raise e
202
- end
203
- ensure
204
- Instrumentation.finish_trace_cache_multi(payload)
151
+ Instrumentation.trace(Ext::RESOURCE_CACHE_MGET, dd_store_name, multi_key: keys) { super }
205
152
  end
206
153
  end
207
154
 
208
155
  # Defines instrumentation for ActiveSupport cache writing
209
156
  module Write
157
+ include InstanceMethods
158
+
210
159
  def write(*args, &block)
211
- payload = {
212
- action: Ext::RESOURCE_CACHE_SET,
213
- key: args[0],
214
- tracing_context: {}
215
- }
216
-
217
- begin
218
- # process and catch cache exceptions
219
- Instrumentation.start_trace_cache(payload)
220
- super
221
- rescue Exception => e
222
- payload[:exception] = [e.class.name, e.message]
223
- payload[:exception_object] = e
224
- raise e
225
- end
226
- ensure
227
- Instrumentation.finish_trace_cache(payload)
160
+ Instrumentation.trace(Ext::RESOURCE_CACHE_SET, dd_store_name, key: args[0]) { super }
228
161
  end
229
162
  end
230
163
 
231
164
  # Defines instrumentation for ActiveSupport cache writing of multiple keys
232
165
  module WriteMulti
166
+ include InstanceMethods
167
+
233
168
  def write_multi(hash, options = nil)
234
- payload = {
235
- action: Ext::RESOURCE_CACHE_MSET,
236
- keys: hash.keys,
237
- tracing_context: {}
238
- }
239
-
240
- begin
241
- # process and catch cache exceptions
242
- Instrumentation.start_trace_cache(payload)
243
- super
244
- rescue Exception => e
245
- payload[:exception] = [e.class.name, e.message]
246
- payload[:exception_object] = e
247
- raise e
248
- end
249
- ensure
250
- Instrumentation.finish_trace_cache_multi(payload)
169
+ Instrumentation.trace(Ext::RESOURCE_CACHE_MSET, dd_store_name, multi_key: hash.keys) { super }
251
170
  end
252
171
  end
253
172
 
254
173
  # Defines instrumentation for ActiveSupport cache deleting
255
174
  module Delete
175
+ include InstanceMethods
176
+
256
177
  def delete(*args, &block)
257
- payload = {
258
- action: Ext::RESOURCE_CACHE_DELETE,
259
- key: args[0],
260
- tracing_context: {}
261
- }
262
-
263
- begin
264
- # process and catch cache exceptions
265
- Instrumentation.start_trace_cache(payload)
266
- super
267
- rescue Exception => e
268
- payload[:exception] = [e.class.name, e.message]
269
- payload[:exception_object] = e
270
- raise e
271
- end
272
- ensure
273
- Instrumentation.finish_trace_cache(payload)
178
+ Instrumentation.trace(Ext::RESOURCE_CACHE_DELETE, dd_store_name, key: args[0]) { super }
274
179
  end
275
180
  end
276
181
  end
277
- # rubocop:enable Lint/RescueException
278
182
  end
279
183
  end
280
184
  end
@@ -28,6 +28,9 @@ module Datadog
28
28
  patch_cache_store_delete
29
29
  end
30
30
 
31
+ # This method is overwritten by
32
+ # `datadog/tracing/contrib/active_support/cache/redis.rb`
33
+ # with more complex behavior.
31
34
  def cache_store_class(meth)
32
35
  ::ActiveSupport::Cache::Store
33
36
  end
@@ -12,18 +12,21 @@ module Datadog
12
12
  # @public_api
13
13
  class Settings < Contrib::Configuration::Settings
14
14
  option :enabled do |o|
15
- o.default { env_to_bool(Ext::ENV_ENABLED, true) }
16
- o.lazy
15
+ o.type :bool
16
+ o.env Ext::ENV_ENABLED
17
+ o.default true
17
18
  end
18
19
 
19
20
  option :analytics_enabled do |o|
20
- o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
21
- o.lazy
21
+ o.type :bool
22
+ o.env Ext::ENV_ANALYTICS_ENABLED
23
+ o.default false
22
24
  end
23
25
 
24
26
  option :analytics_sample_rate do |o|
25
- o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
26
- o.lazy
27
+ o.type :float
28
+ o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
29
+ o.default 1.0
27
30
  end
28
31
 
29
32
  option :cache_service do |o|
@@ -33,7 +36,6 @@ module Datadog
33
36
  Ext::SERVICE_CACHE
34
37
  )
35
38
  end
36
- o.lazy
37
39
  end
38
40
  end
39
41
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module Datadog
2
4
  module Tracing
3
5
  module Contrib
@@ -5,23 +7,23 @@ module Datadog
5
7
  # ActiveSupport integration constants
6
8
  # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
7
9
  module Ext
8
- ENV_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ENABLED'.freeze
9
- ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_ENABLED'.freeze
10
- ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE'.freeze
10
+ ENV_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ENABLED'
11
+ ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_ENABLED'
12
+ ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE'
11
13
  QUANTIZE_CACHE_MAX_KEY_SIZE = 300
12
- RESOURCE_CACHE_DELETE = 'DELETE'.freeze
13
- RESOURCE_CACHE_GET = 'GET'.freeze
14
- RESOURCE_CACHE_MGET = 'MGET'.freeze
15
- RESOURCE_CACHE_SET = 'SET'.freeze
16
- RESOURCE_CACHE_MSET = 'MSET'.freeze
17
- SERVICE_CACHE = 'active_support-cache'.freeze
18
- SPAN_CACHE = 'rails.cache'.freeze
19
- SPAN_TYPE_CACHE = 'cache'.freeze
20
- TAG_CACHE_BACKEND = 'rails.cache.backend'.freeze
21
- TAG_CACHE_KEY = 'rails.cache.key'.freeze
22
- TAG_CACHE_KEY_MULTI = 'rails.cache.keys'.freeze
23
- TAG_COMPONENT = 'active_support'.freeze
24
- TAG_OPERATION_CACHE = 'cache'.freeze
14
+ RESOURCE_CACHE_DELETE = 'DELETE'
15
+ RESOURCE_CACHE_GET = 'GET'
16
+ RESOURCE_CACHE_MGET = 'MGET'
17
+ RESOURCE_CACHE_SET = 'SET'
18
+ RESOURCE_CACHE_MSET = 'MSET'
19
+ SERVICE_CACHE = 'active_support-cache'
20
+ SPAN_CACHE = 'rails.cache'
21
+ SPAN_TYPE_CACHE = 'cache'
22
+ TAG_CACHE_BACKEND = 'rails.cache.backend'
23
+ TAG_CACHE_KEY = 'rails.cache.key'
24
+ TAG_CACHE_KEY_MULTI = 'rails.cache.keys'
25
+ TAG_COMPONENT = 'active_support'
26
+ TAG_OPERATION_CACHE = 'cache'
25
27
  end
26
28
  end
27
29
  end
@@ -13,18 +13,21 @@ module Datadog
13
13
  # @public_api
14
14
  class Settings < Contrib::Configuration::Settings
15
15
  option :enabled do |o|
16
- o.default { env_to_bool(Ext::ENV_ENABLED, true) }
17
- o.lazy
16
+ o.type :bool
17
+ o.env Ext::ENV_ENABLED
18
+ o.default true
18
19
  end
19
20
 
20
21
  option :analytics_enabled do |o|
21
- o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
22
- o.lazy
22
+ o.type :bool
23
+ o.env Ext::ENV_ANALYTICS_ENABLED
24
+ o.default false
23
25
  end
24
26
 
25
27
  option :analytics_sample_rate do |o|
26
- o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
27
- o.lazy
28
+ o.type :float
29
+ o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
30
+ o.default 1.0
28
31
  end
29
32
 
30
33
  option :service_name do |o|
@@ -34,7 +37,11 @@ module Datadog
34
37
  Ext::DEFAULT_PEER_SERVICE_NAME
35
38
  )
36
39
  end
37
- o.lazy
40
+ end
41
+
42
+ option :peer_service do |o|
43
+ o.type :string, nilable: true
44
+ o.env Ext::ENV_PEER_SERVICE
38
45
  end
39
46
  end
40
47
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module Datadog
2
4
  module Tracing
3
5
  module Contrib
@@ -5,30 +7,41 @@ module Datadog
5
7
  # AWS integration constants
6
8
  # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
7
9
  module Ext
8
- ENV_ENABLED = 'DD_TRACE_AWS_ENABLED'.freeze
9
- ENV_SERVICE_NAME = 'DD_TRACE_AWS_SERVICE_NAME'.freeze
10
- ENV_ANALYTICS_ENABLED = 'DD_TRACE_AWS_ANALYTICS_ENABLED'.freeze
11
- ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE'.freeze
12
- DEFAULT_PEER_SERVICE_NAME = 'aws'.freeze
13
- SPAN_COMMAND = 'aws.command'.freeze
14
- TAG_AGENT = 'aws.agent'.freeze
15
- TAG_COMPONENT = 'aws'.freeze
16
- TAG_DEFAULT_AGENT = 'aws-sdk-ruby'.freeze
17
- TAG_HOST = 'host'.freeze
18
- TAG_OPERATION = 'aws.operation'.freeze
19
- TAG_OPERATION_COMMAND = 'command'.freeze
20
- TAG_PATH = 'path'.freeze
21
- TAG_AWS_REGION = 'aws.region'.freeze
22
- TAG_REGION = 'region'.freeze
23
- TAG_AWS_SERVICE = 'aws_service'.freeze
24
- TAG_AWS_ACCOUNT = 'aws_account'.freeze
25
- TAG_QUEUE_NAME = 'queuename'.freeze
26
- TAG_TOPIC_NAME = 'topicname'.freeze
27
- TAG_TABLE_NAME = 'tablename'.freeze
28
- TAG_STREAM_NAME = 'streamname'.freeze
29
- TAG_RULE_NAME = 'rulename'.freeze
30
- TAG_STATE_MACHINE_NAME = 'statemachinename'.freeze
31
- TAG_BUCKET_NAME = 'bucketname'.freeze
10
+ ENV_ENABLED = 'DD_TRACE_AWS_ENABLED'
11
+ ENV_SERVICE_NAME = 'DD_TRACE_AWS_SERVICE_NAME'
12
+ ENV_PEER_SERVICE = 'DD_TRACE_AWS_PEER_SERVICE'
13
+ ENV_ANALYTICS_ENABLED = 'DD_TRACE_AWS_ANALYTICS_ENABLED'
14
+ ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE'
15
+ DEFAULT_PEER_SERVICE_NAME = 'aws'
16
+ SPAN_COMMAND = 'aws.command'
17
+ TAG_AGENT = 'aws.agent'
18
+ TAG_COMPONENT = 'aws'
19
+ TAG_DEFAULT_AGENT = 'aws-sdk-ruby'
20
+ TAG_HOST = 'host'
21
+ TAG_OPERATION = 'aws.operation'
22
+ TAG_OPERATION_COMMAND = 'command'
23
+ TAG_PATH = 'path'
24
+ TAG_AWS_REGION = 'aws.region'
25
+ TAG_REGION = 'region'
26
+ TAG_AWS_SERVICE = 'aws_service'
27
+ TAG_AWS_ACCOUNT = 'aws_account'
28
+ TAG_QUEUE_NAME = 'queuename'
29
+ TAG_TOPIC_NAME = 'topicname'
30
+ TAG_TABLE_NAME = 'tablename'
31
+ TAG_STREAM_NAME = 'streamname'
32
+ TAG_RULE_NAME = 'rulename'
33
+ TAG_STATE_MACHINE_NAME = 'statemachinename'
34
+ TAG_BUCKET_NAME = 'bucketname'
35
+ PEER_SERVICE_SOURCES = Array[TAG_QUEUE_NAME,
36
+ TAG_TOPIC_NAME,
37
+ TAG_STREAM_NAME,
38
+ TAG_TABLE_NAME,
39
+ TAG_BUCKET_NAME,
40
+ TAG_RULE_NAME,
41
+ TAG_STATE_MACHINE_NAME,
42
+ Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
43
+ Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
44
+ Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
32
45
  end
33
46
  end
34
47
  end
@@ -28,6 +28,7 @@ module Datadog
28
28
 
29
29
  private
30
30
 
31
+ # rubocop:disable Metrics/AbcSize
31
32
  def annotate!(span, context)
32
33
  span.service = configuration[:service_name]
33
34
  span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
@@ -40,16 +41,23 @@ module Datadog
40
41
  handler.add_tags(span, params)
41
42
  end
42
43
 
44
+ if configuration[:peer_service]
45
+ span.set_tag(
46
+ Tracing::Metadata::Ext::TAG_PEER_SERVICE,
47
+ configuration[:peer_service]
48
+ )
49
+ end
50
+
51
+ # Tag original global service name if not used
52
+ if span.service != Datadog.configuration.service
53
+ span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
54
+ end
55
+
43
56
  span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
44
57
 
45
58
  span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
46
59
  span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
47
60
 
48
- # Tag as an external peer service
49
- if Contrib::SpanAttributeSchema.default_span_attribute_schema?
50
- span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
51
- end
52
-
53
61
  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, context.safely(:host))
54
62
 
55
63
  # Set analytics sample rate
@@ -66,7 +74,10 @@ module Datadog
66
74
  span.set_tag(Ext::TAG_HOST, context.safely(:host))
67
75
  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, context.safely(:http_method))
68
76
  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, context.safely(:status_code))
77
+
78
+ Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
69
79
  end
80
+ # rubocop:enable Metrics/AbcSize
70
81
 
71
82
  def configuration
72
83
  Datadog.configuration.tracing[:aws]
@@ -12,8 +12,9 @@ module Datadog
12
12
  # @public_api
13
13
  class Settings < Contrib::Configuration::Settings
14
14
  option :enabled do |o|
15
- o.default { env_to_bool(Ext::ENV_ENABLED, true) }
16
- o.lazy
15
+ o.type :bool
16
+ o.env Ext::ENV_ENABLED
17
+ o.default true
17
18
  end
18
19
  end
19
20
  end