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
@@ -0,0 +1,43 @@
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
+ module NewRelic::Agent::Instrumentation
6
+ module Rack
7
+ module URLMap
8
+ module Prepend
9
+ def initialize(map = {})
10
+ super(::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map))
11
+ end
12
+ end
13
+ end
14
+
15
+ module Prepend
16
+ include ::NewRelic::Agent::Instrumentation::RackBuilder
17
+
18
+ def self.prepended(builder_class)
19
+ NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
20
+ end
21
+
22
+ def to_app
23
+ with_deferred_dependency_detection { super }
24
+ end
25
+
26
+ def run(app = nil, *args, &block)
27
+ app_or_block = app || block
28
+ run_with_tracing(app_or_block) do |wrapped|
29
+ # Rack::Builder#run for Rack v3+ supports a block, and does not
30
+ # support args. Whether a block or an app is provided, that callable
31
+ # object will be wrapped into a MiddlewareProxy instance. That
32
+ # proxy instance must then be passed to super as the app argument.
33
+ block ? super(wrapped, &nil) : super(wrapped, *args)
34
+ end
35
+ end
36
+
37
+ def use(middleware_class, *args, &blk)
38
+ use_with_tracing(middleware_class) { |wrapped_class| super(wrapped_class, *args, &blk) }
39
+ end
40
+ ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
41
+ end
42
+ end
43
+ end
@@ -1,158 +1,43 @@
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
5
  require 'new_relic/agent/instrumentation/controller_instrumentation'
6
6
 
7
- module NewRelic
8
- module Agent
9
- module Instrumentation
10
- module RackHelpers
11
- def self.version_supported?
12
- rack_version_supported? || puma_rack_version_supported?
13
- end
14
-
15
- def self.rack_version_supported?
16
- return false unless defined? ::Rack
17
-
18
- version = Gem::Version.new(::Rack.release)
19
- min_version = Gem::Version.new('1.1.0')
20
- version >= min_version
21
- end
22
-
23
- def self.puma_rack_version_supported?
24
- return false unless defined? ::Puma::Const::PUMA_VERSION
25
-
26
- version = Gem::Version.new(::Puma::Const::PUMA_VERSION)
27
- min_version = Gem::Version.new('2.12.0')
28
- version >= min_version
29
- end
30
-
31
- def self.middleware_instrumentation_enabled?
32
- version_supported? && !::NewRelic::Agent.config[:disable_middleware_instrumentation]
33
- end
34
-
35
- def self.check_for_late_instrumentation(app)
36
- return if defined?(@checked_for_late_instrumentation) && @checked_for_late_instrumentation
37
- @checked_for_late_instrumentation = true
38
- if middleware_instrumentation_enabled?
39
- if ::NewRelic::Agent::Instrumentation::MiddlewareProxy.needs_wrapping?(app)
40
- ::NewRelic::Agent.logger.info("We weren't able to instrument all of your Rack middlewares.",
41
- "To correct this, ensure you 'require \"newrelic_rpm\"' before setting up your middleware stack.")
42
- end
43
- end
44
- end
45
-
46
- def self.instrument_builder builder_class
47
- ::NewRelic::Agent.logger.info "Installing deferred #{builder_class} instrumentation"
48
-
49
- builder_class.class_eval do
50
- class << self
51
- attr_accessor :_nr_deferred_detection_ran
52
- end
53
- self._nr_deferred_detection_ran = false
54
-
55
- include ::NewRelic::Agent::Instrumentation::RackBuilder
56
-
57
- alias_method :to_app_without_newrelic, :to_app
58
- alias_method :to_app, :to_app_with_newrelic_deferred_dependency_detection
59
-
60
- if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
61
- ::NewRelic::Agent.logger.info "Installing #{builder_class} middleware instrumentation"
62
- alias_method :run_without_newrelic, :run
63
- alias_method :run, :run_with_newrelic
64
-
65
- alias_method :use_without_newrelic, :use
66
- alias_method :use, :use_with_newrelic
67
- end
68
- end
69
-
70
- def self.instrument_url_map url_map_class
71
- url_map_class.class_eval do
72
- alias_method :initialize_without_newrelic, :initialize
73
-
74
- def initialize(map = {})
75
- traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
76
- initialize_without_newrelic(traced_map)
77
- end
78
- end
79
- end
80
- end
81
- end
82
-
83
- module RackBuilder
84
- def run_with_newrelic(app, *args)
85
- if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
86
- wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
87
- run_without_newrelic(wrapped_app, *args)
88
- else
89
- run_without_newrelic(app, *args)
90
- end
91
- end
92
-
93
- def use_with_newrelic(middleware_class, *args, &blk)
94
- if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
95
- wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
96
- use_without_newrelic(wrapped_middleware_class, *args, &blk)
97
- else
98
- use_without_newrelic(middleware_class, *args, &blk)
99
- end
100
- end
101
-
102
- # We patch this method for a reason that actually has nothing to do with
103
- # instrumenting rack itself. It happens to be a convenient and
104
- # easy-to-hook point that happens late in the startup sequence of almost
105
- # every application, making it a good place to do a final call to
106
- # DependencyDetection.detect!, since all libraries are likely loaded at
107
- # this point.
108
- def to_app_with_newrelic_deferred_dependency_detection
109
- unless self.class._nr_deferred_detection_ran
110
- NewRelic::Agent.logger.info "Doing deferred dependency-detection before Rack startup"
111
- DependencyDetection.detect!
112
- self.class._nr_deferred_detection_ran = true
113
- end
114
-
115
- result = to_app_without_newrelic
116
- ::NewRelic::Agent::Instrumentation::RackHelpers.check_for_late_instrumentation(result)
117
-
118
- result
119
- end
120
- end
121
-
122
- module RackURLMap
123
- def self.generate_traced_map(map)
124
- map.inject({}) do |traced_map, (url, handler)|
125
- traced_map[url] = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(handler, true)
126
- traced_map
127
- end
128
- end
129
- end
130
- end
131
- end
132
- end
7
+ require_relative 'rack/helpers'
8
+ require_relative 'rack/instrumentation'
9
+ require_relative 'rack/chain'
10
+ require_relative 'rack/prepend'
133
11
 
