newrelic_rpm 6.8.0.360 → 9.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (464) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +14 -1
  3. data/.rubocop.yml +1845 -0
  4. data/.rubocop_todo.yml +61 -0
  5. data/.simplecov +16 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +1 -0
  8. data/Brewfile +13 -0
  9. data/CHANGELOG.md +4029 -2514
  10. data/CONTRIBUTING.md +132 -19
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +5 -2
  14. data/Guardfile +21 -8
  15. data/LICENSE +202 -38
  16. data/README.md +86 -87
  17. data/Rakefile +32 -32
  18. data/THIRD_PARTY_NOTICES.md +28 -0
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +4 -2
  21. data/bin/newrelic_cmd +2 -0
  22. data/bin/nrdebug +86 -63
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +5 -7
  26. data/install.rb +3 -3
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
  29. data/lib/new_relic/agent/agent.rb +114 -942
  30. data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
  31. data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
  32. data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
  33. data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
  34. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
  35. data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
  36. data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
  37. data/lib/new_relic/agent/agent_logger.rb +28 -24
  38. data/lib/new_relic/agent/attribute_filter.rb +66 -49
  39. data/lib/new_relic/agent/attribute_processing.rb +10 -10
  40. data/lib/new_relic/agent/attributes.rb +9 -8
  41. data/lib/new_relic/agent/audit_logger.rb +22 -7
  42. data/lib/new_relic/agent/autostart.rb +22 -21
  43. data/lib/new_relic/agent/chained_call.rb +2 -2
  44. data/lib/new_relic/agent/commands/agent_command.rb +5 -5
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +16 -14
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
  47. data/lib/new_relic/agent/configuration/default_source.rb +1444 -1167
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
  49. data/lib/new_relic/agent/configuration/environment_source.rb +14 -12
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +12 -13
  52. data/lib/new_relic/agent/configuration/manager.rb +96 -70
  53. data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
  54. data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
  55. data/lib/new_relic/agent/configuration/security_policy_source.rb +93 -96
  56. data/lib/new_relic/agent/configuration/server_source.rb +44 -42
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +36 -12
  58. data/lib/new_relic/agent/configuration.rb +2 -2
  59. data/lib/new_relic/agent/connect/request_builder.rb +19 -19
  60. data/lib/new_relic/agent/connect/response_handler.rb +6 -9
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +16 -16
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +6 -7
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +18 -17
  64. data/lib/new_relic/agent/database/obfuscator.rb +5 -5
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
  66. data/lib/new_relic/agent/database.rb +47 -56
  67. data/lib/new_relic/agent/database_adapter.rb +35 -0
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +22 -23
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +18 -22
  71. data/lib/new_relic/agent/datastores/mongo.rb +7 -12
  72. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  73. data/lib/new_relic/agent/datastores/redis.rb +10 -16
  74. data/lib/new_relic/agent/datastores.rb +14 -16
  75. data/lib/new_relic/agent/deprecator.rb +2 -2
  76. data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
  77. data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +90 -70
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
  84. data/lib/new_relic/agent/distributed_tracing.rb +113 -32
  85. data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
  86. data/lib/new_relic/agent/error_collector.rb +129 -65
  87. data/lib/new_relic/agent/error_event_aggregator.rb +9 -8
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +10 -8
  90. data/lib/new_relic/agent/event_aggregator.rb +23 -22
  91. data/lib/new_relic/agent/event_buffer.rb +8 -9
  92. data/lib/new_relic/agent/event_listener.rb +2 -3
  93. data/lib/new_relic/agent/event_loop.rb +28 -26
  94. data/lib/new_relic/agent/external.rb +19 -52
  95. data/lib/new_relic/agent/guid_generator.rb +14 -12
  96. data/lib/new_relic/agent/harvester.rb +6 -9
  97. data/lib/new_relic/agent/heap.rb +9 -10
  98. data/lib/new_relic/agent/hostname.rb +22 -9
  99. data/lib/new_relic/agent/http_clients/abstract.rb +69 -0
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +30 -26
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +37 -21
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +22 -23
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +18 -17
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +28 -8
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +17 -17
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +13 -14
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +10 -25
  108. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
  109. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +46 -34
  110. data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
  111. data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
  112. data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
  113. data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
  114. data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
  115. data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
  116. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +28 -21
  117. data/lib/new_relic/agent/instrumentation/active_job.rb +34 -14
  118. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +97 -47
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +97 -73
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +53 -66
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +37 -24
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -30
  127. data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
  128. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  129. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  130. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  131. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  132. data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
  133. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +14 -138
  137. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  138. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  139. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  140. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  141. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +75 -63
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  145. data/lib/new_relic/agent/instrumentation/curb.rb +16 -201
  146. data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
  147. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
  148. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
  149. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  150. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  151. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +31 -52
  152. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  153. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +67 -0
  154. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  155. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  156. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +10 -8
  157. data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
  158. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
  159. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
  160. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
  161. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  162. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  163. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  164. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  165. data/lib/new_relic/agent/instrumentation/grape.rb +17 -123
  166. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  167. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
  168. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  169. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  170. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  171. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  172. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  173. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  174. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  175. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  176. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  177. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  178. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  179. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  180. data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
  181. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  182. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  183. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  184. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  185. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +6 -7
  186. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  189. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +60 -125
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
  195. data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
  196. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +16 -15
  197. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +11 -11
  198. data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
  199. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +53 -17
  200. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  201. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
  202. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  203. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +75 -9
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  212. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  213. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  214. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  215. data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +22 -57
  217. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
  218. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +10 -9
  219. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -6
  220. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
  221. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  222. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  223. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
  224. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  225. data/lib/new_relic/agent/instrumentation/rake.rb +18 -158
  226. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  227. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  228. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +94 -0
  229. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  230. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  231. data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  236. data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
  237. data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
  238. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +13 -13
  239. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  240. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  241. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  242. data/lib/new_relic/agent/instrumentation/sidekiq.rb +30 -46
  243. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  244. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
  245. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +126 -0
  246. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  247. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -4
  248. data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
  249. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  250. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  251. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  252. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  253. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +42 -0
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  257. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  258. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  259. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  260. data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
  261. data/lib/new_relic/agent/instrumentation.rb +2 -2
  262. data/lib/new_relic/agent/internal_agent_error.rb +3 -3
  263. data/lib/new_relic/agent/javascript_instrumentor.rb +59 -48
  264. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  265. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  266. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  267. data/lib/new_relic/agent/log_once.rb +2 -2
  268. data/lib/new_relic/agent/log_priority.rb +20 -0
  269. data/lib/new_relic/agent/logging.rb +104 -51
  270. data/lib/new_relic/agent/memory_logger.rb +3 -3
  271. data/lib/new_relic/agent/messaging.rb +74 -156
  272. data/lib/new_relic/agent/method_tracer.rb +157 -150
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
  275. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
  276. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +3 -4
  277. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
  278. data/lib/new_relic/agent/monitors.rb +26 -0
  279. data/lib/new_relic/agent/new_relic_service/encoders.rb +8 -8
  280. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +7 -7
  281. data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
  282. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
  283. data/lib/new_relic/agent/new_relic_service.rb +266 -193
  284. data/lib/new_relic/agent/noticeable_error.rb +19 -0
  285. data/lib/new_relic/agent/null_logger.rb +8 -4
  286. data/lib/new_relic/agent/obfuscator.rb +9 -11
  287. data/lib/new_relic/agent/parameter_filtering.rb +30 -16
  288. data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
  289. data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
  290. data/lib/new_relic/agent/pipe_service.rb +14 -9
  291. data/lib/new_relic/agent/prepend_supportability.rb +3 -3
  292. data/lib/new_relic/agent/priority_sampled_buffer.rb +16 -16
  293. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
  294. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
  295. data/lib/new_relic/agent/rules_engine.rb +6 -5
  296. data/lib/new_relic/agent/sampler.rb +6 -6
  297. data/lib/new_relic/agent/sampler_collection.rb +5 -6
  298. data/lib/new_relic/agent/samplers/cpu_sampler.rb +9 -8
  299. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +21 -18
  300. data/lib/new_relic/agent/samplers/memory_sampler.rb +33 -22
  301. data/lib/new_relic/agent/samplers/object_sampler.rb +3 -3
  302. data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
  303. data/lib/new_relic/agent/span_event_aggregator.rb +16 -16
  304. data/lib/new_relic/agent/span_event_primitive.rb +106 -68
  305. data/lib/new_relic/agent/sql_sampler.rb +23 -23
  306. data/lib/new_relic/agent/stats.rb +80 -43
  307. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
  308. data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
  309. data/lib/new_relic/agent/stats_engine.rb +9 -9
  310. data/lib/new_relic/agent/synthetics_event_aggregator.rb +9 -10
  311. data/lib/new_relic/agent/system_info.rb +97 -68
  312. data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
  313. data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
  314. data/lib/new_relic/agent/threading/backtrace_service.rb +18 -22
  315. data/lib/new_relic/agent/threading/thread_profile.rb +25 -25
  316. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
  317. data/lib/new_relic/agent/tracer.rb +127 -107
  318. data/lib/new_relic/agent/transaction/abstract_segment.rb +145 -49
  319. data/lib/new_relic/agent/transaction/datastore_segment.rb +23 -19
  320. data/lib/new_relic/agent/transaction/distributed_tracer.rb +185 -0
  321. data/lib/new_relic/agent/transaction/distributed_tracing.rb +76 -86
  322. data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -77
  323. data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
  324. data/lib/new_relic/agent/transaction/request_attributes.rb +40 -40
  325. data/lib/new_relic/agent/transaction/segment.rb +41 -11
  326. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
  327. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +3 -3
  328. data/lib/new_relic/agent/transaction/trace.rb +19 -17
  329. data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
  330. data/lib/new_relic/agent/transaction/trace_context.rb +102 -93
  331. data/lib/new_relic/agent/transaction/trace_node.rb +31 -32
  332. data/lib/new_relic/agent/transaction/tracing.rb +22 -13
  333. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
  334. data/lib/new_relic/agent/transaction.rb +239 -198
  335. data/lib/new_relic/agent/transaction_error_primitive.rb +32 -28
  336. data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
  337. data/lib/new_relic/agent/transaction_event_primitive.rb +43 -47
  338. data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
  339. data/lib/new_relic/agent/transaction_metrics.rb +11 -10
  340. data/lib/new_relic/agent/transaction_sampler.rb +8 -9
  341. data/lib/new_relic/agent/transaction_time_aggregator.rb +33 -28
  342. data/lib/new_relic/agent/utilization/aws.rb +35 -5
  343. data/lib/new_relic/agent/utilization/azure.rb +7 -7
  344. data/lib/new_relic/agent/utilization/gcp.rb +11 -11
  345. data/lib/new_relic/agent/utilization/pcf.rb +7 -6
  346. data/lib/new_relic/agent/utilization/vendor.rb +45 -30
  347. data/lib/new_relic/agent/utilization_data.rb +8 -6
  348. data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
  349. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +4 -4
  350. data/lib/new_relic/agent/vm/mri_vm.rb +54 -26
  351. data/lib/new_relic/agent/vm/snapshot.rb +6 -6
  352. data/lib/new_relic/agent/vm.rb +2 -2
  353. data/lib/new_relic/agent/worker_loop.rb +11 -13
  354. data/lib/new_relic/agent.rb +159 -109
  355. data/lib/new_relic/cli/command.rb +22 -24
  356. data/lib/new_relic/cli/commands/deployments.rb +101 -51
  357. data/lib/new_relic/cli/commands/install.rb +33 -35
  358. data/lib/new_relic/coerce.rb +19 -15
  359. data/lib/new_relic/collection_helper.rb +51 -49
  360. data/lib/new_relic/constants.rb +38 -0
  361. data/lib/new_relic/control/class_methods.rb +6 -6
  362. data/lib/new_relic/control/frameworks/external.rb +3 -3
  363. data/lib/new_relic/control/frameworks/rails.rb +50 -32
  364. data/lib/new_relic/control/frameworks/rails3.rb +4 -5
  365. data/lib/new_relic/control/frameworks/rails4.rb +2 -2
  366. data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
  367. data/lib/new_relic/control/frameworks/ruby.rb +4 -4
  368. data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
  369. data/lib/new_relic/control/frameworks.rb +2 -2
  370. data/lib/new_relic/control/instance_methods.rb +28 -46
  371. data/lib/new_relic/control/instrumentation.rb +26 -12
  372. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  373. data/lib/new_relic/control/server_methods.rb +4 -5
  374. data/lib/new_relic/control.rb +2 -3
  375. data/lib/new_relic/delayed_job_injection.rb +2 -2
  376. data/lib/new_relic/dependency_detection.rb +138 -31
  377. data/lib/new_relic/environment_report.rb +42 -36
  378. data/lib/new_relic/helper.rb +50 -8
  379. data/lib/new_relic/language_support.rb +31 -7
  380. data/lib/new_relic/latest_changes.rb +11 -10
  381. data/lib/new_relic/local_environment.rb +23 -27
  382. data/lib/new_relic/metric_data.rb +32 -27
  383. data/lib/new_relic/metric_spec.rb +9 -7
  384. data/lib/new_relic/noticed_error.rb +58 -47
  385. data/lib/new_relic/rack/agent_hooks.rb +2 -2
  386. data/lib/new_relic/rack/agent_middleware.rb +6 -4
  387. data/lib/new_relic/rack/browser_monitoring.rb +136 -117
  388. data/lib/new_relic/rack.rb +2 -2
  389. data/lib/new_relic/recipes/capistrano3.rb +5 -63
  390. data/lib/new_relic/recipes/capistrano_legacy.rb +25 -28
  391. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  392. data/lib/new_relic/recipes.rb +2 -2
  393. data/lib/new_relic/supportability_helper.rb +23 -7
  394. data/lib/new_relic/traced_thread.rb +39 -0
  395. data/lib/new_relic/version.rb +7 -18
  396. data/lib/newrelic_rpm.rb +21 -34
  397. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
  398. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +10 -16
  399. data/lib/tasks/all.rb +4 -4
  400. data/lib/tasks/config.rake +24 -119
  401. data/lib/tasks/coverage_report.rake +28 -0
  402. data/lib/tasks/helpers/config.html.erb +21 -0
  403. data/lib/tasks/helpers/format.rb +123 -0
  404. data/lib/tasks/helpers/matches.rb +12 -0
  405. data/lib/tasks/helpers/prompt.rb +24 -0
  406. data/lib/tasks/helpers/removers.rb +33 -0
  407. data/lib/tasks/install.rake +8 -4
  408. data/lib/tasks/instrumentation_generator/README.md +63 -0
  409. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  410. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  411. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  412. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  414. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  415. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  417. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  418. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  420. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  421. data/lib/tasks/multiverse.rake +4 -0
  422. data/lib/tasks/multiverse.rb +23 -9
  423. data/lib/tasks/newrelic.rb +3 -2
  424. data/lib/tasks/tests.rake +17 -17
  425. data/newrelic.yml +672 -3
  426. data/newrelic_rpm.gemspec +46 -39
  427. data/recipes/newrelic.rb +3 -3
  428. data/test/agent_helper.rb +340 -110
  429. metadata +272 -97
  430. data/.travis.yml +0 -210
  431. data/bin/mongrel_rpm +0 -33
  432. data/cert/cacert.pem +0 -1177
  433. data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
  434. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  435. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  436. data/lib/new_relic/agent/distributed_trace_intrinsics.rb +0 -90
  437. data/lib/new_relic/agent/distributed_trace_metrics.rb +0 -74
  438. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -30
  439. data/lib/new_relic/agent/distributed_trace_payload.rb +0 -175
  440. data/lib/new_relic/agent/distributed_trace_transport_type.rb +0 -43
  441. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  442. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
  443. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  444. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
  445. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
  446. data/lib/new_relic/agent/instrumentation/http.rb +0 -46
  447. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  448. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  449. data/lib/new_relic/agent/instrumentation/net.rb +0 -50
  450. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  451. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  452. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  453. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  454. data/lib/new_relic/agent/range_extensions.rb +0 -47
  455. data/lib/new_relic/agent/supported_versions.rb +0 -275
  456. data/lib/new_relic/agent/trace_context.rb +0 -244
  457. data/lib/new_relic/agent/trace_context_payload.rb +0 -134
  458. data/lib/new_relic/agent/trace_context_request_monitor.rb +0 -42
  459. data/lib/new_relic/build.rb +0 -2
  460. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  461. data/lib/new_relic/metrics.rb +0 -13
  462. data/lib/tasks/config.html.erb +0 -32
  463. data/true +0 -0
  464. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
