ddtrace 1.0.0 → 1.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (646) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +453 -2
  3. data/LICENSE-3rdparty.csv +6 -2
  4. data/README.md +10 -5
  5. data/ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c +134 -0
  6. data/ext/ddtrace_profiling_loader/extconf.rb +74 -0
  7. data/ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md +79 -9
  8. data/ext/ddtrace_profiling_native_extension/clock_id.h +22 -1
  9. data/ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c +33 -10
  10. data/ext/ddtrace_profiling_native_extension/clock_id_noop.c +11 -2
  11. data/ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time.c +899 -0
  12. data/ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time.h +9 -0
  13. data/ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time_worker.c +776 -0
  14. data/ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.c +142 -0
  15. data/ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.h +14 -0
  16. data/ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.c +241 -0
  17. data/ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.h +3 -0
  18. data/ext/ddtrace_profiling_native_extension/collectors_stack.c +390 -0
  19. data/ext/ddtrace_profiling_native_extension/collectors_stack.h +18 -0
  20. data/ext/ddtrace_profiling_native_extension/extconf.rb +156 -114
  21. data/ext/ddtrace_profiling_native_extension/helpers.h +17 -0
  22. data/ext/ddtrace_profiling_native_extension/http_transport.c +354 -0
  23. data/ext/ddtrace_profiling_native_extension/libdatadog_helpers.h +18 -0
  24. data/ext/ddtrace_profiling_native_extension/native_extension_helpers.rb +319 -0
  25. data/ext/ddtrace_profiling_native_extension/private_vm_api_access.c +820 -9
  26. data/ext/ddtrace_profiling_native_extension/private_vm_api_access.h +42 -0
  27. data/ext/ddtrace_profiling_native_extension/profiling.c +230 -3
  28. data/ext/ddtrace_profiling_native_extension/ruby_helpers.c +110 -0
  29. data/ext/ddtrace_profiling_native_extension/ruby_helpers.h +89 -0
  30. data/ext/ddtrace_profiling_native_extension/setup_signal_handler.c +115 -0
  31. data/ext/ddtrace_profiling_native_extension/setup_signal_handler.h +11 -0
  32. data/ext/ddtrace_profiling_native_extension/stack_recorder.c +487 -0
  33. data/ext/ddtrace_profiling_native_extension/stack_recorder.h +39 -0
  34. data/ext/ddtrace_profiling_native_extension/time_helpers.c +17 -0
  35. data/ext/ddtrace_profiling_native_extension/time_helpers.h +10 -0
  36. data/lib/datadog/appsec/assets/blocked.html +98 -3
  37. data/lib/datadog/appsec/assets/blocked.json +1 -0
  38. data/lib/datadog/appsec/assets/blocked.text +5 -0
  39. data/lib/datadog/appsec/assets/waf_rules/recommended.json +1250 -300
  40. data/lib/datadog/appsec/assets/waf_rules/risky.json +78 -78
  41. data/lib/datadog/appsec/assets/waf_rules/strict.json +308 -73
  42. data/lib/datadog/appsec/assets.rb +3 -3
  43. data/lib/datadog/appsec/autoload.rb +6 -4
  44. data/lib/datadog/appsec/configuration/settings.rb +55 -19
  45. data/lib/datadog/appsec/configuration.rb +17 -3
  46. data/lib/datadog/appsec/contrib/auto_instrument.rb +1 -3
  47. data/lib/datadog/appsec/contrib/configuration/settings.rb +2 -2
  48. data/lib/datadog/appsec/contrib/integration.rb +1 -1
  49. data/lib/datadog/appsec/contrib/patcher.rb +1 -1
  50. data/lib/datadog/appsec/contrib/rack/configuration/settings.rb +3 -3
  51. data/lib/datadog/appsec/contrib/rack/ext.rb +1 -1
  52. data/lib/datadog/appsec/contrib/rack/gateway/watcher.rb +95 -47
  53. data/lib/datadog/appsec/contrib/rack/integration.rb +5 -4
  54. data/lib/datadog/appsec/contrib/rack/patcher.rb +2 -3
  55. data/lib/datadog/appsec/contrib/rack/reactive/request.rb +17 -21
  56. data/lib/datadog/appsec/contrib/rack/reactive/request_body.rb +64 -0
  57. data/lib/datadog/appsec/contrib/rack/reactive/response.rb +13 -13
  58. data/lib/datadog/appsec/contrib/rack/request.rb +27 -1
  59. data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +41 -0
  60. data/lib/datadog/appsec/contrib/rack/request_middleware.rb +92 -10
  61. data/lib/datadog/appsec/contrib/rack/response.rb +1 -1
  62. data/lib/datadog/appsec/contrib/rails/configuration/settings.rb +3 -3
  63. data/lib/datadog/appsec/contrib/rails/ext.rb +1 -1
  64. data/lib/datadog/appsec/contrib/rails/framework.rb +1 -1
  65. data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb +82 -0
  66. data/lib/datadog/appsec/contrib/rails/integration.rb +5 -5
  67. data/lib/datadog/appsec/contrib/rails/patcher.rb +42 -8
  68. data/lib/datadog/appsec/contrib/rails/reactive/action.rb +68 -0
  69. data/lib/datadog/appsec/contrib/rails/request.rb +36 -0
  70. data/lib/datadog/appsec/contrib/rails/request_middleware.rb +1 -1
  71. data/lib/datadog/appsec/contrib/sinatra/configuration/settings.rb +3 -3
  72. data/lib/datadog/appsec/contrib/sinatra/ext.rb +2 -1
  73. data/lib/datadog/appsec/contrib/sinatra/framework.rb +1 -1
  74. data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb +126 -0
  75. data/lib/datadog/appsec/contrib/sinatra/integration.rb +4 -4
  76. data/lib/datadog/appsec/contrib/sinatra/patcher.rb +84 -10
  77. data/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb +63 -0
  78. data/lib/datadog/appsec/contrib/sinatra/request_middleware.rb +1 -1
  79. data/lib/datadog/appsec/event.rb +38 -27
  80. data/lib/datadog/appsec/extensions.rb +43 -26
  81. data/lib/datadog/appsec/instrumentation/gateway.rb +17 -3
  82. data/lib/datadog/appsec/processor.rb +86 -13
  83. data/lib/datadog/appsec/rate_limiter.rb +6 -1
  84. data/lib/datadog/appsec/reactive/address_hash.rb +1 -1
  85. data/lib/datadog/appsec/reactive/engine.rb +3 -3
  86. data/lib/datadog/appsec/reactive/operation.rb +5 -6
  87. data/lib/datadog/appsec/reactive/subscriber.rb +1 -1
  88. data/lib/datadog/appsec/response.rb +63 -0
  89. data/lib/datadog/appsec/utils/http/media_range.rb +201 -0
  90. data/lib/datadog/appsec/utils/http/media_type.rb +87 -0
  91. data/lib/datadog/appsec/utils/http.rb +9 -0
  92. data/lib/datadog/appsec/utils.rb +7 -0
  93. data/lib/datadog/appsec.rb +6 -6
  94. data/lib/datadog/ci/configuration/components.rb +1 -1
  95. data/lib/datadog/ci/configuration/settings.rb +1 -1
  96. data/lib/datadog/ci/contrib/cucumber/configuration/settings.rb +2 -2
  97. data/lib/datadog/ci/contrib/cucumber/formatter.rb +5 -5
  98. data/lib/datadog/ci/contrib/cucumber/instrumentation.rb +1 -1
  99. data/lib/datadog/ci/contrib/cucumber/integration.rb +4 -4
  100. data/lib/datadog/ci/contrib/cucumber/patcher.rb +2 -2
  101. data/lib/datadog/ci/contrib/rspec/configuration/settings.rb +2 -2
  102. data/lib/datadog/ci/contrib/rspec/example.rb +5 -5
  103. data/lib/datadog/ci/contrib/rspec/integration.rb +4 -4
  104. data/lib/datadog/ci/contrib/rspec/patcher.rb +2 -2
  105. data/lib/datadog/ci/ext/environment.rb +99 -27
  106. data/lib/datadog/ci/extensions.rb +4 -4
  107. data/lib/datadog/ci/flush.rb +2 -2
  108. data/lib/datadog/ci/test.rb +3 -3
  109. data/lib/datadog/ci.rb +6 -6
  110. data/lib/datadog/core/buffer/cruby.rb +1 -1
  111. data/lib/datadog/core/buffer/thread_safe.rb +1 -1
  112. data/lib/datadog/core/configuration/agent_settings_resolver.rb +9 -12
  113. data/lib/datadog/core/configuration/base.rb +14 -2
  114. data/lib/datadog/core/configuration/components.rb +123 -54
  115. data/lib/datadog/core/configuration/ext.rb +26 -0
  116. data/lib/datadog/core/configuration/option_definition.rb +12 -3
  117. data/lib/datadog/core/configuration/option_definition_set.rb +1 -1
  118. data/lib/datadog/core/configuration/options.rb +3 -3
  119. data/lib/datadog/core/configuration/settings.rb +79 -251
  120. data/lib/datadog/core/configuration.rb +16 -11
  121. data/lib/datadog/core/diagnostics/environment_logger.rb +10 -5
  122. data/lib/datadog/core/diagnostics/health.rb +5 -23
  123. data/lib/datadog/core/environment/cgroup.rb +4 -2
  124. data/lib/datadog/core/environment/container.rb +3 -2
  125. data/lib/datadog/core/environment/ext.rb +1 -1
  126. data/lib/datadog/core/environment/identity.rb +2 -2
  127. data/lib/datadog/core/environment/platform.rb +40 -0
  128. data/lib/datadog/core/environment/socket.rb +1 -1
  129. data/lib/datadog/core/environment/variable_helpers.rb +83 -11
  130. data/lib/datadog/core/error.rb +1 -1
  131. data/lib/datadog/core/extensions.rb +1 -1
  132. data/lib/datadog/core/header_collection.rb +41 -0
  133. data/lib/datadog/core/logging/ext.rb +11 -0
  134. data/lib/datadog/core/metrics/client.rb +25 -14
  135. data/lib/datadog/core/metrics/ext.rb +0 -2
  136. data/lib/datadog/core/metrics/options.rb +3 -3
  137. data/lib/datadog/core/runtime/ext.rb +1 -1
  138. data/lib/datadog/core/runtime/metrics.rb +7 -7
  139. data/lib/datadog/core/telemetry/client.rb +79 -0
  140. data/lib/datadog/core/telemetry/collector.rb +233 -0
  141. data/lib/datadog/core/telemetry/emitter.rb +48 -0
  142. data/lib/datadog/core/telemetry/event.rb +71 -0
  143. data/lib/datadog/core/telemetry/ext.rb +11 -0
  144. data/lib/datadog/core/telemetry/heartbeat.rb +37 -0
  145. data/lib/datadog/core/telemetry/http/adapters/net.rb +113 -0
  146. data/lib/datadog/core/telemetry/http/env.rb +20 -0
  147. data/lib/datadog/core/telemetry/http/ext.rb +20 -0
  148. data/lib/datadog/core/telemetry/http/response.rb +68 -0
  149. data/lib/datadog/core/telemetry/http/transport.rb +53 -0
  150. data/lib/datadog/core/telemetry/v1/app_event.rb +52 -0
  151. data/lib/datadog/core/telemetry/v1/application.rb +86 -0
  152. data/lib/datadog/core/telemetry/v1/configuration.rb +25 -0
  153. data/lib/datadog/core/telemetry/v1/dependency.rb +36 -0
  154. data/lib/datadog/core/telemetry/v1/host.rb +51 -0
  155. data/lib/datadog/core/telemetry/v1/integration.rb +58 -0
  156. data/lib/datadog/core/telemetry/v1/product.rb +28 -0
  157. data/lib/datadog/core/telemetry/v1/telemetry_request.rb +100 -0
  158. data/lib/datadog/core/utils/compression.rb +5 -1
  159. data/lib/datadog/core/utils/object_set.rb +1 -1
  160. data/lib/datadog/core/utils/sequence.rb +5 -0
  161. data/lib/datadog/core/utils/string_table.rb +1 -1
  162. data/lib/datadog/core/utils/time.rb +3 -3
  163. data/lib/datadog/core/utils.rb +1 -22
  164. data/lib/datadog/core/vendor/multipart-post/multipart/post/multipartable.rb +2 -2
  165. data/lib/datadog/core/vendor/multipart-post/net/http/post/multipart.rb +3 -3
  166. data/lib/datadog/core/workers/async.rb +4 -4
  167. data/lib/datadog/core/workers/polling.rb +2 -2
  168. data/lib/datadog/core/workers/runtime_metrics.rb +4 -7
  169. data/lib/datadog/core.rb +28 -56
  170. data/lib/datadog/kit/appsec/events.rb +75 -0
  171. data/lib/datadog/kit/enable_core_dumps.rb +51 -0
  172. data/lib/datadog/kit/identity.rb +64 -0
  173. data/lib/datadog/kit.rb +11 -0
  174. data/lib/datadog/opentelemetry/api/context.rb +187 -0
  175. data/lib/datadog/opentelemetry/api/trace/span.rb +15 -0
  176. data/lib/datadog/opentelemetry/sdk/configurator.rb +38 -0
  177. data/lib/datadog/opentelemetry/sdk/id_generator.rb +27 -0
  178. data/lib/datadog/opentelemetry/sdk/propagator.rb +91 -0
  179. data/lib/datadog/opentelemetry/sdk/span_processor.rb +92 -0
  180. data/lib/datadog/opentelemetry.rb +48 -0
  181. data/lib/datadog/opentracer/distributed_headers.rb +7 -9
  182. data/lib/datadog/opentracer/rack_propagator.rb +10 -9
  183. data/lib/datadog/opentracer/span.rb +1 -1
  184. data/lib/datadog/opentracer/text_map_propagator.rb +13 -12
  185. data/lib/datadog/opentracer/thread_local_scope_manager.rb +26 -3
  186. data/lib/datadog/opentracer/tracer.rb +23 -23
  187. data/lib/datadog/opentracer.rb +16 -16
  188. data/lib/datadog/profiling/buffer.rb +3 -3
  189. data/lib/datadog/profiling/collectors/code_provenance.rb +1 -0
  190. data/lib/datadog/profiling/collectors/cpu_and_wall_time.rb +43 -0
  191. data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +91 -0
  192. data/lib/datadog/profiling/collectors/dynamic_sampling_rate.rb +14 -0
  193. data/lib/datadog/profiling/collectors/idle_sampling_helper.rb +68 -0
  194. data/lib/datadog/profiling/collectors/old_stack.rb +305 -0
  195. data/lib/datadog/profiling/collectors/stack.rb +4 -288
  196. data/lib/datadog/profiling/encoding/profile.rb +8 -13
  197. data/lib/datadog/profiling/events/stack.rb +1 -1
  198. data/lib/datadog/profiling/exporter.rb +69 -9
  199. data/lib/datadog/profiling/ext/forking.rb +41 -42
  200. data/lib/datadog/profiling/ext.rb +4 -16
  201. data/lib/datadog/profiling/flush.rb +25 -56
  202. data/lib/datadog/profiling/http_transport.rb +132 -0
  203. data/lib/datadog/profiling/load_native_extension.rb +22 -0
  204. data/lib/datadog/profiling/old_recorder.rb +109 -0
  205. data/lib/datadog/profiling/pprof/builder.rb +4 -4
  206. data/lib/datadog/profiling/pprof/converter.rb +1 -1
  207. data/lib/datadog/profiling/pprof/message_set.rb +1 -1
  208. data/lib/datadog/profiling/pprof/stack_sample.rb +4 -4
  209. data/lib/datadog/profiling/pprof/string_table.rb +1 -1
  210. data/lib/datadog/profiling/pprof/template.rb +5 -5
  211. data/lib/datadog/profiling/preload.rb +1 -1
  212. data/lib/datadog/profiling/profiler.rb +7 -0
  213. data/lib/datadog/profiling/scheduler.rb +29 -50
  214. data/lib/datadog/profiling/stack_recorder.rb +79 -0
  215. data/lib/datadog/profiling/tag_builder.rb +53 -0
  216. data/lib/datadog/profiling/tasks/exec.rb +2 -2
  217. data/lib/datadog/profiling/tasks/setup.rb +8 -13
  218. data/lib/datadog/profiling/trace_identifiers/ddtrace.rb +2 -2
  219. data/lib/datadog/profiling/trace_identifiers/helper.rb +1 -1
  220. data/lib/datadog/profiling.rb +49 -44
  221. data/lib/datadog/tracing/analytics.rb +1 -1
  222. data/lib/datadog/tracing/buffer.rb +14 -8
  223. data/lib/datadog/tracing/client_ip.rb +164 -0
  224. data/lib/datadog/tracing/configuration/ext.rb +47 -4
  225. data/lib/datadog/tracing/configuration/settings.rb +433 -0
  226. data/lib/datadog/tracing/context.rb +1 -1
  227. data/lib/datadog/tracing/context_provider.rb +18 -2
  228. data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb +2 -2
  229. data/lib/datadog/tracing/contrib/action_cable/event.rb +4 -5
  230. data/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb +4 -4
  231. data/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb +3 -3
  232. data/lib/datadog/tracing/contrib/action_cable/events/transmit.rb +4 -4
  233. data/lib/datadog/tracing/contrib/action_cable/events.rb +4 -4
  234. data/lib/datadog/tracing/contrib/action_cable/instrumentation.rb +3 -4
  235. data/lib/datadog/tracing/contrib/action_cable/integration.rb +4 -4
  236. data/lib/datadog/tracing/contrib/action_cable/patcher.rb +4 -4
  237. data/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb +2 -2
  238. data/lib/datadog/tracing/contrib/action_mailer/event.rb +3 -3
  239. data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb +3 -3
  240. data/lib/datadog/tracing/contrib/action_mailer/events/process.rb +3 -3
  241. data/lib/datadog/tracing/contrib/action_mailer/events.rb +2 -2
  242. data/lib/datadog/tracing/contrib/action_mailer/integration.rb +4 -4
  243. data/lib/datadog/tracing/contrib/action_mailer/patcher.rb +3 -3
  244. data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb +10 -6
  245. data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb +2 -2
  246. data/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb +2 -2
  247. data/lib/datadog/tracing/contrib/action_pack/integration.rb +4 -4
  248. data/lib/datadog/tracing/contrib/action_pack/patcher.rb +2 -2
  249. data/lib/datadog/tracing/contrib/action_pack/utils.rb +1 -1
  250. data/lib/datadog/tracing/contrib/action_view/configuration/settings.rb +2 -2
  251. data/lib/datadog/tracing/contrib/action_view/event.rb +1 -1
  252. data/lib/datadog/tracing/contrib/action_view/events/render_partial.rb +5 -5
  253. data/lib/datadog/tracing/contrib/action_view/events/render_template.rb +5 -5
  254. data/lib/datadog/tracing/contrib/action_view/events.rb +2 -2
  255. data/lib/datadog/tracing/contrib/action_view/instrumentation/partial_renderer.rb +2 -2
  256. data/lib/datadog/tracing/contrib/action_view/instrumentation/template_renderer.rb +2 -2
  257. data/lib/datadog/tracing/contrib/action_view/integration.rb +4 -4
  258. data/lib/datadog/tracing/contrib/action_view/patcher.rb +7 -8
  259. data/lib/datadog/tracing/contrib/action_view/utils.rb +1 -1
  260. data/lib/datadog/tracing/contrib/active_job/configuration/settings.rb +3 -3
  261. data/lib/datadog/tracing/contrib/active_job/event.rb +3 -3
  262. data/lib/datadog/tracing/contrib/active_job/events/discard.rb +4 -4
  263. data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb +4 -4
  264. data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb +4 -4
  265. data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb +4 -4
  266. data/lib/datadog/tracing/contrib/active_job/events/perform.rb +4 -4
  267. data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb +4 -4
  268. data/lib/datadog/tracing/contrib/active_job/events.rb +6 -6
  269. data/lib/datadog/tracing/contrib/active_job/integration.rb +4 -4
  270. data/lib/datadog/tracing/contrib/active_job/log_injection.rb +0 -2
  271. data/lib/datadog/tracing/contrib/active_job/patcher.rb +4 -4
  272. data/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb +2 -2
  273. data/lib/datadog/tracing/contrib/active_model_serializers/event.rb +4 -5
  274. data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb +3 -3
  275. data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb +2 -2
  276. data/lib/datadog/tracing/contrib/active_model_serializers/events.rb +2 -2
  277. data/lib/datadog/tracing/contrib/active_model_serializers/integration.rb +3 -3
  278. data/lib/datadog/tracing/contrib/active_model_serializers/patcher.rb +3 -4
  279. data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb +4 -4
  280. data/lib/datadog/tracing/contrib/active_record/configuration/settings.rb +3 -3
  281. data/lib/datadog/tracing/contrib/active_record/event.rb +1 -1
  282. data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb +4 -4
  283. data/lib/datadog/tracing/contrib/active_record/events/sql.rb +6 -6
  284. data/lib/datadog/tracing/contrib/active_record/events.rb +2 -2
  285. data/lib/datadog/tracing/contrib/active_record/integration.rb +6 -6
  286. data/lib/datadog/tracing/contrib/active_record/patcher.rb +2 -2
  287. data/lib/datadog/tracing/contrib/active_record/utils.rb +3 -3
  288. data/lib/datadog/tracing/contrib/active_record/vendor/connection_specification.rb +1 -1
  289. data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +19 -9
  290. data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +2 -2
  291. data/lib/datadog/tracing/contrib/active_support/cache/redis.rb +1 -1
  292. data/lib/datadog/tracing/contrib/active_support/configuration/settings.rb +2 -2
  293. data/lib/datadog/tracing/contrib/active_support/integration.rb +5 -5
  294. data/lib/datadog/tracing/contrib/active_support/notifications/event.rb +1 -1
  295. data/lib/datadog/tracing/contrib/active_support/notifications/subscriber.rb +1 -1
  296. data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb +4 -2
  297. data/lib/datadog/tracing/contrib/active_support/patcher.rb +2 -2
  298. data/lib/datadog/tracing/contrib/analytics.rb +1 -1
  299. data/lib/datadog/tracing/contrib/auto_instrument.rb +4 -4
  300. data/lib/datadog/tracing/contrib/aws/configuration/settings.rb +6 -3
  301. data/lib/datadog/tracing/contrib/aws/ext.rb +1 -0
  302. data/lib/datadog/tracing/contrib/aws/instrumentation.rb +5 -4
  303. data/lib/datadog/tracing/contrib/aws/integration.rb +3 -3
  304. data/lib/datadog/tracing/contrib/aws/patcher.rb +5 -5
  305. data/lib/datadog/tracing/contrib/aws/services.rb +0 -2
  306. data/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb +2 -2
  307. data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb +10 -3
  308. data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb +1 -1
  309. data/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb +3 -3
  310. data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +2 -2
  311. data/lib/datadog/tracing/contrib/configurable.rb +2 -2
  312. data/lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb +1 -1
  313. data/lib/datadog/tracing/contrib/configuration/settings.rb +2 -2
  314. data/lib/datadog/tracing/contrib/dalli/configuration/settings.rb +6 -3
  315. data/lib/datadog/tracing/contrib/dalli/ext.rb +2 -0
  316. data/lib/datadog/tracing/contrib/dalli/instrumentation.rb +8 -5
  317. data/lib/datadog/tracing/contrib/dalli/integration.rb +3 -3
  318. data/lib/datadog/tracing/contrib/dalli/patcher.rb +3 -4
  319. data/lib/datadog/tracing/contrib/dalli/quantize.rb +1 -1
  320. data/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb +3 -3
  321. data/lib/datadog/tracing/contrib/delayed_job/ext.rb +2 -0
  322. data/lib/datadog/tracing/contrib/delayed_job/integration.rb +3 -3
  323. data/lib/datadog/tracing/contrib/delayed_job/patcher.rb +8 -3
  324. data/lib/datadog/tracing/contrib/delayed_job/plugin.rb +7 -4
  325. data/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb +32 -0
  326. data/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb +7 -3
  327. data/lib/datadog/tracing/contrib/elasticsearch/ext.rb +3 -0
  328. data/lib/datadog/tracing/contrib/elasticsearch/integration.rb +12 -6
  329. data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +47 -9
  330. data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb +1 -1
  331. data/lib/datadog/tracing/contrib/ethon/configuration/settings.rb +8 -3
  332. data/lib/datadog/tracing/contrib/ethon/easy_patch.rb +6 -7
  333. data/lib/datadog/tracing/contrib/ethon/ext.rb +1 -0
  334. data/lib/datadog/tracing/contrib/ethon/integration.rb +4 -4
  335. data/lib/datadog/tracing/contrib/ethon/multi_patch.rb +5 -4
  336. data/lib/datadog/tracing/contrib/ethon/patcher.rb +3 -4
  337. data/lib/datadog/tracing/contrib/excon/configuration/settings.rb +7 -3
  338. data/lib/datadog/tracing/contrib/excon/ext.rb +1 -0
  339. data/lib/datadog/tracing/contrib/excon/integration.rb +4 -4
  340. data/lib/datadog/tracing/contrib/excon/middleware.rb +8 -7
  341. data/lib/datadog/tracing/contrib/excon/patcher.rb +2 -2
  342. data/lib/datadog/tracing/contrib/ext.rb +25 -0
  343. data/lib/datadog/tracing/contrib/extensions.rb +5 -5
  344. data/lib/datadog/tracing/contrib/faraday/configuration/settings.rb +7 -3
  345. data/lib/datadog/tracing/contrib/faraday/ext.rb +1 -0
  346. data/lib/datadog/tracing/contrib/faraday/integration.rb +4 -4
  347. data/lib/datadog/tracing/contrib/faraday/middleware.rb +8 -8
  348. data/lib/datadog/tracing/contrib/faraday/patcher.rb +5 -6
  349. data/lib/datadog/tracing/contrib/grape/configuration/settings.rb +3 -3
  350. data/lib/datadog/tracing/contrib/grape/endpoint.rb +4 -7
  351. data/lib/datadog/tracing/contrib/grape/integration.rb +3 -3
  352. data/lib/datadog/tracing/contrib/grape/patcher.rb +4 -5
  353. data/lib/datadog/tracing/contrib/graphql/configuration/settings.rb +3 -3
  354. data/lib/datadog/tracing/contrib/graphql/integration.rb +3 -3
  355. data/lib/datadog/tracing/contrib/graphql/patcher.rb +2 -4
  356. data/lib/datadog/tracing/contrib/grpc/configuration/settings.rb +10 -4
  357. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb +20 -5
  358. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb +17 -17
  359. data/lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb +7 -4
  360. data/lib/datadog/tracing/contrib/grpc/distributed/fetcher.rb +27 -0
  361. data/lib/datadog/tracing/contrib/grpc/distributed/propagation.rb +43 -0
  362. data/lib/datadog/tracing/contrib/grpc/ext.rb +4 -0
  363. data/lib/datadog/tracing/contrib/grpc/integration.rb +3 -3
  364. data/lib/datadog/tracing/contrib/grpc/patcher.rb +3 -6
  365. data/lib/datadog/tracing/contrib/hanami/action_tracer.rb +47 -0
  366. data/lib/datadog/tracing/contrib/hanami/configuration/settings.rb +22 -0
  367. data/lib/datadog/tracing/contrib/hanami/ext.rb +24 -0
  368. data/lib/datadog/tracing/contrib/hanami/integration.rb +44 -0
  369. data/lib/datadog/tracing/contrib/hanami/patcher.rb +33 -0
  370. data/lib/datadog/tracing/contrib/hanami/plugin.rb +23 -0
  371. data/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb +41 -0
  372. data/lib/datadog/tracing/contrib/hanami/router_tracing.rb +44 -0
  373. data/lib/datadog/tracing/contrib/http/circuit_breaker.rb +1 -2
  374. data/lib/datadog/tracing/contrib/http/configuration/settings.rb +13 -3
  375. data/lib/datadog/tracing/contrib/http/distributed/fetcher.rb +39 -0
  376. data/lib/datadog/tracing/contrib/http/distributed/propagation.rb +38 -0
  377. data/lib/datadog/tracing/contrib/http/ext.rb +2 -0
  378. data/lib/datadog/tracing/contrib/http/instrumentation.rb +8 -10
  379. data/lib/datadog/tracing/contrib/http/integration.rb +6 -6
  380. data/lib/datadog/tracing/contrib/http/patcher.rb +3 -3
  381. data/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb +13 -3
  382. data/lib/datadog/tracing/contrib/httpclient/ext.rb +2 -0
  383. data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb +9 -9
  384. data/lib/datadog/tracing/contrib/httpclient/integration.rb +4 -4
  385. data/lib/datadog/tracing/contrib/httpclient/patcher.rb +3 -3
  386. data/lib/datadog/tracing/contrib/httprb/configuration/settings.rb +13 -3
  387. data/lib/datadog/tracing/contrib/httprb/ext.rb +2 -0
  388. data/lib/datadog/tracing/contrib/httprb/instrumentation.rb +9 -9
  389. data/lib/datadog/tracing/contrib/httprb/integration.rb +4 -4
  390. data/lib/datadog/tracing/contrib/httprb/patcher.rb +3 -3
  391. data/lib/datadog/tracing/contrib/integration.rb +3 -3
  392. data/lib/datadog/tracing/contrib/kafka/configuration/settings.rb +2 -2
  393. data/lib/datadog/tracing/contrib/kafka/consumer_event.rb +1 -0
  394. data/lib/datadog/tracing/contrib/kafka/event.rb +3 -3
  395. data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb +2 -2
  396. data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb +3 -3
  397. data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb +3 -3
  398. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb +4 -4
  399. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb +4 -4
  400. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb +4 -4
  401. data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb +4 -4
  402. data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb +3 -2
  403. data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb +3 -2
  404. data/lib/datadog/tracing/contrib/kafka/events.rb +9 -9
  405. data/lib/datadog/tracing/contrib/kafka/integration.rb +3 -3
  406. data/lib/datadog/tracing/contrib/kafka/patcher.rb +3 -4
  407. data/lib/datadog/tracing/contrib/lograge/configuration/settings.rb +2 -2
  408. data/lib/datadog/tracing/contrib/lograge/instrumentation.rb +2 -2
  409. data/lib/datadog/tracing/contrib/lograge/integration.rb +3 -3
  410. data/lib/datadog/tracing/contrib/lograge/patcher.rb +2 -2
  411. data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +7 -3
  412. data/lib/datadog/tracing/contrib/mongodb/ext.rb +8 -0
  413. data/lib/datadog/tracing/contrib/mongodb/instrumentation.rb +3 -3
  414. data/lib/datadog/tracing/contrib/mongodb/integration.rb +4 -4
  415. data/lib/datadog/tracing/contrib/mongodb/parsers.rb +1 -1
  416. data/lib/datadog/tracing/contrib/mongodb/patcher.rb +3 -3
  417. data/lib/datadog/tracing/contrib/mongodb/subscribers.rb +10 -4
  418. data/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb +18 -3
  419. data/lib/datadog/tracing/contrib/mysql2/ext.rb +2 -0
  420. data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb +20 -5
  421. data/lib/datadog/tracing/contrib/mysql2/integration.rb +3 -3
  422. data/lib/datadog/tracing/contrib/mysql2/patcher.rb +2 -2
  423. data/lib/datadog/tracing/contrib/patcher.rb +16 -4
  424. data/lib/datadog/tracing/contrib/pg/configuration/settings.rb +50 -0
  425. data/lib/datadog/tracing/contrib/pg/ext.rb +33 -0
  426. data/lib/datadog/tracing/contrib/pg/instrumentation.rb +168 -0
  427. data/lib/datadog/tracing/contrib/pg/integration.rb +43 -0
  428. data/lib/datadog/tracing/contrib/pg/patcher.rb +31 -0
  429. data/lib/datadog/tracing/contrib/presto/configuration/settings.rb +6 -3
  430. data/lib/datadog/tracing/contrib/presto/ext.rb +1 -0
  431. data/lib/datadog/tracing/contrib/presto/instrumentation.rb +2 -3
  432. data/lib/datadog/tracing/contrib/presto/integration.rb +3 -3
  433. data/lib/datadog/tracing/contrib/presto/patcher.rb +4 -4
  434. data/lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb +43 -0
  435. data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb +33 -0
  436. data/lib/datadog/tracing/contrib/propagation/sql_comment/mode.rb +28 -0
  437. data/lib/datadog/tracing/contrib/propagation/sql_comment.rb +47 -0
  438. data/lib/datadog/tracing/contrib/qless/configuration/settings.rb +2 -2
  439. data/lib/datadog/tracing/contrib/qless/integration.rb +3 -3
  440. data/lib/datadog/tracing/contrib/qless/patcher.rb +1 -3
  441. data/lib/datadog/tracing/contrib/qless/qless_job.rb +2 -3
  442. data/lib/datadog/tracing/contrib/qless/tracer_cleaner.rb +0 -2
  443. data/lib/datadog/tracing/contrib/que/configuration/settings.rb +3 -3
  444. data/lib/datadog/tracing/contrib/que/integration.rb +4 -4
  445. data/lib/datadog/tracing/contrib/que/patcher.rb +1 -2
  446. data/lib/datadog/tracing/contrib/que/tracer.rb +3 -1
  447. data/lib/datadog/tracing/contrib/racecar/configuration/settings.rb +2 -2
  448. data/lib/datadog/tracing/contrib/racecar/event.rb +4 -5
  449. data/lib/datadog/tracing/contrib/racecar/events/batch.rb +6 -3
  450. data/lib/datadog/tracing/contrib/racecar/events/consume.rb +2 -2
  451. data/lib/datadog/tracing/contrib/racecar/events/message.rb +6 -3
  452. data/lib/datadog/tracing/contrib/racecar/events.rb +3 -3
  453. data/lib/datadog/tracing/contrib/racecar/integration.rb +3 -3
  454. data/lib/datadog/tracing/contrib/racecar/patcher.rb +3 -4
  455. data/lib/datadog/tracing/contrib/rack/configuration/settings.rb +2 -2
  456. data/lib/datadog/tracing/contrib/rack/header_collection.rb +35 -0
  457. data/lib/datadog/tracing/contrib/rack/integration.rb +4 -4
  458. data/lib/datadog/tracing/contrib/rack/middlewares.rb +129 -61
  459. data/lib/datadog/tracing/contrib/rack/patcher.rb +12 -2
  460. data/lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb +1 -1
  461. data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +4 -1
  462. data/lib/datadog/tracing/contrib/rails/framework.rb +18 -22
  463. data/lib/datadog/tracing/contrib/rails/integration.rb +4 -4
  464. data/lib/datadog/tracing/contrib/rails/log_injection.rb +3 -18
  465. data/lib/datadog/tracing/contrib/rails/middlewares.rb +1 -2
  466. data/lib/datadog/tracing/contrib/rails/patcher.rb +7 -8
  467. data/lib/datadog/tracing/contrib/rails/railtie.rb +3 -3
  468. data/lib/datadog/tracing/contrib/rails/utils.rb +1 -1
  469. data/lib/datadog/tracing/contrib/rake/configuration/settings.rb +17 -2
  470. data/lib/datadog/tracing/contrib/rake/instrumentation.rb +14 -9
  471. data/lib/datadog/tracing/contrib/rake/integration.rb +3 -3
  472. data/lib/datadog/tracing/contrib/rake/patcher.rb +3 -5
  473. data/lib/datadog/tracing/contrib/redis/configuration/resolver.rb +1 -1
  474. data/lib/datadog/tracing/contrib/redis/configuration/settings.rb +6 -3
  475. data/lib/datadog/tracing/contrib/redis/ext.rb +3 -0
  476. data/lib/datadog/tracing/contrib/redis/instrumentation.rb +36 -26
  477. data/lib/datadog/tracing/contrib/redis/integration.rb +37 -4
  478. data/lib/datadog/tracing/contrib/redis/patcher.rb +57 -14
  479. data/lib/datadog/tracing/contrib/redis/quantize.rb +12 -9
  480. data/lib/datadog/tracing/contrib/redis/tags.rb +12 -10
  481. data/lib/datadog/tracing/contrib/redis/trace_middleware.rb +72 -0
  482. data/lib/datadog/tracing/contrib/resque/configuration/settings.rb +3 -3
  483. data/lib/datadog/tracing/contrib/resque/integration.rb +3 -3
  484. data/lib/datadog/tracing/contrib/resque/patcher.rb +2 -3
  485. data/lib/datadog/tracing/contrib/resque/resque_job.rb +5 -4
  486. data/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb +9 -3
  487. data/lib/datadog/tracing/contrib/rest_client/ext.rb +1 -0
  488. data/lib/datadog/tracing/contrib/rest_client/integration.rb +3 -3
  489. data/lib/datadog/tracing/contrib/rest_client/patcher.rb +2 -3
  490. data/lib/datadog/tracing/contrib/rest_client/request_patch.rb +7 -6
  491. data/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb +2 -2
  492. data/lib/datadog/tracing/contrib/semantic_logger/instrumentation.rb +2 -2
  493. data/lib/datadog/tracing/contrib/semantic_logger/integration.rb +3 -3
  494. data/lib/datadog/tracing/contrib/semantic_logger/patcher.rb +2 -2
  495. data/lib/datadog/tracing/contrib/sequel/configuration/settings.rb +2 -2
  496. data/lib/datadog/tracing/contrib/sequel/database.rb +4 -5
  497. data/lib/datadog/tracing/contrib/sequel/dataset.rb +4 -5
  498. data/lib/datadog/tracing/contrib/sequel/integration.rb +3 -3
  499. data/lib/datadog/tracing/contrib/sequel/patcher.rb +3 -3
  500. data/lib/datadog/tracing/contrib/sequel/utils.rb +2 -2
  501. data/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb +3 -3
  502. data/lib/datadog/tracing/contrib/shoryuken/integration.rb +4 -4
  503. data/lib/datadog/tracing/contrib/shoryuken/patcher.rb +1 -1
  504. data/lib/datadog/tracing/contrib/shoryuken/tracer.rb +3 -1
  505. data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb +9 -5
  506. data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb +4 -3
  507. data/lib/datadog/tracing/contrib/sidekiq/ext.rb +6 -0
  508. data/lib/datadog/tracing/contrib/sidekiq/integration.rb +3 -3
  509. data/lib/datadog/tracing/contrib/sidekiq/patcher.rb +14 -7
  510. data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat.rb +19 -1
  511. data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/{scheduled_push.rb → redis_info.rb} +5 -6
  512. data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller.rb +53 -0
  513. data/lib/datadog/tracing/contrib/sidekiq/server_tracer.rb +29 -6
  514. data/lib/datadog/tracing/contrib/sidekiq/tracing.rb +2 -2
  515. data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb +2 -2
  516. data/lib/datadog/tracing/contrib/sinatra/env.rb +14 -25
  517. data/lib/datadog/tracing/contrib/sinatra/ext.rb +7 -3
  518. data/lib/datadog/tracing/contrib/sinatra/framework.rb +11 -2
  519. data/lib/datadog/tracing/contrib/sinatra/headers.rb +1 -1
  520. data/lib/datadog/tracing/contrib/sinatra/integration.rb +3 -3
  521. data/lib/datadog/tracing/contrib/sinatra/patcher.rb +7 -8
  522. data/lib/datadog/tracing/contrib/sinatra/tracer.rb +15 -88
  523. data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb +20 -16
  524. data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb +2 -2
  525. data/lib/datadog/tracing/contrib/sneakers/integration.rb +4 -4
  526. data/lib/datadog/tracing/contrib/sneakers/patcher.rb +2 -3
  527. data/lib/datadog/tracing/contrib/sneakers/tracer.rb +4 -3
  528. data/lib/datadog/tracing/contrib/status_code_matcher.rb +2 -2
  529. data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb +33 -0
  530. data/lib/datadog/tracing/contrib/stripe/ext.rb +26 -0
  531. data/lib/datadog/tracing/contrib/stripe/integration.rb +43 -0
  532. data/lib/datadog/tracing/contrib/stripe/patcher.rb +29 -0
  533. data/lib/datadog/tracing/contrib/stripe/request.rb +67 -0
  534. data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb +2 -2
  535. data/lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb +3 -4
  536. data/lib/datadog/tracing/contrib/sucker_punch/integration.rb +3 -3
  537. data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb +4 -6
  538. data/lib/datadog/tracing/contrib/utils/quantization/http.rb +92 -10
  539. data/lib/datadog/tracing/contrib.rb +50 -47
  540. data/lib/datadog/tracing/correlation.rb +1 -1
  541. data/lib/datadog/{core → tracing}/diagnostics/ext.rb +1 -6
  542. data/lib/datadog/tracing/diagnostics/health.rb +40 -0
  543. data/lib/datadog/tracing/distributed/b3_multi.rb +66 -0
  544. data/lib/datadog/tracing/distributed/b3_single.rb +66 -0
  545. data/lib/datadog/tracing/distributed/datadog.rb +153 -0
  546. data/lib/datadog/tracing/distributed/datadog_tags_codec.rb +85 -0
  547. data/lib/datadog/tracing/distributed/fetcher.rb +30 -0
  548. data/lib/datadog/tracing/distributed/headers/ext.rb +19 -15
  549. data/lib/datadog/tracing/distributed/helpers.rb +40 -4
  550. data/lib/datadog/tracing/distributed/none.rb +19 -0
  551. data/lib/datadog/tracing/distributed/propagation.rb +127 -0
  552. data/lib/datadog/tracing/distributed/trace_context.rb +378 -0
  553. data/lib/datadog/tracing/event.rb +3 -2
  554. data/lib/datadog/tracing/flush.rb +57 -35
  555. data/lib/datadog/tracing/metadata/analytics.rb +2 -2
  556. data/lib/datadog/tracing/metadata/errors.rb +2 -2
  557. data/lib/datadog/tracing/metadata/ext.rb +28 -1
  558. data/lib/datadog/tracing/metadata/tagging.rb +23 -2
  559. data/lib/datadog/tracing/metadata.rb +3 -3
  560. data/lib/datadog/tracing/pipeline/span_filter.rb +10 -6
  561. data/lib/datadog/tracing/pipeline.rb +3 -3
  562. data/lib/datadog/tracing/propagation/http.rb +3 -98
  563. data/lib/datadog/tracing/runtime/metrics.rb +1 -1
  564. data/lib/datadog/tracing/sampling/all_sampler.rb +1 -1
  565. data/lib/datadog/tracing/sampling/ext.rb +31 -0
  566. data/lib/datadog/tracing/sampling/priority_sampler.rb +64 -12
  567. data/lib/datadog/tracing/sampling/rate_by_key_sampler.rb +10 -11
  568. data/lib/datadog/tracing/sampling/rate_by_service_sampler.rb +32 -8
  569. data/lib/datadog/tracing/sampling/rate_limiter.rb +4 -1
  570. data/lib/datadog/tracing/sampling/rate_sampler.rb +27 -10
  571. data/lib/datadog/tracing/sampling/rule.rb +15 -9
  572. data/lib/datadog/tracing/sampling/rule_sampler.rb +11 -12
  573. data/lib/datadog/tracing/sampling/span/ext.rb +25 -0
  574. data/lib/datadog/tracing/sampling/span/matcher.rb +89 -0
  575. data/lib/datadog/tracing/sampling/span/rule.rb +82 -0
  576. data/lib/datadog/tracing/sampling/span/rule_parser.rb +104 -0
  577. data/lib/datadog/tracing/sampling/span/sampler.rb +75 -0
  578. data/lib/datadog/tracing/span.rb +24 -20
  579. data/lib/datadog/tracing/span_operation.rb +15 -16
  580. data/lib/datadog/tracing/sync_writer.rb +5 -5
  581. data/lib/datadog/tracing/trace_digest.rb +88 -2
  582. data/lib/datadog/tracing/trace_operation.rb +60 -16
  583. data/lib/datadog/tracing/trace_segment.rb +13 -8
  584. data/lib/datadog/tracing/tracer.rb +49 -21
  585. data/lib/datadog/tracing/utils.rb +50 -0
  586. data/lib/datadog/tracing/workers/trace_writer.rb +9 -9
  587. data/lib/datadog/tracing/workers.rb +3 -3
  588. data/lib/datadog/tracing/writer.rb +12 -5
  589. data/lib/datadog/tracing.rb +8 -8
  590. data/lib/ddtrace/auto_instrument.rb +9 -2
  591. data/lib/ddtrace/transport/ext.rb +7 -1
  592. data/lib/ddtrace/transport/http/adapters/net.rb +3 -2
  593. data/lib/ddtrace/transport/http/adapters/test.rb +1 -1
  594. data/lib/ddtrace/transport/http/adapters/unix_socket.rb +2 -2
  595. data/lib/ddtrace/transport/http/api/map.rb +1 -1
  596. data/lib/ddtrace/transport/http/api.rb +4 -4
  597. data/lib/ddtrace/transport/http/builder.rb +5 -5
  598. data/lib/ddtrace/transport/http/client.rb +4 -3
  599. data/lib/ddtrace/transport/http/response.rb +35 -5
  600. data/lib/ddtrace/transport/http/statistics.rb +1 -1
  601. data/lib/ddtrace/transport/http/traces.rb +5 -5
  602. data/lib/ddtrace/transport/http.rb +12 -9
  603. data/lib/ddtrace/transport/io/client.rb +5 -3
  604. data/lib/ddtrace/transport/io/response.rb +1 -1
  605. data/lib/ddtrace/transport/io/traces.rb +3 -3
  606. data/lib/ddtrace/transport/io.rb +3 -3
  607. data/lib/ddtrace/transport/statistics.rb +2 -2
  608. data/lib/ddtrace/transport/trace_formatter.rb +14 -10
  609. data/lib/ddtrace/transport/traces.rb +8 -6
  610. data/lib/ddtrace/version.rb +1 -1
  611. data/lib/ddtrace.rb +6 -5
  612. metadata +160 -44
  613. data/.editorconfig +0 -22
  614. data/.gitignore +0 -70
  615. data/CONTRIBUTING.md +0 -81
  616. data/ddtrace.gemspec +0 -59
  617. data/docs/0.x-trace.png +0 -0
  618. data/docs/1.0-trace.png +0 -0
  619. data/docs/AutoInstrumentation.md +0 -36
  620. data/docs/Deprecation.md +0 -8
  621. data/docs/DevelopmentGuide.md +0 -259
  622. data/docs/GettingStarted.md +0 -2671
  623. data/docs/ProfilingDevelopment.md +0 -110
  624. data/docs/PublicApi.md +0 -14
  625. data/docs/UpgradeGuide.md +0 -736
  626. data/lib/datadog/profiling/recorder.rb +0 -117
  627. data/lib/datadog/profiling/transport/client.rb +0 -16
  628. data/lib/datadog/profiling/transport/http/api/endpoint.rb +0 -107
  629. data/lib/datadog/profiling/transport/http/api/instance.rb +0 -38
  630. data/lib/datadog/profiling/transport/http/api/spec.rb +0 -42
  631. data/lib/datadog/profiling/transport/http/api.rb +0 -45
  632. data/lib/datadog/profiling/transport/http/builder.rb +0 -30
  633. data/lib/datadog/profiling/transport/http/client.rb +0 -35
  634. data/lib/datadog/profiling/transport/http/response.rb +0 -23
  635. data/lib/datadog/profiling/transport/http.rb +0 -112
  636. data/lib/datadog/profiling/transport/io/client.rb +0 -29
  637. data/lib/datadog/profiling/transport/io/response.rb +0 -18
  638. data/lib/datadog/profiling/transport/io.rb +0 -32
  639. data/lib/datadog/profiling/transport/parcel.rb +0 -19
  640. data/lib/datadog/profiling/transport/request.rb +0 -17
  641. data/lib/datadog/profiling/transport/response.rb +0 -10
  642. data/lib/datadog/tracing/distributed/headers/b3.rb +0 -55
  643. data/lib/datadog/tracing/distributed/headers/b3_single.rb +0 -67
  644. data/lib/datadog/tracing/distributed/headers/datadog.rb +0 -52
  645. data/lib/datadog/tracing/distributed/parser.rb +0 -70
  646. data/lib/datadog/tracing/propagation/grpc.rb +0 -88