134
12
  DependencyDetection.defer do
135
13
  named :rack
136
14
 
137
15
  depends_on do
138
- defined?(::Rack) && defined?(::Rack::Builder)
16
+ defined?(Rack) && defined?(Rack::Builder)
139
17
  end
140
18
 
141
19
  executes do
142
- ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_builder ::Rack::Builder
20
+ if use_prepend?
21
+ prepend_instrument Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
22
+ else
23
+ chain_instrument_target Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
24
+ end
143
25
  end
144
26
  end
145
27
 
146
-
147
28
  DependencyDetection.defer do
148
29
  named :puma_rack
149
30
 
150
31
  depends_on do
151
- defined?(::Puma::Rack::Builder) && !NewRelic::Agent.config[:disable_puma_rack]
32
+ defined?(Puma::Rack::Builder)
152
33
  end
153
34
 
154
35
  executes do
155
- ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_builder ::Puma::Rack::Builder
36
+ if use_prepend?
37
+ prepend_instrument Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
38
+ else
39
+ chain_instrument_target Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
40
+ end
156
41
  end
157
42
  end
158
43
 
@@ -160,16 +45,20 @@ DependencyDetection.defer do
160
45
  named :rack_urlmap
161
46
 
162
47
  depends_on do
163
- defined?(::Rack) && defined?(::Rack::URLMap)
48
+ defined?(Rack) && defined?(Rack::URLMap)
164
49
  end
165
50
 
166
51
  depends_on do
167
- ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled? &&
168
- !::NewRelic::Agent.config[:disable_rack]
52
+ NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
169
53
  end
170
54
 
171
55
  executes do
172
- ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map ::Rack::URLMap
56
+ if use_prepend?
57
+ prepend_instrument Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
58
+ else
59
+ chain_instrument_target Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
60
+ NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map
61
+ end
173
62
  end
174
63
  end
175
64
 
@@ -177,15 +66,18 @@ DependencyDetection.defer do
177
66
  named :puma_rack_urlmap
178
67
 
179
68
  depends_on do
180
- defined? Puma::Rack::URLMap
69
+ defined?(Puma::Rack::URLMap)
181
70
  end
182
71
 
183
72
  depends_on do
184
- ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled? &&
185
- !::NewRelic::Agent.config[:disable_puma_rack]
73
+ NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
186
74
  end
187
75
 
188
76
  executes do
189
- ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map ::Puma::Rack::URLMap
77
+ if use_prepend?
78
+ prepend_instrument Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
79
+ else
80
+ chain_instrument_target Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
81
+ end
190
82
  end