- # encoding: utf-8
3
2
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
5
5
 
6
6
  # This module includes utilities for manipulating URIs, particularly from the
7
7
  # context of Net::HTTP requests. We don't always have direct access to the full
@@ -13,21 +13,20 @@ module NewRelic
13
13
  module Agent
14
14
  module HTTPClients
15
15
  module URIUtil
16
-
17
- def self.filter_uri(original)
18
- filtered = original.dup
19
- filtered.user = nil
20
- filtered.password = nil
21
- filtered.query = nil
22
- filtered.fragment = nil
23
- filtered.to_s
16
+ def self.obfuscated_uri(url)
17
+ parse_and_normalize_url(url).tap do |obfuscated|
18
+ obfuscated.user = nil
19
+ obfuscated.password = nil
20
+ obfuscated.query = nil
21
+ obfuscated.fragment = nil
22
+ end
24
23
  end
25
24
 
26
25
  # There are valid URI strings that some HTTP client libraries will
27
26
  # accept that the stdlib URI module doesn't handle. If we find that
28
27
  # Addressable is around, use that to normalize out our URL's.
29
28
  def self.parse_and_normalize_url(url)
30
- uri = url
29
+ uri = url.dup
31
30
  unless ::URI === uri
32
31
  if defined?(::Addressable::URI)