@@ -0,0 +1,48 @@
1
+ # typed: true
2
+
3
+ require_relative 'event'
4
+ require_relative 'http/transport'
5
+ require_relative '../utils/sequence'
6
+ require_relative '../utils/forking'
7
+
8
+ module Datadog
9
+ module Core
10
+ module Telemetry
11
+ # Class that emits telemetry events
12
+ class Emitter
13
+ attr_reader :http_transport
14
+
15
+ extend Core::Utils::Forking
16
+
17
+ # @param sequence [Datadog::Core::Utils::Sequence] Sequence object that stores and increments a counter
18
+ # @param http_transport [Datadog::Core::Telemetry::Http::Transport] Transport object that can be used to send
19
+ # telemetry requests via the agent
20
+ def initialize(http_transport: Datadog::Core::Telemetry::Http::Transport.new)
21
+ @http_transport = http_transport
22
+ end
23
+
24
+ # Retrieves and emits a TelemetryRequest object based on the request type specified
25
+ # @param request_type [String] the type of telemetry request to collect data for
26
+ def request(request_type)
27
+ begin
28
+ request = Datadog::Core::Telemetry::Event.new.telemetry_request(
29
+ request_type: request_type,
30
+ seq_id: self.class.sequence.next
31
+ ).to_h
32
+ @http_transport.request(request_type: request_type.to_s, payload: request.to_json)
33
+ rescue StandardError => e
34
+ Datadog.logger.debug("Unable to send telemetry request for event `#{request_type}`: #{e}")
35
+ Telemetry::Http::InternalErrorResponse.new(e)
36
+ end
37
+ end
38
+
39
+ # Initializes a Sequence object to track seq_id if not already initialized; else returns stored
40
+ # Sequence object
41
+ def self.sequence
42
+ after_fork! { @sequence = Datadog::Core::Utils::Sequence.new(1) }
43
+ @sequence ||= Datadog::Core::Utils::Sequence.new(1)
44
+ end
45
+ end
46
+ end
47
+ end
48
+ end
@@ -0,0 +1,71 @@
1
+ # typed: true
2
+
3
+ require_relative 'collector'
4
+ require_relative 'v1/app_event'
5
+ require_relative 'v1/telemetry_request'
6
+
7
+ module Datadog
8
+ module Core
9
+ module Telemetry
10
+ # Class defining methods to construct a Telemetry event
11
+ class Event
12
+ include Kernel
13
+
14
+ include Telemetry::Collector
15
+
16
+ API_VERSION = 'v1'.freeze
17
+
18
+ attr_reader \
19
+ :api_version
20
+
21
+ def initialize
22
+ @api_version = API_VERSION
23
+ end
24
+
25
+ # Forms a TelemetryRequest object based on the event request_type
26
+ # @param request_type [String] the type of telemetry request to collect data for
27
+ # @param seq_id [Integer] the ID of the request; incremented each time a telemetry request is sent to the API
28
+ def telemetry_request(request_type:, seq_id:)
29
+ Telemetry::V1::TelemetryRequest.new(
30
+ api_version: @api_version,
31
+ application: application,
32
+ host: host,
33
+ payload: payload(request_type),
34
+ request_type: request_type,
35
+ runtime_id: runtime_id,
36
+ seq_id: seq_id,
37
+ tracer_time: tracer_time,
38
+ )
39
+ end
40
+
41
+ private
42
+
43
+ def payload(request_type)
44
+ case request_type
45
+ when :'app-started'
46
+ app_started
47
+ when :'app-closing', :'app-heartbeat'
48
+ {}
49
+ when :'app-integrations-change'
50
+ app_integrations_change
51
+ else
52
+ raise ArgumentError, "Request type invalid, received request_type: #{@request_type}"
53
+ end
54
+ end
55
+
56
+ def app_started
57
+ Telemetry::V1::AppEvent.new(
58
+ dependencies: dependencies,
59
+ integrations: integrations,
60
+ configuration: configurations,
61
+ additional_payload: additional_payload
62
+ )
63
+ end
64
+
65
+ def app_integrations_change
66
+ Telemetry::V1::AppEvent.new(integrations: integrations)
67
+ end
68
+ end
69
+ end
70
+ end
71
+ end
@@ -0,0 +1,11 @@
1
+ # typed: true
2
+
3
+ module Datadog
4
+ module Core
5
+ module Telemetry
6
+ module Ext
7
+ ENV_ENABLED = 'DD_INSTRUMENTATION_TELEMETRY_ENABLED'.freeze
8
+ end
9
+ end
10
+ end
11
+ end
@@ -0,0 +1,37 @@
1
+ # typed: false
2
+
3
+ require_relative '../worker'
4
+ require_relative '../workers/polling'
5
+
6
+ module Datadog
7
+ module Core
8
+ module Telemetry
9
+ # Periodically (every DEFAULT_INTERVAL_SECONDS) sends a heartbeat event to the telemetry API.
10
+ class Heartbeat < Core::Worker
11
+ include Core::Workers::Polling
12
+
13
+ DEFAULT_INTERVAL_SECONDS = 60
14
+
15
+ def initialize(enabled: true, interval: DEFAULT_INTERVAL_SECONDS, &block)
16
+ # Workers::Polling settings
17
+ self.enabled = enabled
18
+ # Workers::IntervalLoop settings
19
+ self.loop_base_interval = interval
20
+ self.fork_policy = Core::Workers::Async::Thread::FORK_POLICY_STOP
21
+ super(&block)
22
+ start
23
+ end
24
+
25
+ def loop_wait_before_first_iteration?
26
+ true
27
+ end
28
+
29
+ private
30
+
31
+ def start
32
+ perform
33
+ end
34
+ end
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,113 @@
1
+ # typed: true
2
+
3
+ require_relative '../response'
4
+
5
+ module Datadog
6
+ module Core
7
+ module Telemetry
8
+ module Http
9
+ module Adapters
10
+ # Class defining methods to make http requests via NET
11
+ class Net
12
+ attr_reader \
13
+ :hostname,
14
+ :port,
15
+ :timeout,
16
+ :ssl
17
+
18
+ DEFAULT_TIMEOUT = 30
19
+
20
+ def initialize(hostname:, port: nil, timeout: DEFAULT_TIMEOUT, ssl: true)
21
+ @hostname = hostname
22
+ @port = port
23
+ @timeout = timeout
24
+ @ssl = ssl.nil? ? true : ssl
25
+ end
26
+
27
+ def open(&block)
28
+ req = ::Net::HTTP.new(@hostname, @port)
29
+
30
+ req.use_ssl = @ssl
31
+ req.open_timeout = req.read_timeout = @timeout
32
+
33
+ req.start(&block)
34
+ end
35
+
36
+ def post(env)
37
+ begin
38
+ post = ::Net::HTTP::Post.new(env.path, env.headers)
39
+ post.body = env.body
40
+
41
+ http_response = open do |http|
42
+ http.request(post)
43
+ end
44
+
45
+ Response.new(http_response)
46
+ rescue StandardError => e
47
+ Datadog.logger.debug("Unable to send telemetry event to agent: #{e}")
48
+ Telemetry::Http::InternalErrorResponse.new(e)
49
+ end
50
+ end
51
+
52
+ # Data structure for an HTTP Response
53
+ class Response
54
+ include Datadog::Core::Telemetry::Http::Response
55
+
56
+ attr_reader :http_response
57
+
58
+ def initialize(http_response)
59
+ @http_response = http_response
60
+ end
61
+
62
+ def payload
63
+ return super if http_response.nil?
64
+
65
+ http_response.body
66
+ end
67
+
68
+ def code
69
+ return super if http_response.nil?
70
+
71
+ http_response.code.to_i
72
+ end
73
+
74
+ def ok?
75
+ return super if http_response.nil?
76
+
77
+ code.between?(200, 299)
78
+ end
79
+
80
+ def unsupported?
81
+ return super if http_response.nil?
82
+
83
+ code == 415
84
+ end
85
+
86
+ def not_found?
87
+ return super if http_response.nil?
88
+
89
+ code == 404
90
+ end
91
+
92
+ def client_error?
93
+ return super if http_response.nil?
94
+
95
+ code.between?(400, 499)
96
+ end
97
+
98
+ def server_error?
99
+ return super if http_response.nil?
100
+
101
+ code.between?(500, 599)
102
+ end
103
+
104
+ def inspect
105
+ "#{super}, http_response:#{http_response}"
106
+ end
107
+ end
108
+ end
109
+ end
110
+ end
111
+ end
112
+ end
113
+ end
@@ -0,0 +1,20 @@
1
+ # typed: true
2
+
3
+ module Datadog
4
+ module Core
5
+ module Telemetry
6
+ module Http
7
+ # Data structure for an HTTP request
8
+ class Env
9
+ attr_accessor :path, :body
10
+
11
+ attr_writer :headers
12
+
13
+ def headers
14
+ @headers ||= {}
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
@@ -0,0 +1,20 @@
1
+ module Datadog
2
+ module Core
3
+ module Telemetry
4
+ module Http
5
+ module Ext
6
+ HEADER_DD_API_KEY = 'DD-API-KEY'.freeze
7
+ HEADER_CONTENT_TYPE = 'Content-Type'.freeze
8
+ HEADER_CONTENT_LENGTH = 'Content-Length'.freeze
9
+ HEADER_DD_TELEMETRY_API_VERSION = 'DD-Telemetry-API-Version'.freeze
10
+ HEADER_DD_TELEMETRY_REQUEST_TYPE = 'DD-Telemetry-Request-Type'.freeze
11
+
12
+ CONTENT_TYPE_APPLICATION_JSON = 'application/json'.freeze
13
+ API_VERSION = 'v1'.freeze
14
+
15
+ AGENT_ENDPOINT = '/telemetry/proxy/api/v2/apmtelemetry'.freeze
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
@@ -0,0 +1,68 @@
1
+ # typed: true
2
+
3
+ module Datadog
4
+ module Core
5
+ module Telemetry
6
+ module Http
7
+ # Module for base HTTP response
8
+ module Response
9
+ include Kernel
10
+
11
+ def payload
12
+ nil
13
+ end
14
+
15
+ def ok?
16
+ nil
17
+ end
18
+
19
+ def unsupported?
20
+ nil
21
+ end
22
+
23
+ def not_found?
24
+ nil
25
+ end
26
+
27
+ def client_error?
28
+ nil
29
+ end
30
+
31
+ def server_error?
32
+ nil
33
+ end
34
+
35
+ def internal_error?
36
+ nil
37
+ end
38
+
39
+ def inspect
40
+ "#{self.class} ok?:#{ok?} unsupported?:#{unsupported?}, " \
41
+ "not_found?:#{not_found?}, client_error?:#{client_error?}, " \
42
+ "server_error?:#{server_error?}, internal_error?:#{internal_error?}, " \
43
+ "payload:#{payload}"
44
+ end
45
+ end
46
+
47
+ # A generic error response for internal errors
48
+ class InternalErrorResponse
49
+ include Response
50
+
51
+ attr_reader :error
52
+
53
+ def initialize(error)
54
+ @error = error
55
+ end
56
+
57
+ def internal_error?
58
+ true
59
+ end
60
+
61
+ def inspect
62
+ "#{super}, error_type:#{error.class} error:#{error}"
63
+ end
64
+ end
65
+ end
66
+ end
67
+ end
68
+ end
@@ -0,0 +1,53 @@
1
+ # typed: true
2
+
3
+ require_relative '../../configuration/settings'
4
+ require_relative 'env'
5
+ require_relative 'ext'
6
+ require_relative 'adapters/net'
7
+
8
+ module Datadog
9
+ module Core
10
+ module Telemetry
11
+ module Http
12
+ # Class to send telemetry data to Telemetry API
13
+ class Transport
14
+ attr_reader \
15
+ :host,
16
+ :port,
17
+ :ssl,
18
+ :path
19
+
20
+ def initialize
21
+ agent_settings = Configuration::AgentSettingsResolver.call(Datadog.configuration)
22
+ @host = agent_settings.hostname
23
+ @port = agent_settings.port
24
+ @ssl = false
25
+ @path = Http::Ext::AGENT_ENDPOINT
26
+ end
27
+
28
+ def request(request_type:, payload:)
29
+ env = Http::Env.new
30
+ env.path = @path
31
+ env.body = payload
32
+ env.headers = headers(request_type: request_type)
33
+ adapter.post(env)
34
+ end
35
+
36
+ private
37
+
38
+ def headers(request_type:, api_version: Http::Ext::API_VERSION)
39
+ {
40
+ Http::Ext::HEADER_CONTENT_TYPE => Http::Ext::CONTENT_TYPE_APPLICATION_JSON,
41
+ Http::Ext::HEADER_DD_TELEMETRY_API_VERSION => api_version,
42
+ Http::Ext::HEADER_DD_TELEMETRY_REQUEST_TYPE => request_type,
43
+ }
44
+ end
45
+
46
+ def adapter
47
+ @adapter ||= Http::Adapters::Net.new(hostname: @host, port: @port, ssl: @ssl)
48
+ end
49
+ end
50
+ end
51
+ end
52
+ end
53
+ end
@@ -0,0 +1,52 @@
1
+ module Datadog
2
+ module Core
3
+ module Telemetry
4
+ module V1
5
+ # Describes payload for telemetry V1 API app-integrations-change event
6
+ class AppEvent
7
+ include Kernel
8
+
9
+ attr_reader \
10
+ :additional_payload,
11
+ :configuration,
12
+ :dependencies,
13
+ :integrations
14
+
15
+ # @param additional_payload [Array<Telemetry::V1::Configuration>] List of Additional payload to track (any key
16
+ # value not mentioned and doesn't fit under a metric)
17
+ # @param configuration [Array<Telemetry::V1::Configuration>] List of Tracer related configuration data
18
+ # @param dependencies [Array<Telemetry::V1::Dependency>] List of all loaded modules requested by the app
19
+ # @param integrations [Array<Telemetry::V1::Integration>] List of integrations that are available within the app
20
+ # and applicable to be traced
21
+ def initialize(additional_payload: nil, configuration: nil, dependencies: nil, integrations: nil)
22
+ @additional_payload = additional_payload
23
+ @configuration = configuration
24
+ @dependencies = dependencies
25
+ @integrations = integrations
26
+ end
27
+
28
+ def to_h
29
+ {}.tap do |hash|
30
+ hash[:additional_payload] = map_hash(@additional_payload) if @additional_payload
31
+ hash[:configuration] = map_hash(@configuration) if @configuration
32
+ hash[:dependencies] = map_array(@dependencies) if @dependencies
33
+ hash[:integrations] = map_array(@integrations) if @integrations
34
+ end
35
+ end
36
+
37
+ private
38
+
39
+ def map_hash(hash)
40
+ hash.map do |k, v|
41
+ { name: k.to_s, value: v }
42
+ end
43
+ end
44
+
45
+ def map_array(arr)
46
+ arr.map(&:to_h)
47
+ end
48
+ end
49
+ end
50
+ end
51
+ end
52
+ end
@@ -0,0 +1,86 @@
1
+ module Datadog
2
+ module Core
3
+ module Telemetry
4
+ module V1
5
+ # Describes attributes for application environment object
6
+ class Application
7
+ ERROR_NIL_LANGUAGE_NAME_MESSAGE = ':language_name must not be nil'.freeze
8
+ ERROR_NIL_LANGUAGE_VERSION_MESSAGE = ':language_version must not be nil'.freeze
9
+ ERROR_NIL_SERVICE_NAME_MESSAGE = ':service_name must not be nil'.freeze
10
+ ERROR_NIL_TRACER_VERSION_MESSAGE = ':tracer_version must not be nil'.freeze
11
+
12
+ attr_reader \
13
+ :env,
14
+ :language_name,
15
+ :language_version,
16
+ :products,
17
+ :runtime_name,
18
+ :runtime_patches,
19
+ :runtime_version,
20
+ :service_name,
21
+ :service_version,
22
+ :tracer_version
23
+
24
+ # @param env [String] Service's environment
25
+ # @param language_name [String] 'ruby'
26
+ # @param language_version [String] Version of language used
27
+ # @param products [Telemetry::V1::Product] Contains information about specific products added to the environment
28
+ # @param runtime_name [String] Runtime being used
29
+ # @param runtime_patches [String] String of patches applied to the runtime
30
+ # @param runtime_version [String] Runtime version; potentially the same as :language_version
31
+ # @param service_name [String] Service’s name (DD_SERVICE)
32
+ # @param service_version [String] Service’s version (DD_VERSION)
33
+ # @param tracer_version [String] Version of the used tracer
34
+ def initialize(
35
+ language_name:, language_version:, service_name:, tracer_version:, env: nil, products: nil,
36
+ runtime_name: nil, runtime_patches: nil, runtime_version: nil, service_version: nil
37
+ )
38
+ validate(
39
+ language_name: language_name,
40
+ language_version: language_version,
41
+ service_name: service_name,
42
+ tracer_version: tracer_version
43
+ )
44
+ @env = env
45
+ @language_name = language_name
46
+ @language_version = language_version
47
+ @products = products
48
+ @runtime_name = runtime_name
49
+ @runtime_patches = runtime_patches
50
+ @runtime_version = runtime_version
51
+ @service_name = service_name
52
+ @service_version = service_version
53
+ @tracer_version = tracer_version
54
+ end
55
+
56
+ def to_h
57
+ {
58
+ env: @env,
59
+ language_name: @language_name,
60
+ language_version: @language_version,
61
+ products: @products.to_h,
62
+ runtime_name: @runtime_name,
63
+ runtime_patches: @runtime_patches,
64
+ runtime_version: @runtime_version,
65
+ service_name: @service_name,
66
+ service_version: @service_version,
67
+ tracer_version: @tracer_version
68
+ }
69
+ end
70
+
71
+ private
72
+
73
+ # Validates required arguments passed to the class on initialization are not nil
74
+ #
75
+ # @!visibility private
76
+ def validate(language_name:, language_version:, service_name:, tracer_version:)
77
+ raise ArgumentError, ERROR_NIL_LANGUAGE_NAME_MESSAGE if language_name.nil?
78
+ raise ArgumentError, ERROR_NIL_LANGUAGE_VERSION_MESSAGE if language_version.nil?
79
+ raise ArgumentError, ERROR_NIL_SERVICE_NAME_MESSAGE if service_name.nil?
80
+ raise ArgumentError, ERROR_NIL_TRACER_VERSION_MESSAGE if tracer_version.nil?
81
+ end
82
+ end
83
+ end
84
+ end
85
+ end
86
+ end
@@ -0,0 +1,25 @@
1
+ module Datadog
2
+ module Core
3
+ module Telemetry
4
+ module V1
5
+ # Describes attributes for additional payload or configuration object
6
+ class Configuration
7
+ ERROR_NIL_NAME_MESSAGE = ':name must not be nil'.freeze
8
+
9
+ attr_reader \
10
+ :name,
11
+ :value
12
+
13
+ # @param name [String] Configuration/additional payload attribute name
14
+ # @param value [String, Integer, Boolean] Corresponding value
15
+ def initialize(name:, value: nil)
16
+ raise ArgumentError, ERROR_NIL_NAME_MESSAGE if name.nil?
17
+
18
+ @name = name
19
+ @value = value
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
25
+ end
@@ -0,0 +1,36 @@
1
+ module Datadog
2
+ module Core
3
+ module Telemetry
4
+ module V1
5
+ # Describes attributes for dependency object
6
+ class Dependency
7
+ ERROR_NIL_NAME_MESSAGE = ':name must not be nil'.freeze
8
+
9
+ attr_reader \
10
+ :hash,
11
+ :name,
12
+ :version
13
+
14
+ # @param name [String] Module name
15
+ # @param version [String] Version of resolved module
16
+ # @param hash [String] Dependency hash
17
+ def initialize(name:, version: nil, hash: nil)
18
+ raise ArgumentError, ERROR_NIL_NAME_MESSAGE if name.nil?
19
+
20
+ @hash = hash
21
+ @name = name
22
+ @version = version
23
+ end
24
+
25
+ def to_h
26
+ {
27
+ hash: @hash,
28
+ name: @name,
29
+ version: @version
30
+ }
31
+ end
32
+ end
33
+ end
34
+ end
35
+ end
36
+ end