191
83
  end
@@ -1,6 +1,6 @@
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
5
  require 'new_relic/agent/parameter_filtering'
6
6
 
@@ -20,17 +20,16 @@ module NewRelic
20
20
  end
21
21
  end
22
22
 
23
- def process_action(*args) #THREAD_LOCAL_ACCESS
23
+ def process_action(*args) # THREAD_LOCAL_ACCESS
24
24
  munged_params = NewRelic::Agent::ParameterFiltering.filter_rails_request_parameters(request.filtered_parameters)
25
25
  perform_action_with_newrelic_trace(:category => :controller,
26
- :name => self.action_name,
27
- :path => newrelic_metric_path,
28
- :params => munged_params,
29
- :class_name => self.class.name) do
26
+ :name => self.action_name,
27
+ :path => newrelic_metric_path,
28
+ :params => munged_params,
29
+ :class_name => self.class.name) do
30
30
  super
31
31
  end
32
32
  end
33
-
34
33
  end
35
34
 
36
35
  module ActionView
@@ -38,15 +37,16 @@ module NewRelic
38
37
  extend self
39
38
  def template_metric(identifier, options = {})
40
39
  if options[:file]
41
- "file"
40
+ 'file'
42
41
  elsif identifier.nil?
43
42
  ::NewRelic::Agent::UNKNOWN_METRIC
44
- elsif identifier.include? '/' # this is a filepath
43
+ elsif identifier.include?('/') # this is a filepath
45
44
  identifier.split('/')[-2..-1].join('/')
46
45
  else
47
46
  identifier
48
47
  end
49
48
  end
49
+
50
50
  def render_type(file_path)
51
51
  file = File.basename(file_path)
52
52
  if file.starts_with?('_')
@@ -66,7 +66,7 @@ DependencyDetection.defer do
66
66
  @name = :rails3_controller
67
67
 
68
68
  depends_on do
69
- defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 3
69
+ defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 3
70
70
  end
71
71
 
72
72
  depends_on do
@@ -74,7 +74,7 @@ DependencyDetection.defer do
74
74
  end
75
75
 
76
76
  executes do
77
- ::NewRelic::Agent.logger.info 'Installing Rails 3 Controller instrumentation'
77
+ NewRelic::Agent.logger.info('Installing Rails 3 Controller instrumentation')
78
78
  end
79
79
 
80
80
  executes do
@@ -84,52 +84,16 @@ DependencyDetection.defer do
84
84
  end
85
85
  end
86
86
  end
87
- DependencyDetection.defer do
88
- @name = :rails30_view
89
-
90
- depends_on do
91
- defined?(::Rails::VERSION::MAJOR) && defined?(::Rails::VERSION::MINOR) &&
92
- ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 0
93
- end
94
-
95
- depends_on do
96
- !NewRelic::Agent.config[:disable_view_instrumentation]
97
- end
98
-
99
- executes do
100
- ::NewRelic::Agent.logger.info 'Installing Rails 3.0 view instrumentation'
101
- end
102
-
103
- executes do
104
- ActionView::Template.class_eval do
105
- include NewRelic::Agent::MethodTracer
106
- def render_with_newrelic(*args, &block)
107
- options = if @virtual_path && @virtual_path.starts_with?('/') # file render
108
- {:file => true }
109
- else
110
- {}
111
- end
112
- str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(@identifier, options)}/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.render_type(@identifier)}"
113
- trace_execution_scoped str do
114
- render_without_newrelic(*args, &block)
115
- end
116
- end
117
-
118
- alias_method :render_without_newrelic, :render
119
- alias_method :render, :render_with_newrelic
120
-
121
- end
122
- end
123
- end
124
87
 
88
+ # Though this uses the name :rails31_view, it is used only for rails 3.2 now
89
+ # Rails 3.1 is no longer supported by the agent.
125
90
  DependencyDetection.defer do
126
91
  @name = :rails31_view
127
92
 
128
- # We can't be sure that this will work with future versions of Rails 3.
129
- # Currently enabled for Rails 3.1 and 3.2
93
+ # Enabled for Rails 3.2
130
94
  depends_on do