33
32
  address = ::Addressable::URI.parse(url)
@@ -37,14 +36,14 @@ module NewRelic
37
36
  uri = ::URI.parse(url)
38
37
  end
39
38
  end
40
- uri.host.downcase! unless uri.host.nil?
39
+ uri.host&.downcase!
41
40
  uri
42
41
  end
43
42
 
44
- QUESTION_MARK = "?".freeze
43
+ QUESTION_MARK = '?'
45
44
 
46
45
  def self.strip_query_string(fragment)
47
- if(fragment.include?(QUESTION_MARK))
46
+ if fragment.include?(QUESTION_MARK)
48
47
  fragment.split(QUESTION_MARK).first
49
48
  else
50
49
  fragment
@@ -1,18 +1,16 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
4
5
  require 'new_relic/agent/instrumentation/notifications_subscriber'
5
6
 
6
7
  module NewRelic
7
8
  module Agent
8
9
  module Instrumentation
9
10
  class ActionCableSubscriber < NotificationsSubscriber
10
-
11
11
  PERFORM_ACTION = 'perform_action.action_cable'.freeze
12
12
 
13
- def start(name, id, payload) #THREAD_LOCAL_ACCESS
14
- return unless state.is_execution_traced?
15
-
13
+ def start_segment(name, id, payload) # THREAD_LOCAL_ACCESS
16
14
  finishable = if name == PERFORM_ACTION