131
- defined?(::Rails::VERSION::MAJOR) && defined?(::Rails::VERSION::MINOR) &&
132
- ::Rails::VERSION::MAJOR.to_i == 3 && ([1,2].member?(::Rails::VERSION::MINOR.to_i))
95
+ defined?(Rails::VERSION::MAJOR) && defined?(Rails::VERSION::MINOR) &&
96
+ Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 2
133
97
  end
134
98
 
135
99
  depends_on do
@@ -137,7 +101,7 @@ DependencyDetection.defer do
137
101
  end
138
102
 
139
103
  executes do
140
- ::NewRelic::Agent.logger.info 'Installing Rails 3.1/3.2 view instrumentation'
104
+ NewRelic::Agent.logger.info('Installing Rails 3.2 view instrumentation')
141
105
  end
142
106
 
143
107
  executes do
@@ -147,10 +111,11 @@ DependencyDetection.defer do
147
111
 
148
112
  def render_with_newrelic(context, options)
149
113
  # This is needed for rails 3.2 compatibility
150
- @details = extract_details(options) if respond_to? :extract_details, true
151
- identifier = determine_template(options) ? determine_template(options).identifier : nil
114
+ @details = extract_details(options) if respond_to?(:extract_details, true)
115
+ # this file can't be found in SimpleCov, need to check test coverage
116
+ identifier = determine_template(options) ? determine_template(options).identifier : nil # rubocop:disable Style/SafeNavigation
152
117
  scope_name = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
153
- trace_execution_scoped scope_name do
118
+ trace_execution_scoped(scope_name) do
154
119
  render_without_newrelic(context, options)
155
120
  end
156
121
  end
@@ -1,6 +1,6 @@
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
5
  require 'new_relic/agent/instrumentation/middleware_proxy'
6
6
 
@@ -8,15 +8,15 @@ DependencyDetection.defer do
8
8
  named :rails_middleware
9
9
 
10
10
  depends_on do
11
- !::NewRelic::Agent.config[:disable_middleware_instrumentation]
11
+ !NewRelic::Agent.config[:disable_middleware_instrumentation]
12
12
  end
13
13
 
14
14
  depends_on do
15
- defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 3
15
+ defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 3
16
16
  end
17
17
 
18
18
  executes do
19
- ::NewRelic::Agent.logger.info("Installing Rails 3+ middleware instrumentation")
19
+ NewRelic::Agent.logger.info('Installing Rails 3+ middleware instrumentation')
20
20
  module ActionDispatch
21
21
  class MiddlewareStack
22
22
  class Middleware
@@ -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/action_cable_subscriber'
5
6
  require 'new_relic/agent/prepend_supportability'
6
7
 
@@ -8,9 +9,9 @@ DependencyDetection.defer do
8
9
  @name = :action_cable_notifications
9
10
 
10
11
  depends_on do
11
- defined?(::Rails::VERSION::MAJOR) &&
12
- ::Rails::VERSION::MAJOR.to_i >= 5 &&
13
- defined?(::ActionCable)
12
+ defined?(ActionCable::VERSION::MAJOR) &&
13
+ ActionCable::VERSION::MAJOR.to_i >= 5 &&
14
+ defined?(ActiveSupport)
14
15
  end
15
16
 
16
17
  depends_on do
@@ -19,17 +20,17 @@ DependencyDetection.defer do
19
20
  end
20
21
 
21
22
  executes do
22
- ::NewRelic::Agent.logger.info 'Installing notifications based Action Cable instrumentation'
23
+ NewRelic::Agent.logger.info('Installing notifications based Action Cable instrumentation')
23
24
  end
24
25
 
25
26
  executes do
26
27
  # enumerate the specific events we want so that we do not get unexpected additions in the future
27
- ActiveSupport::Notifications.subscribe(/(perform_action|transmit)\.action_cable/,
28
+ ActiveSupport::Notifications.subscribe(/\A(?:perform_action|transmit|broadcast)\.action_cable\z/,
28
29
  NewRelic::Agent::Instrumentation::ActionCableSubscriber.new)
29
30
 
30
31
  ActiveSupport.on_load(:action_cable) do
31
- ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionCable::Engine) if defined?(::ActionCable::Engine)
32
- ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionCable::RemoteConnections) if defined?(::ActionCable::RemoteConnections)
32
+ NewRelic::Agent::PrependSupportability.record_metrics_for(ActionCable::Engine) if defined?(ActionCable::Engine)
33
+ NewRelic::Agent::PrependSupportability.record_metrics_for(ActionCable::RemoteConnections) if defined?(ActionCable::RemoteConnections)
33
34
  end