17
15
  Tracer.start_transaction_or_segment(
18
16
  name: transaction_name_from_payload(payload),
@@ -22,18 +20,6 @@ module NewRelic
22
20
  Tracer.start_segment(name: metric_name_from_payload(name, payload))
23
21
  end
24
22
  push_segment(id, finishable)
25
- rescue => e
26
- log_notification_error e, name, 'start'
27
- end
28
-
29
- def finish(name, id, payload) #THREAD_LOCAL_ACCESS
30
- return unless state.is_execution_traced?
31
-
32
- notice_error payload if payload.key? :exception
33
- finishable = pop_segment(id)
34
- finishable.finish if finishable
35
- rescue => e
36
- log_notification_error e, name, 'finish'
37
23
  end
38
24
 
39
25
  private
@@ -43,18 +29,17 @@ module NewRelic
43
29
  end
44
30
 
45
31
  def metric_name_from_payload(name, payload)
46
- "Ruby/ActionCable/#{payload[:channel_class]}/#{action_name(name)}"
32
+ "Ruby/ActionCable/#{metric_name(payload)}/#{action_name(name)}"
33
+ end
34
+
35
+ def metric_name(payload)
36
+ payload[:broadcasting] || payload[:channel_class]
47
37
  end
48
38
 
49
39
  DOT_ACTION_CABLE = '.action_cable'.freeze
50
- EMPTY_STRING = ''.freeze
51
40
 
52
41
  def action_name(name)
53
- name.gsub DOT_ACTION_CABLE, EMPTY_STRING
54
- end
55
-
56
- def notice_error(payload)
57
- NewRelic::Agent.notice_error payload[:exception_object]
42
+ name.gsub(DOT_ACTION_CABLE, NewRelic::EMPTY_STR)
58
43
  end
59
44
  end
60
45
  end
@@ -0,0 +1,42 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/notifications_subscriber'
6
+ require 'new_relic/agent/instrumentation/ignore_actions'
7
+ require 'new_relic/agent/parameter_filtering'
8
+
9
+ module NewRelic
10
+ module Agent
11
+ module Instrumentation
12
+ class ActionControllerOtherSubscriber < NotificationsSubscriber
13
+ def add_segment_params(segment, payload)
14
+ segment.params[:filter] = payload[:filter] if payload[:filter]
15
+ segment.params[:keys] = payload[:keys] if payload[:keys]
16
+ segment.params[:original_path] = payload[:request].original_fullpath if payload[:request]
17
+
18
+ if payload[:context]
19
+ segment.params[:action] = payload[:context][:action]
20
+ segment.params[:controller] = payload[:context][:controller]
21
+ end
22
+ end
23
+
24
+ def metric_name(name, payload)
25
+ controller_name = controller_name_for_metric(payload)
26
+ "Ruby/ActionController#{"/#{controller_name}" if controller_name}/#{name.gsub(/\.action_controller/, '')}"
27
+ end
28
+
29
+ def controller_name_for_metric(payload)
30
+ return unless payload
31
+ # redirect_to
32
+ return payload[:request].controller_class.controller_path if payload[:request].respond_to?(:controller_class) && payload[:request].controller_class&.respond_to?(:controller_path)
33
+
34
+ # unpermitted_parameters
35
+ if payload[:context]&.[](:controller) && constantized_class = ::NewRelic::LanguageSupport.constantize(payload[:context][:controller])
36
+ constantized_class.respond_to?(:controller_path) ? constantized_class.controller_path : nil
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end
42
+ end
@@ -1,6 +1,7 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
4
5
  require 'new_relic/agent/instrumentation/notifications_subscriber'
5
6
  require 'new_relic/agent/instrumentation/ignore_actions'
6
7
  require 'new_relic/agent/parameter_filtering'
@@ -9,32 +10,32 @@ module NewRelic
9
10
  module Agent
10
11
  module Instrumentation
11
12
  class ActionControllerSubscriber < NotificationsSubscriber
12
-
13
- def start(name, id, payload) #THREAD_LOCAL_ACCESS
14
- # @req is a historically stable but not guaranteed Rails header property
15
- request = payload[:headers].instance_variable_get(:@req)
16
-
13
+ def start(name, id, payload) # THREAD_LOCAL_ACCESS
17
14
  controller_class = controller_class(payload)
18
15
 
19
16
  if state.is_execution_traced? && !should_ignore(payload, controller_class)
20
- finishable = start_transaction_or_segment(payload, request, controller_class)
17
+ finishable = start_transaction_or_segment(payload, request_for_payload(payload), controller_class)
21
18
  push_segment(id, finishable)
22
19
  else
23
20
  # if this transaction is ignored, make sure child
24
21
  # transaction are also ignored
25
- state.current_transaction.ignore! if state.current_transaction
22
+ state.current_transaction&.ignore!
26
23
  NewRelic::Agent.instance.push_trace_execution_flag(false)
27
24
  end
28
25
  rescue => e
29
26
  log_notification_error(e, name, 'start')
30
27
  end
31
28
 
32
- def finish(name, id, payload) #THREAD_LOCAL_ACCESS
29
+ def finish(name, id, payload) # THREAD_LOCAL_ACCESS
33
30
  finishable = pop_segment(id)
34
31
 
35
32
  if state.is_execution_traced? \
36
33
  && !should_ignore(payload, controller_class(payload))
37
34
 
35
+ if exception = exception_object(payload)
36
+ finishable.notice_error(exception)
37
+ end
38
+
38
39
  finishable.finish
39
40
  else
40
41
  Agent.instance.pop_trace_execution_flag
@@ -45,31 +46,34 @@ module NewRelic
45
46
 
46
47
  def start_transaction_or_segment(payload, request, controller_class)
47
48
  Tracer.start_transaction_or_segment(
48
- name: format_metric_name(payload[:action], controller_class),
49
- category: :controller,
50
- options: {
51
- request: request,
52
- filtered_params: NewRelic::Agent::ParameterFiltering.filter_using_rails(
53
- payload[:params],
54
- Rails.application.config.filter_parameters
55
- ),
56
- apdex_start_time: queue_start(request),
57
- ignore_apdex: NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
58
- ControllerInstrumentation::NR_IGNORE_APDEX_KEY,
59
- controller_class,
60
- payload[:action]
61
- ),
62
- ignore_enduser: NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
63
- ControllerInstrumentation::NR_IGNORE_ENDUSER_KEY,
64
- controller_class,
65
- payload[:action]
66
- )
67
- }
49
+ name: format_metric_name(payload[:action], controller_class),
50
+ category: :controller,
51
+ options: tracer_options(payload, request, controller_class)
68
52
  )
69
53
  end
70
54
 
71
- def format_metric_name(metric_action, controller_name)
72
- controller_class = ::NewRelic::LanguageSupport.constantize(controller_name)
55
+ def tracer_options(payload, request, controller_class)
56
+ {
57
+ request: request,
58
+ filtered_params: filtered_params(payload[:params]),
59
+ apdex_start_time: queue_start(request),
60
+ ignore_apdex: ignore?(payload[:action], ControllerInstrumentation::NR_IGNORE_APDEX_KEY, controller_class),
61
+ ignore_enduser: ignore?(payload[:action],
62
+ ControllerInstrumentation::NR_IGNORE_ENDUSER_KEY,
63
+ controller_class)
64
+ }.merge(NewRelic::Agent::MethodTracerHelpers.code_information(controller_class, payload[:action]))
65
+ end
66
+
67
+ def filtered_params(params)
68
+ NewRelic::Agent::ParameterFiltering.filter_using_rails(params, Rails.application.config.filter_parameters)
69
+ end
70
+
71
+ def ignore?(action, key, controller_class)
72
+ NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(key, controller_class, action)
73
+ end
74
+
75
+ def format_metric_name(metric_action, controller)
76
+ controller_class = controller.is_a?(Class) ? controller : Object.const_get(controller)
73
77
  "Controller/#{controller_class.controller_path}/#{metric_action}"