34
35
  end
35
36
  end
@@ -1,23 +1,25 @@
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/action_controller_subscriber'
6
+ require 'new_relic/agent/instrumentation/action_controller_other_subscriber'
5
7
  require 'new_relic/agent/prepend_supportability'
6
8
 
7
-
8
9
  DependencyDetection.defer do
9
10
  @name = :action_controller_notifications
10
11
 
11
12
  depends_on do
12
- defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 4
13
+ defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 4
13
14
  end
14
15
 
15
16
  depends_on do
16
- defined?(ActionController) && (defined?(ActionController::Base) || defined?(ActionController::API))
17
+ !NewRelic::Agent.config[:disable_action_controller] &&
18
+ defined?(ActionController) && (defined?(ActionController::Base) || defined?(ActionController::API))
17
19
  end
18
20
 
19
21
  executes do
20
- ::NewRelic::Agent.logger.info 'Installing notifications based Action Controller instrumentation'
22
+ NewRelic::Agent.logger.info('Installing notifications based Action Controller instrumentation')
21
23
  end
22
24
 
23
25
  executes do
@@ -29,5 +31,15 @@ DependencyDetection.defer do
29
31
 
30
32
  NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
31
33
  .subscribe(/^process_action.action_controller$/)
34
+
35
+ subs = %w[send_file
36
+ send_data
37
+ redirect_to
38
+ halted_callback
39
+ unpermitted_parameters]
40
+
41
+ # have to double escape period because its going from string -> regex
42
+ NewRelic::Agent::Instrumentation::ActionControllerOtherSubscriber \
43
+ .subscribe(Regexp.new("^(#{subs.join('|')})\\.action_controller$"))
32
44
  end
33
45
  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/action_view_subscriber'
5
6
  require 'new_relic/agent/prepend_supportability'
6
7
 
@@ -8,7 +9,7 @@ DependencyDetection.defer do
8
9
  @name = :action_view_notifications
9
10
 
10
11
  depends_on do
11
- defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 4
12
+ defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 4
12
13
  end
13
14
 
14
15
  depends_on do
@@ -17,11 +18,13 @@ DependencyDetection.defer do
17
18
  end
18
19
 
19
20
  executes do
20
- NewRelic::Agent.logger.info 'Installing notification based Action View instrumentation'
21
+ NewRelic::Agent.logger.info('Installing notification based Action View instrumentation')
21
22
  end
22
23
 
23
24
  executes do
24
- NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
25
- NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
25
+ ActiveSupport.on_load(:action_view) do
26
+ NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
27
+ NewRelic::Agent::PrependSupportability.record_metrics_for(ActionView::Base, ActionView::Template, ActionView::Renderer)
28
+ end
26
29
  end
27
30
  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/custom_events_subscriber'
6
+ require 'new_relic/agent/prepend_supportability'
7
+
8
+ DependencyDetection.defer do
9
+ @name = :custom_event_notifications
10
+
11
+ depends_on do
12
+ defined?(ActiveSupport::Notifications) &&
13
+ defined?(ActiveSupport::IsolatedExecutionState)
14
+ end
15
+
16
+ depends_on do
17
+ !NewRelic::Agent.config[:active_support_custom_events_names].empty? &&
18
+ !NewRelic::Agent::Instrumentation::CustomEventsSubscriber.subscribed?
19
+ end
20
+
21
+ executes do
22
+ NewRelic::Agent.logger.info('Installing notifications based ActiveSupport custom events instrumentation')
23
+ end
24
+
25
+ executes do
26
+ NewRelic::Agent.config[:active_support_custom_events_names].each do |name|
27
+ ActiveSupport::Notifications.subscribe(name, NewRelic::Agent::Instrumentation::CustomEventsSubscriber.new)
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,20 @@
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
+ module NewRelic::Agent::Instrumentation
6
+ module Rake
7
+ module Chain
8
+ def self.instrument!
9
+ ::Rake::Task.class_eval do
10
+ include NewRelic::Agent::Instrumentation::Rake::Tracer
11
+ alias_method(:invoke_without_newrelic, :invoke)
12
+
13
+ def invoke(*args)
14
+ invoke_with_newrelic_tracing(*args) { invoke_without_newrelic(*args) }
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end