74
78
  end
75
79
 
@@ -86,10 +90,18 @@ module NewRelic
86
90
  end
87
91
 
88
92
  def queue_start(request)
89
- if request && request.respond_to?(:env)
90
- QueueTime.parse_frontend_timestamp(request.env, Time.now)
93
+ # the following line needs else branch coverage
94
+ if request && request.respond_to?(:env) # rubocop:disable Style/SafeNavigation
95
+ QueueTime.parse_frontend_timestamp(request.env, Process.clock_gettime(Process::CLOCK_REALTIME))
91
96
  end
92
97
  end
98
+
99
+ def request_for_payload(payload)
100
+ # @req is a historically stable but not guaranteed Rails header property
101
+ return unless payload[:headers].instance_variables.include?(:@req)
102
+
103
+ payload[:headers].instance_variable_get(:@req)
104
+ end
93
105
  end
94
106
  end
95
107
  end
@@ -0,0 +1,31 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/action_dispatch_subscriber'
6
+
7
+ DependencyDetection.defer do
8
+ named :action_dispatch
9
+
10
+ depends_on do
11
+ !NewRelic::Agent.config[:disable_action_dispatch]
12
+ end
13
+
14
+ depends_on do
15
+ defined?(ActiveSupport) &&
16
+ defined?(ActionDispatch) &&
17
+ defined?(ActionPack) &&
18
+ ActionPack.respond_to?(:gem_version) &&
19
+ ActionPack.gem_version >= Gem::Version.new('6.0.0') && # notifications for dispatch added in Rails 6
20
+ !NewRelic::Agent::Instrumentation::ActionDispatchSubscriber.subscribed?
21
+ end
22
+
23
+ executes do
24
+ NewRelic::Agent.logger.info('Installing ActionDispatch instrumentation')
25
+ end
26
+
27
+ executes do
28
+ ActiveSupport::Notifications.subscribe(/\A[^\.]+\.action_dispatch\z/,
29
+ NewRelic::Agent::Instrumentation::ActionDispatchSubscriber.new)
30
+ end
31
+ end
@@ -0,0 +1,64 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/notifications_subscriber'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ class ActionDispatchSubscriber < NotificationsSubscriber
11
+ def start(name, id, payload)
12
+ return unless state.is_execution_traced?
13
+
14
+ start_segment(name, id, payload)
15
+ rescue => e
16
+ log_notification_error(e, name, 'start')
17
+ end
18
+
19
+ def finish(name, id, payload)
20
+ return unless state.is_execution_traced?
21
+
22
+ finish_segment(id, payload)
23
+ rescue => e
24
+ log_notification_error(e, name, 'finish')
25
+ end
26
+
27
+ def start_segment(name, id, payload)
28
+ segment = Tracer.start_segment(name: metric_name(name, payload))
29
+ push_segment(id, segment)
30
+ end
31
+
32
+ def finish_segment(id, payload)
33
+ if segment = pop_segment(id)
34
+ if exception = exception_object(payload)
35
+ segment.notice_error(exception)
36
+ end
37
+ segment.finish
38
+ end
39
+ end
40
+
41
+ def metric_name(name, payload)
42
+ middleware = payload[:middleware]
43
+ method = method_from_name(name)
44
+ "Ruby/ActionDispatch/#{middleware}/#{method}"
45
+ end
46
+
47
+ PATTERN = /\A([^\.]+)\.action_dispatch\z/
48
+ UNKNOWN = 'unknown'.freeze
49
+
50
+ METHOD_NAME_MAPPING = Hash.new do |h, k|
51
+ if PATTERN =~ k
52
+ h[k] = $1
53
+ else
54
+ h[k] = UNKNOWN
55
+ end
56
+ end
57
+
58
+ def method_from_name(name)
59
+ METHOD_NAME_MAPPING[name]
60
+ end
61
+ end
62
+ end
63
+ end
64
+ end
@@ -0,0 +1,30 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/action_mailbox_subscriber'
6
+
7
+ DependencyDetection.defer do
8
+ named :action_mailbox
9
+
10
+ depends_on do
11
+ !NewRelic::Agent.config[:disable_action_mailbox]
12
+ end
13
+
14
+ depends_on do
15
+ defined?(ActiveSupport) &&
16
+ defined?(ActionMailbox) &&
17
+ ActionMailbox.respond_to?(:gem_version) && # 'require "action_mailbox"' doesn't require version...
18
+ ActionMailbox.gem_version >= Gem::Version.new('7.1.0.alpha') && # notifications added in Rails 7.1
19
+ !NewRelic::Agent::Instrumentation::ActionMailboxSubscriber.subscribed?
20
+ end
21
+
22
+ executes do
23
+ NewRelic::Agent.logger.info('Installing ActionMailbox instrumentation')
24
+ end
25
+
26
+ executes do
27
+ ActiveSupport::Notifications.subscribe(/\A[^\.]+\.action_mailbox\z/,
28
+ NewRelic::Agent::Instrumentation::ActionMailboxSubscriber.new)
29
+ end
30
+ end
@@ -0,0 +1,33 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/notifications_subscriber'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ class ActionMailboxSubscriber < NotificationsSubscriber
11
+ def metric_name(name, payload)
12
+ mailbox = payload[:mailbox].class.name
13
+ method = method_from_name(name)
14
+ "Ruby/ActionMailbox/#{mailbox}/#{method}"
15
+ end
16
+
17
+ PATTERN = /\A([^\.]*)\.action_mailbox\z/
18
+
19
+ METHOD_NAME_MAPPING = Hash.new do |h, k|
20
+ if PATTERN =~ k
21
+ h[k] = $1
22
+ else
23
+ h[k] = NewRelic::UNKNOWN
24
+ end
25
+ end
26
+
27
+ def method_from_name(name)
28
+ METHOD_NAME_MAPPING[name]
29
+ end
30
+ end
31
+ end
32
+ end
33
+ end
@@ -0,0 +1,30 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/action_mailer_subscriber'
6
+
7
+ DependencyDetection.defer do
8
+ named :action_mailer
9
+
10
+ depends_on do
11
+ !NewRelic::Agent.config[:disable_action_mailer]
12
+ end
13
+
14
+ depends_on do
15
+ defined?(ActiveSupport) &&
16
+ defined?(ActionMailer) &&
17
+ ActionMailer.respond_to?(:gem_version) &&
18
+ ActionMailer.gem_version >= Gem::Version.new('5.0') &&
19
+ !NewRelic::Agent::Instrumentation::ActionMailerSubscriber.subscribed?
20
+ end
21
+
22
+ executes do
23
+ NewRelic::Agent.logger.info('Installing ActionMailer instrumentation')
24
+ end
25
+
26
+ executes do
27
+ ActiveSupport::Notifications.subscribe(/\A(?:[^\.]+)\.action_mailer\z/,
28
+ NewRelic::Agent::Instrumentation::ActionMailerSubscriber.new)
29
+ end
30
+ end
@@ -0,0 +1,85 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require 'new_relic/agent/instrumentation/notifications_subscriber'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ # NOTE: as of v7.1.0.0.alpha, deliver.action_mailer will provide
11
+ # an empty payload hash ({}) to #start, so in this subscriber class
12
+ # we defer params population until #finish and start the segment with
13
+ # a temporary name that is later replaced
14
+ class ActionMailerSubscriber < NotificationsSubscriber
15
+ BASE_NAME = 'Ruby/ActionMailer'
16
+ PAYLOAD_KEYS = %i[action data key mailer message_id perform_deliveries subject]
17
+ PATTERN = /\A([^\.]+)\.action_mailer\z/
18
+ UNKNOWN_MAILER = %r{^#{BASE_NAME}/#{UNKNOWN}/}
19
+
20
+ METHOD_NAME_MAPPING = Hash.new do |h, k|
21
+ if PATTERN =~ k
22
+ h[k] = $1
23
+ else
24
+ h[k] = NewRelic::UNKNOWN
25
+ end
26
+ end
27
+
28
+ def start(name, id, payload)
29
+ return unless state.is_execution_traced?
30
+
31
+ start_segment(name, id, payload)
32
+ rescue => e
33
+ log_notification_error(e, name, 'start')
34
+ end
35
+
36
+ def finish(name, id, payload)
37
+ return unless state.is_execution_traced?
38
+
39
+ finish_segment(id, payload)
40
+ rescue => e
41
+ log_notification_error(e, name, 'finish')
42
+ end
43
+
44
+ private
45
+
46
+ def start_segment(name, id, payload)
47
+ segment = Tracer.start_segment(name: metric_name(name, payload))
48
+ push_segment(id, segment)
49
+ end
50
+
51
+ def finish_segment(id, payload)
52
+ segment = pop_segment(id)
53
+ return unless segment
54
+
55
+ if segment.name.match?(UNKNOWN_MAILER) && payload.key?(:mailer)
56
+ segment.name = segment.name.sub(UNKNOWN_MAILER, "#{BASE_NAME}/#{payload[:mailer]}/")
57
+ end
58
+
59
+ PAYLOAD_KEYS.each do |key|
60
+ segment.params[key] = payload[key] if payload.key?(key)
61
+ end
62
+
63
+ notice_exception(segment, payload)
64
+ segment.finish
65
+ end
66
+
67
+ def notice_exception(segment, payload)
68
+ if exception = exception_object(payload)
69
+ segment.notice_error(exception)
70
+ end
71
+ end
72
+
73
+ def metric_name(name, payload)
74
+ mailer = payload[:mailer] || UNKNOWN
75
+ method = method_from_name(name)
76
+ "#{BASE_NAME}/#{mailer}/#{method}"
77
+ end
78
+
79
+ def method_from_name(name)
80
+ METHOD_NAME_MAPPING[name]
81
+ end
82
+ end
83
+ end
84
+ end
85
+ end
@@ -1,6 +1,7 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
4
5
  require 'new_relic/agent/instrumentation/notifications_subscriber'
5
6
 
6
7
  # Listen for ActiveSupport::Notifications events for ActionView render
@@ -9,25 +10,25 @@ module NewRelic
9
10
  module Agent
10
11
  module Instrumentation
11
12
  class ActionViewSubscriber < NotificationsSubscriber
12
-
13
- def start(name, id, payload) #THREAD_LOCAL_ACCESS
13
+ def start_segment(name, id, payload)
14
14
  parent = segment_stack[id].last
15
15
  metric_name = format_metric_name(name, payload, parent)
16
16
 
17
17
  event = ActionViewEvent.new(metric_name, payload[:identifier])
18
- if state.is_execution_traced? && recordable?(name, metric_name)
18
+
19
+ if recordable?(name, metric_name)
19
20
  event.finishable = Tracer.start_segment(name: metric_name)
20
21
  end
21
- push_segment id, event
22
- rescue => e
23
- log_notification_error(e, name, 'start')
22
+ push_segment(id, event)
24
23
  end
25
24
 
26
- def finish(name, id, payload) #THREAD_LOCAL_ACCESS
27
- event = pop_segment(id)
28
- event.finish if event
29
- rescue => e
30
- log_notification_error(e, name, 'finish')
25
+ def finish_segment(id, payload)
26
+ if segment = pop_segment(id)
27
+ if exception = exception_object(payload)
28
+ segment.notice_error(exception)
29
+ end
30
+ segment.finish
31
+ end
31
32
  end
32
33
 
33
34
  def format_metric_name(event_name, payload, parent)
@@ -54,15 +55,18 @@ module NewRelic
54
55
  || metric_name == "View/#{::NewRelic::Agent::UNKNOWN_METRIC}/Partial"
55
56
  end
56
57
 
57
- RENDER_TEMPLATE_EVENT_NAME = 'render_template.action_view'.freeze
58
- RENDER_PARTIAL_EVENT_NAME = 'render_partial.action_view'.freeze
58
+ RENDER_TEMPLATE_EVENT_NAME = 'render_template.action_view'.freeze
59
+ RENDER_PARTIAL_EVENT_NAME = 'render_partial.action_view'.freeze
59
60
  RENDER_COLLECTION_EVENT_NAME = 'render_collection.action_view'.freeze
61
+ RENDER_LAYOUT_EVENT_NAME = 'render_layout.action_view'.freeze
60
62
 
61
63
  def metric_action(name)
62
64
  case name
63
- when /#{RENDER_TEMPLATE_EVENT_NAME}$/ then 'Rendering'
64
- when RENDER_PARTIAL_EVENT_NAME then 'Partial'
65
- when RENDER_COLLECTION_EVENT_NAME then 'Partial'
65
+ when /#{RENDER_TEMPLATE_EVENT_NAME}$/o then 'Rendering'
66
+ when RENDER_PARTIAL_EVENT_NAME then 'Partial'
67
+ when RENDER_COLLECTION_EVENT_NAME then 'Partial'
68
+ when RENDER_LAYOUT_EVENT_NAME then 'Layout'
69
+ else NewRelic::UNKNOWN
66
70
  end
67
71
  end
68
72
 
@@ -71,7 +75,7 @@ module NewRelic
71
75
  # so do not mistake rendering a collection for rendering a file.
72
76
  if identifier.nil? && name != RENDER_COLLECTION_EVENT_NAME
73
77
  'file'
74
- elsif identifier =~ /template$/
78
+ elsif /template$/.match?(identifier)
75
79
  identifier
76
80
  elsif identifier && (parts = identifier.split('/')).size > 1
77
81
  parts[-2..-1].join('/')
@@ -95,10 +99,13 @@ module NewRelic
95
99
  end
96
100
 
97
101
  def finish
98
- @finishable.finish if @finishable
102
+ @finishable&.finish
103
+ end
104
+
105
+ def notice_error(error)
106
+ @finishable&.notice_error(error)
99
107
  end
100
108
  end
101
109
  end
102
-
103
110
  end
104
111
  end