newrelic_rpm 6.15.0 → 8.13.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (427) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +7 -1
  3. data/.rubocop.yml +1817 -0
  4. data/.rubocop_todo.yml +59 -0
  5. data/.simplecov +15 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +1 -0
  8. data/Brewfile +12 -0
  9. data/CHANGELOG.md +754 -40
  10. data/CONTRIBUTING.md +32 -5
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +0 -1
  14. data/Guardfile +9 -8
  15. data/LICENSE +0 -6
  16. data/README.md +21 -20
  17. data/Rakefile +27 -29
  18. data/THIRD_PARTY_NOTICES.md +14 -199
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +76 -53
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +4 -6
  26. data/install.rb +2 -2
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
  29. data/lib/new_relic/agent/agent/shutdown.rb +35 -0
  30. data/lib/new_relic/agent/agent/special_startup.rb +72 -0
  31. data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
  32. data/lib/new_relic/agent/agent/startup.rb +197 -0
  33. data/lib/new_relic/agent/agent.rb +178 -555
  34. data/lib/new_relic/agent/agent_logger.rb +23 -19
  35. data/lib/new_relic/agent/attribute_filter.rb +66 -47
  36. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  37. data/lib/new_relic/agent/attributes.rb +5 -4
  38. data/lib/new_relic/agent/audit_logger.rb +8 -3
  39. data/lib/new_relic/agent/autostart.rb +20 -19
  40. data/lib/new_relic/agent/chained_call.rb +1 -1
  41. data/lib/new_relic/agent/commands/agent_command.rb +3 -3
  42. data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
  43. data/lib/new_relic/agent/commands/thread_profiler_session.rb +9 -7
  44. data/lib/new_relic/agent/configuration/default_source.rb +1728 -1194
  45. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  46. data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
  47. data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
  48. data/lib/new_relic/agent/configuration/high_security_source.rb +9 -8
  49. data/lib/new_relic/agent/configuration/manager.rb +82 -69
  50. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  51. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  52. data/lib/new_relic/agent/configuration/security_policy_source.rb +90 -77
  53. data/lib/new_relic/agent/configuration/server_source.rb +21 -19
  54. data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
  55. data/lib/new_relic/agent/configuration.rb +1 -1
  56. data/lib/new_relic/agent/connect/request_builder.rb +18 -18
  57. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  58. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
  59. data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
  60. data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
  61. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  62. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  63. data/lib/new_relic/agent/database.rb +53 -47
  64. data/lib/new_relic/agent/database_adapter.rb +3 -1
  65. data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
  66. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  67. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
  68. data/lib/new_relic/agent/datastores/mongo.rb +6 -11
  69. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  70. data/lib/new_relic/agent/datastores/redis.rb +5 -11
  71. data/lib/new_relic/agent/datastores.rb +11 -13
  72. data/lib/new_relic/agent/deprecator.rb +1 -1
  73. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
  74. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +39 -32
  75. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
  76. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
  77. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
  79. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
  80. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
  81. data/lib/new_relic/agent/distributed_tracing.rb +32 -100
  82. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  83. data/lib/new_relic/agent/error_collector.rb +73 -54
  84. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  85. data/lib/new_relic/agent/error_filter.rb +174 -0
  86. data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
  87. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  88. data/lib/new_relic/agent/event_buffer.rb +7 -8
  89. data/lib/new_relic/agent/event_listener.rb +1 -2
  90. data/lib/new_relic/agent/event_loop.rb +25 -23
  91. data/lib/new_relic/agent/external.rb +11 -44
  92. data/lib/new_relic/agent/guid_generator.rb +4 -11
  93. data/lib/new_relic/agent/harvester.rb +4 -5
  94. data/lib/new_relic/agent/heap.rb +6 -8
  95. data/lib/new_relic/agent/hostname.rb +20 -13
  96. data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
  97. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
  98. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
  99. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
  100. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
  101. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
  102. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
  103. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
  104. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +8 -8
  105. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
  106. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -13
  107. data/lib/new_relic/agent/instrumentation/active_job.rb +14 -7
  108. data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
  109. data/lib/new_relic/agent/instrumentation/active_record.rb +29 -27
  110. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
  111. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +31 -44
  112. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
  113. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
  114. data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
  115. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +18 -15
  116. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  117. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  118. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  119. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  120. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +18 -10
  121. data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -2
  122. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  123. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  124. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  125. data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
  126. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +68 -58
  127. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  128. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  129. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  130. data/lib/new_relic/agent/instrumentation/curb.rb +11 -243
  131. data/lib/new_relic/agent/instrumentation/data_mapper.rb +65 -54
  132. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
  133. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  134. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  135. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +29 -53
  136. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  137. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  138. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  139. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  140. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +5 -5
  141. data/lib/new_relic/agent/instrumentation/excon.rb +22 -24
  142. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  143. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  144. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  145. data/lib/new_relic/agent/instrumentation/grape.rb +11 -112
  146. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  147. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  148. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  149. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  150. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  151. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  152. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  153. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  154. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  155. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  156. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  157. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  158. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  159. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  160. data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
  161. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  162. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  163. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  164. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  165. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
  166. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  167. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  168. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  169. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  170. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  171. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +57 -128
  172. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  173. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  174. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
  175. data/lib/new_relic/agent/instrumentation/memcache.rb +56 -72
  176. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -12
  177. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
  178. data/lib/new_relic/agent/instrumentation/mongo.rb +5 -136
  179. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
  180. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  181. data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +13 -13
  182. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  183. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  184. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +10 -9
  185. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  186. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  187. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  188. data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
  189. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
  190. data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
  191. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  192. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  193. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  194. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  195. data/lib/new_relic/agent/instrumentation/rack.rb +30 -140
  196. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +16 -52
  197. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  198. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +5 -4
  199. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -3
  200. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
  201. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +13 -3
  202. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  203. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
  204. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  205. data/lib/new_relic/agent/instrumentation/rake.rb +16 -157
  206. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  207. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  208. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +72 -0
  209. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  210. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  211. data/lib/new_relic/agent/instrumentation/redis.rb +18 -107
  212. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  213. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  214. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  215. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  216. data/lib/new_relic/agent/instrumentation/resque.rb +28 -39
  217. data/lib/new_relic/agent/instrumentation/sequel.rb +14 -16
  218. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
  219. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  220. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  221. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  222. data/lib/new_relic/agent/instrumentation/sidekiq.rb +23 -64
  223. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  224. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
  225. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
  226. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  227. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  228. data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
  229. data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -3
  230. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  231. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  232. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  233. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  234. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  235. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  236. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  237. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  238. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  239. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  240. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  241. data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
  242. data/lib/new_relic/agent/instrumentation.rb +1 -1
  243. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  244. data/lib/new_relic/agent/javascript_instrumentor.rb +47 -41
  245. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  246. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  247. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  248. data/lib/new_relic/agent/log_once.rb +1 -1
  249. data/lib/new_relic/agent/log_priority.rb +20 -0
  250. data/lib/new_relic/agent/logging.rb +24 -21
  251. data/lib/new_relic/agent/memory_logger.rb +2 -2
  252. data/lib/new_relic/agent/messaging.rb +65 -81
  253. data/lib/new_relic/agent/method_tracer.rb +154 -149
  254. data/lib/new_relic/agent/method_tracer_helpers.rb +85 -3
  255. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +25 -17
  256. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  257. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  258. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
  259. data/lib/new_relic/agent/monitors.rb +6 -7
  260. data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
  261. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
  262. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  263. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -4
  264. data/lib/new_relic/agent/new_relic_service.rb +248 -196
  265. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  266. data/lib/new_relic/agent/null_logger.rb +7 -3
  267. data/lib/new_relic/agent/obfuscator.rb +8 -10
  268. data/lib/new_relic/agent/parameter_filtering.rb +24 -10
  269. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  270. data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
  271. data/lib/new_relic/agent/pipe_service.rb +8 -5
  272. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  273. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
  274. data/lib/new_relic/agent/range_extensions.rb +8 -28
  275. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  276. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -13
  277. data/lib/new_relic/agent/rules_engine.rb +5 -4
  278. data/lib/new_relic/agent/sampler.rb +3 -4
  279. data/lib/new_relic/agent/sampler_collection.rb +3 -4
  280. data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
  281. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +12 -9
  282. data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
  283. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  284. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  285. data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
  286. data/lib/new_relic/agent/span_event_primitive.rb +62 -56
  287. data/lib/new_relic/agent/sql_sampler.rb +18 -18
  288. data/lib/new_relic/agent/stats.rb +78 -41
  289. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  290. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  291. data/lib/new_relic/agent/stats_engine.rb +8 -8
  292. data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
  293. data/lib/new_relic/agent/system_info.rb +85 -65
  294. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  295. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  296. data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
  297. data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
  298. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  299. data/lib/new_relic/agent/tracer.rb +76 -85
  300. data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
  301. data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
  302. data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
  303. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  304. data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
  305. data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
  306. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  307. data/lib/new_relic/agent/transaction/segment.rb +14 -10
  308. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  309. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  310. data/lib/new_relic/agent/transaction/trace.rb +15 -11
  311. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  312. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  313. data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
  314. data/lib/new_relic/agent/transaction/tracing.rb +14 -11
  315. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +4 -4
  316. data/lib/new_relic/agent/transaction.rb +164 -145
  317. data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
  318. data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
  319. data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
  320. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  321. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  322. data/lib/new_relic/agent/transaction_sampler.rb +5 -6
  323. data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
  324. data/lib/new_relic/agent/utilization/aws.rb +33 -3
  325. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  326. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  327. data/lib/new_relic/agent/utilization/pcf.rb +5 -4
  328. data/lib/new_relic/agent/utilization/vendor.rb +43 -28
  329. data/lib/new_relic/agent/utilization_data.rb +7 -5
  330. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  331. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
  332. data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
  333. data/lib/new_relic/agent/vm/snapshot.rb +5 -5
  334. data/lib/new_relic/agent/vm.rb +1 -1
  335. data/lib/new_relic/agent/worker_loop.rb +10 -12
  336. data/lib/new_relic/agent.rb +64 -75
  337. data/lib/new_relic/cli/command.rb +20 -22
  338. data/lib/new_relic/cli/commands/deployments.rb +92 -42
  339. data/lib/new_relic/cli/commands/install.rb +12 -15
  340. data/lib/new_relic/coerce.rb +15 -13
  341. data/lib/new_relic/collection_helper.rb +50 -48
  342. data/lib/new_relic/constants.rb +1 -4
  343. data/lib/new_relic/control/class_methods.rb +3 -3
  344. data/lib/new_relic/control/frameworks/external.rb +2 -2
  345. data/lib/new_relic/control/frameworks/rails.rb +23 -17
  346. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  347. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  348. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  349. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  350. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  351. data/lib/new_relic/control/frameworks.rb +1 -1
  352. data/lib/new_relic/control/instance_methods.rb +23 -45
  353. data/lib/new_relic/control/instrumentation.rb +39 -11
  354. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  355. data/lib/new_relic/control/server_methods.rb +3 -4
  356. data/lib/new_relic/control.rb +1 -2
  357. data/lib/new_relic/delayed_job_injection.rb +1 -1
  358. data/lib/new_relic/dependency_detection.rb +126 -19
  359. data/lib/new_relic/environment_report.rb +40 -32
  360. data/lib/new_relic/helper.rb +48 -7
  361. data/lib/new_relic/language_support.rb +29 -5
  362. data/lib/new_relic/latest_changes.rb +7 -6
  363. data/lib/new_relic/local_environment.rb +24 -18
  364. data/lib/new_relic/metric_data.rb +31 -26
  365. data/lib/new_relic/metric_spec.rb +8 -6
  366. data/lib/new_relic/noticed_error.rb +22 -30
  367. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  368. data/lib/new_relic/rack/agent_middleware.rb +5 -3
  369. data/lib/new_relic/rack/browser_monitoring.rb +133 -123
  370. data/lib/new_relic/rack.rb +1 -1
  371. data/lib/new_relic/recipes/capistrano3.rb +3 -61
  372. data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
  373. data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
  374. data/lib/new_relic/recipes.rb +1 -1
  375. data/lib/new_relic/supportability_helper.rb +9 -10
  376. data/lib/new_relic/traced_thread.rb +35 -0
  377. data/lib/new_relic/version.rb +6 -17
  378. data/lib/newrelic_rpm.rb +11 -35
  379. data/lib/sequel/extensions/newrelic_instrumentation.rb +12 -15
  380. data/lib/sequel/plugins/newrelic_instrumentation.rb +4 -10
  381. data/lib/tasks/all.rb +3 -3
  382. data/lib/tasks/config.rake +22 -117
  383. data/lib/tasks/coverage_report.rake +28 -0
  384. data/lib/tasks/helpers/config.html.erb +21 -0
  385. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  386. data/lib/tasks/helpers/format.rb +123 -0
  387. data/lib/tasks/helpers/matches.rb +12 -0
  388. data/lib/tasks/helpers/prompt.rb +24 -0
  389. data/lib/tasks/helpers/removers.rb +33 -0
  390. data/lib/tasks/install.rake +4 -0
  391. data/lib/tasks/instrumentation_generator/README.md +63 -0
  392. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  393. data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
  394. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  395. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  396. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  397. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  398. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  399. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  400. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  401. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  402. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  403. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  404. data/lib/tasks/multiverse.rake +4 -0
  405. data/lib/tasks/multiverse.rb +5 -32
  406. data/lib/tasks/newrelic.rb +1 -1
  407. data/lib/tasks/tests.rake +10 -15
  408. data/newrelic.yml +648 -3
  409. data/newrelic_rpm.gemspec +25 -25
  410. data/recipes/newrelic.rb +2 -2
  411. data/test/agent_helper.rb +219 -178
  412. metadata +164 -122
  413. data/ROADMAP.md +0 -24
  414. data/bin/mongrel_rpm +0 -33
  415. data/cert/cacert.pem +0 -1177
  416. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  417. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  418. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  419. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  420. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  421. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  422. data/lib/new_relic/agent/instrumentation/net.rb +0 -70
  423. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  424. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  425. data/lib/new_relic/agent/supported_versions.rb +0 -275
  426. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  427. data/lib/tasks/config.html.erb +0 -32
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  DependencyDetection.defer do
6
6
  named :data_mapper
@@ -13,74 +13,85 @@ DependencyDetection.defer do
13
13
  end
14
14
 
15
15
  executes do
16
- ::NewRelic::Agent.logger.info 'Installing DataMapper instrumentation'
16
+ ::NewRelic::Agent.logger.info('Installing DataMapper instrumentation')
17
17
  require 'new_relic/agent/datastores/metric_helper'
18
+
19
+ deprecation_msg = 'The instrumentation for DataMapper is deprecated. ' \
20
+ 'It will be removed in version 9.0.0.' \
21
+ 'Visit https://docs.newrelic.com/docs/apm/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks ' \
22
+ 'to learn about supported gems.'
23
+
24
+ ::NewRelic::Agent.logger.log_once(
25
+ :warn,
26
+ :deprecated_datamapper,
27
+ deprecation_msg
28
+ )
18
29
  end
19
30
 
20
31
  executes do
21
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :get
22
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :first
23
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :last
24
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :all
25
-
26
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create
27
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create!
28
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update
29
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update!
30
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy
31
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy!
32
-
33
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :aggregate
34
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find
35
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find_by_sql
32
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :get)
33
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :first)
34
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :last)
35
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :all)
36
+
37
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create)
38
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create!)
39
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update)
40
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update!)
41
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy)
42
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy!)
43
+
44
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :aggregate)
45
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find)
46
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find_by_sql)
36
47
  end
37
48
 
38
49
  executes do
39
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update
40
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update!
41
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save
42
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save!
43
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy
44
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy!
50
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update)
51
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update!)
52
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save)
53
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save!)
54
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy)
55
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy!)
45
56
  end
46
57
 
47
58
  executes do
48
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :get
49
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :first
50
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :last
51
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :all
59
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :get)
60
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :first)
61
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :last)
62
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :all)
52
63
 
53
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :lazy_load
64
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :lazy_load)
54
65
 
55
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create
56
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create!
57
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update
58
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update!
59
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy
60
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy!
66
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create)
67
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create!)
68
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update)
69
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update!)
70
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy)
71
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy!)
61
72
 
62
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :aggregate
73
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :aggregate)
63
74
  end
64
75
 
65
76
  executes do
66
77
  # Catch direct SQL calls that bypass CRUD
67
78
  if defined?(::DataMapper::Adapters::DataObjectsAdapter)
68
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :select, true
69
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :execute, true
79
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :select, true)
80
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :execute, true)
70
81
  end
71
82
  end
72
83
 
73
84
  executes do
74
85
  # DM::Validations overrides Model#create, so we patch it here as well
75
86
  if defined?(::DataMapper::Validations::ClassMethods)
76
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Validations::ClassMethods, :create
87
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Validations::ClassMethods, :create)
77
88
  end
78
89
  end
79
90
 
80
91
  executes do
81
92
  # DM::Transaction calls commit() twice, so potentially shows up twice.
82
93
  if defined?(::DataMapper::Transaction)
83
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Transaction, :commit, true
94
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Transaction, :commit, true)
84
95
  end
85
96
  end
86
97
 
@@ -100,10 +111,10 @@ module NewRelic
100
111
  clazz.class_eval do
101
112
  if method_defined?(method_name) || private_method_defined?(method_name)
102
113
  define_method("#{method_name}_with_newrelic",
103
- NewRelic::Agent::DataMapperTracing.method_body(clazz, method_name, operation_only))
114
+ NewRelic::Agent::DataMapperTracing.method_body(clazz, method_name, operation_only))
104
115
 
105
- alias_method "#{method_name}_without_newrelic", method_name
106
- alias_method method_name, "#{method_name}_with_newrelic"
116
+ alias_method("#{method_name}_without_newrelic", method_name)
117
+ alias_method(method_name, "#{method_name}_with_newrelic")
107
118
  end
108
119
  end
109
120
  end
@@ -114,10 +125,10 @@ module NewRelic
114
125
  PASSWORD_PARAM = '&password='.freeze
115
126
 
116
127
  def self.method_body(clazz, method_name, operation_only)
117
- use_model_name = NewRelic::Helper.instance_methods_include?(clazz, :model)
128
+ use_model_name = NewRelic::Helper.instance_methods_include?(clazz, :model)
118
129
  metric_operation = method_name.to_s.gsub(/[!?]/, "")
119
130
 
120
- Proc.new do |*args, &blk|
131
+ proc do |*args, &blk|
121
132
  begin
122
133
  if operation_only
123
134
  # Used by direct SQL, like ::DataMapper::Adapters::DataObjectsAdapter#select
@@ -140,7 +151,7 @@ module NewRelic
140
151
  )
141
152
 
142
153
  begin
143
- NewRelic::Agent::Tracer.capture_segment_error segment do
154
+ NewRelic::Agent::Tracer.capture_segment_error(segment) do
144
155
  self.send("#{method_name}_without_newrelic", *args, &blk)
145
156
  end
146
157
  rescue ::DataObjects::ConnectionError => e
@@ -152,15 +163,15 @@ module NewRelic
152
163
  case strategy
153
164
  when :obfuscated
154
165
  adapter_name = if self.respond_to?(:options)
155
- self.options[:adapter]
166
+ self.options[:adapter]
167
+ else
168
+ if self.repository.adapter.respond_to?(:options)
169
+ self.repository.adapter.options[:adapter]
156
170
  else
157
- if self.repository.adapter.respond_to?(:options)
158
- self.repository.adapter.options[:adapter]
159
- else
160
- # DataMapper < 0.10.0
161
- self.repository.adapter.uri.scheme
162
- end
171
+ # DataMapper < 0.10.0
172
+ self.repository.adapter.uri.scheme
163
173
  end
174
+ end
164
175
  statement = NewRelic::Agent::Database::Statement.new(e.query, :adapter => adapter_name)
165
176
  obfuscated_sql = NewRelic::Agent::Database.obfuscate_sql(statement)
166
177
  e.instance_variable_set(:@query, obfuscated_sql)
@@ -186,14 +197,14 @@ module NewRelic
186
197
  # We rely on the assumption that all possible entry points have been
187
198
  # hooked with tracers, ensuring that notice_sql attaches this SQL to
188
199
  # the proper call scope.
189
- def log(msg) #THREAD_LOCAL_ACCESS
200
+ def log(msg) # THREAD_LOCAL_ACCESS
190
201
  state = NewRelic::Agent::Tracer.state
191
202
  return unless state.is_execution_traced?
192
203
 
193
204
  txn = state.current_transaction
194
205
 
195
206
  if txn && txn.current_segment.respond_to?(:notice_sql)
196
- txn.current_segment.notice_sql msg.query
207
+ txn.current_segment.notice_sql(msg.query)
197
208
  end
198
209
  ensure
199
210
  super
@@ -0,0 +1,35 @@
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
+ require_relative 'instrumentation'
5
+
6
+ module NewRelic::Agent::Instrumentation
7
+ module DelayedJob
8
+ module Chain
9
+ def self.instrument!
10
+ Delayed::Worker.class_eval do
11
+ include NewRelic::Agent::Instrumentation::DelayedJob
12
+
13
+ def initialize_with_new_relic(*args)
14
+ initialize_with_tracing { initialize_without_new_relic(*args) }
15
+ end
16
+
17
+ alias initialize_without_new_relic initialize
18
+ alias initialize initialize_with_new_relic
19
+
20
+ def install_newrelic_job_tracer
21
+ Delayed::Job.class_eval do
22
+ include NewRelic::Agent::Instrumentation::DelayedJobTracer
23
+
24
+ alias_method(:invoke_job_without_new_relic, :invoke_job)
25
+
26
+ def invoke_job(*args, &block)
27
+ invoke_job_with_tracing { invoke_job_without_new_relic(*args, &block) }
28
+ end
29
+ end
30
+ end
31
+ end
32
+ end
33
+ end
34
+ end
35
+ end
@@ -0,0 +1,48 @@
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
6
+ module Agent
7
+ module Instrumentation
8
+ module DelayedJob
9
+ def initialize_with_tracing
10
+ yield
11
+ worker_name = case
12
+ when self.respond_to?(:name) then self.name
13
+ when self.class.respond_to?(:default_name) then self.class.default_name
14
+ end
15
+ NewRelic::DelayedJobInjection.worker_name = worker_name
16
+
17
+ # TODO: Refactor the last line of this condition so that it can be evaluated in both prepend and chain instrumentation
18
+ if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job) &&
19
+ !(::Delayed::Job.method_defined?(:invoke_job_without_new_relic))
20
+
21
+ ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 2/2]')
22
+ install_newrelic_job_tracer
23
+ NewRelic::Control.instance.init_plugin(:dispatcher => :delayed_job)
24
+ else
25
+ NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
26
+ end
27
+ end
28
+ end
29
+
30
+ module DelayedJobTracer
31
+ include NewRelic::Agent::Instrumentation::ControllerInstrumentation
32
+
33
+ NR_TRANSACTION_CATEGORY = 'OtherTransaction/DelayedJob'.freeze
34
+
35
+ def invoke_job_with_tracing
36
+ options = {
37
+ :category => NR_TRANSACTION_CATEGORY,
38
+ :path => ::NewRelic::Agent::Instrumentation::DelayedJob::Naming.name_from_payload(payload_object)
39
+ }
40
+
41
+ perform_action_with_newrelic_trace(options) do
42
+ yield
43
+ end
44
+ end
45
+ end
46
+ end
47
+ end
48
+ 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_relative 'instrumentation'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ module DelayedJob
11
+ module Prepend
12
+ include NewRelic::Agent::Instrumentation::DelayedJob
13
+
14
+ def initialize(*args)
15
+ initialize_with_tracing { super }
16
+ end
17
+
18
+ def install_newrelic_job_tracer
19
+ Delayed::Job.send(:prepend, ::NewRelic::Agent::Instrumentation::DelayedJobTracerPrepend)
20
+ end
21
+ end
22
+ end
23
+
24
+ module DelayedJobTracerPrepend
25
+ include NewRelic::Agent::Instrumentation::DelayedJobTracer
26
+
27
+ def invoke_job(*args, &block)
28
+ invoke_job_with_tracing { super }
29
+ end
30
+ end
31
+ end
32
+ end
33
+ end
@@ -1,6 +1,9 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'delayed_job/chain'
6
+ require_relative 'delayed_job/prepend'
4
7
 
5
8
  require 'new_relic/agent/instrumentation/controller_instrumentation'
6
9
 
@@ -11,14 +14,14 @@ module NewRelic
11
14
  module Naming
12
15
  module_function
13
16
 
14
- CLASS_METHOD_DELIMITER = '.'.freeze
15
- INSTANCE_METHOD_DELIMITER = '#'.freeze
17
+ CLASS_METHOD_DELIMITER = '.'.freeze
18
+ INSTANCE_METHOD_DELIMITER = '#'.freeze
16
19
  LEGACY_DJ_FORMAT_DELIMITER = ';'.freeze
17
- LEGACY_DJ_FORMAT_PREFIX = 'LOAD'.freeze
18
- LEGACY_DJ_DEFAULT_CLASS = '(unknown class)'.freeze
20
+ LEGACY_DJ_FORMAT_PREFIX = 'LOAD'.freeze
21
+ LEGACY_DJ_DEFAULT_CLASS = '(unknown class)'.freeze
19
22
 
20
23
  def name_from_payload(payload_object)
21
- if payload_object.is_a? ::Delayed::PerformableMethod
24
+ if payload_object.is_a?(::Delayed::PerformableMethod)
22
25
  # payload_object contains a reference to an object
23
26
  # that received an asynchronous method call via .delay or .handle_asynchronously
24
27
  "#{object_name(payload_object)}#{delimiter(payload_object)}#{method_name(payload_object)}"
@@ -76,63 +79,36 @@ DependencyDetection.defer do
76
79
  @name = :delayed_job
77
80
 
78
81
  depends_on do
79
- !NewRelic::Agent.config[:disable_dj]
82
+ defined?(::Delayed) && defined?(::Delayed::Worker)
80
83
  end
81
84
 
82
- depends_on do
83
- defined?(::Delayed) && defined?(::Delayed::Worker) && !NewRelic::Agent.config[:disable_dj]
85
+ executes do
86
+ ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 1/2]')
84
87
  end
85
88
 
86
89
  executes do
87
- ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 1/2]'
90
+ if use_prepend?
91
+ prepend_instrument ::Delayed::Worker, ::NewRelic::Agent::Instrumentation::DelayedJob::Prepend
92
+ else
93
+ chain_instrument ::NewRelic::Agent::Instrumentation::DelayedJob::Chain
94
+ end
88
95
  end
89
96
 
90
97
  executes do
91
- Delayed::Worker.class_eval do
92
-
93
- def initialize_with_new_relic(*args)
94
- initialize_without_new_relic(*args)
95
- worker_name = case
96
- when self.respond_to?(:name) then self.name
97
- when self.class.respond_to?(:default_name) then self.class.default_name
98
- end
99
- NewRelic::DelayedJobInjection.worker_name = worker_name
100
-
101
- if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job) &&
102
- !(::Delayed::Job.method_defined?(:invoke_job_without_new_relic) )
103
-
104
- ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 2/2]'
105
- install_newrelic_job_tracer
106
- NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job
107
- else
108
- NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
109
- end
110
- end
111
-
112
- alias initialize_without_new_relic initialize
113
- alias initialize initialize_with_new_relic
114
-
115
- NR_TRANSACTION_CATEGORY = 'OtherTransaction/DelayedJob'.freeze
98
+ next unless delayed_job_version < Gem::Version.new('4.1.0')
116
99
 
117
- def install_newrelic_job_tracer
118
- Delayed::Job.class_eval do
119
- include NewRelic::Agent::Instrumentation::ControllerInstrumentation
100
+ deprecation_msg = 'Instrumentation for DelayedJob versions below 4.1.0 is deprecated.' \
101
+ 'It will stop being monitored in version 9.0.0. ' \
102
+ 'Please upgrade your DelayedJob version to continue receiving full support. ' \
120
103
 
121
- alias_method :invoke_job_without_new_relic, :invoke_job
122
-
123
- def invoke_job(*args, &block)
124
- options = {
125
- :category => NR_TRANSACTION_CATEGORY,
126
- :path => ::NewRelic::Agent::Instrumentation::DelayedJob::Naming.name_from_payload(payload_object)
127
- }
128
-
129
- perform_action_with_newrelic_trace(options) do
130
- invoke_job_without_new_relic(*args, &block)
131
- end
132
- end
104
+ ::NewRelic::Agent.logger.log_once(
105
+ :warn,
106
+ :deprecated_delayed_job_version,
107
+ deprecation_msg
108
+ )
109
+ end
133
110
 
134
- end
135
- end
136
- end
111
+ def delayed_job_version
112
+ Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job']
137
113
  end
138
114
  end
@@ -0,0 +1,29 @@
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 Elasticsearch
7
+ def self.instrument!
8
+ to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) <
9
+ ::Gem::Version.create("8.0.0")
10
+ ::Elasticsearch::Transport::Client
11
+ else
12
+ ::Elastic::Transport::Client
13
+ end
14
+
15
+ to_instrument.class_eval do
16
+ include NewRelic::Agent::Instrumentation::Elasticsearch
17
+
18
+ alias_method(:perform_request_without_tracing, :perform_request)
19
+ alias_method(:perform_request, :perform_request_with_tracing)
20
+
21
+ def perform_request(*args)
22
+ perform_request_with_tracing(*args) do
23
+ perform_request_without_tracing(*args)
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end
@@ -0,0 +1,66 @@
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
+ require_relative '../../datastores/nosql_obfuscator'
5
+
6
+ module NewRelic::Agent::Instrumentation
7
+ module Elasticsearch
8
+ PRODUCT_NAME = 'Elasticsearch'
9
+ OPERATION = 'perform_request'
10
+
11
+ def perform_request_with_tracing(method, path, params = {}, body = nil, headers = nil)
12
+ return yield unless NewRelic::Agent::Tracer.tracing_enabled?
13
+
14
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
15
+ product: PRODUCT_NAME,
16
+ operation: nr_operation || OPERATION,
17
+ host: nr_hosts[:host],
18
+ port_path_or_id: path,
19
+ database_name: nr_cluster_name
20
+ )
21
+ begin
22
+ NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
23
+ ensure
24
+ if segment
25
+ segment.notice_nosql_statement(nr_reported_query(body || params))
26
+ segment.finish
27
+ end
28
+ end
29
+ end
30
+
31
+ private
32
+
33
+ def nr_operation
34
+ operation_index = caller_locations.index do |line|
35
+ string = line.to_s
36
+ string.include?('lib/elasticsearch/api') && !string.include?(OPERATION)
37
+ end
38
+ return nil unless operation_index
39
+
40
+ caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, "")
41
+ end
42
+
43
+ def nr_reported_query(query)
44
+ return unless NewRelic::Agent.config[:'elasticsearch.capture_queries']
45
+ return query unless NewRelic::Agent.config[:'elasticsearch.obfuscate_queries']
46
+
47
+ NewRelic::Agent::Datastores::NosqlObfuscator.obfuscate_statement(query)
48
+ end
49
+
50
+ def nr_cluster_name
51
+ return @nr_cluster_name if @nr_cluster_name
52
+ return if nr_hosts.empty?
53
+
54
+ NewRelic::Agent.disable_all_tracing do
55
+ @nr_cluster_name ||= perform_request('GET', '_cluster/health').body["cluster_name"]
56
+ end
57
+ rescue StandardError => e
58
+ NewRelic::Agent.logger.error("Failed to get cluster name for elasticsearch", e)
59
+ nil
60
+ end
61
+
62
+ def nr_hosts
63
+ @nr_hosts ||= (transport.hosts.first || NewRelic::EMPTY_HASH)
64
+ end
65
+ end
66
+ end
@@ -0,0 +1,13 @@
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 Elasticsearch::Prepend
7
+ include NewRelic::Agent::Instrumentation::Elasticsearch
8
+
9
+ def perform_request(*args)
10
+ perform_request_with_tracing(*args) { super }
11
+ end
12
+ end
13
+ 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_relative 'elasticsearch/instrumentation'
6
+ require_relative 'elasticsearch/chain'
7
+ require_relative 'elasticsearch/prepend'
8
+
9
+ DependencyDetection.defer do
10
+ named :elasticsearch
11
+
12
+ depends_on do
13
+ defined?(::Elasticsearch)
14
+ end
15
+
16
+ executes do
17
+ ::NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
18
+
19
+ to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) < ::Gem::Version.create("8.0.0")
20
+ ::Elasticsearch::Transport::Client
21
+ else
22
+ ::Elastic::Transport::Client
23
+ end
24
+
25
+ if use_prepend?
26
+ prepend_instrument to_instrument, NewRelic::Agent::Instrumentation::Elasticsearch::Prepend
27
+ else
28
+ chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch
29
+ end
30
+ end
31
+ end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module ::Excon
6
6
  module Middleware
@@ -11,7 +11,7 @@ module ::Excon
11
11
  @stack = stack
12
12
  end
13
13
 
14
- def request_call(datum) #THREAD_LOCAL_ACCESS
14
+ def request_call(datum) # THREAD_LOCAL_ACCESS
15
15
  begin
16
16
  # Only instrument this request if we haven't already done so, because
17
17
  # we can get request_call multiple times for requests marked as
@@ -25,7 +25,7 @@ module ::Excon
25
25
  procedure: wrapped_request.method
26
26
  )
27
27
 
28
- segment.add_request_headers wrapped_request
28
+ segment.add_request_headers(wrapped_request)
29
29
 
30
30
  datum[:connection].instance_variable_set(TRACE_DATA_IVAR, segment)
31
31
  end
@@ -45,7 +45,7 @@ module ::Excon
45
45
  @stack.error_call(datum)
46
46
  end
47
47
 
48
- def finish_trace(datum) #THREAD_LOCAL_ACCESS
48
+ def finish_trace(datum) # THREAD_LOCAL_ACCESS
49
49
  segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
50
50
  if segment
51
51
  begin
@@ -54,7 +54,7 @@ module ::Excon
54
54
 
55
55
  if datum[:response]
56
56
  wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(datum[:response])
57
- segment.process_response_headers wrapped_response
57
+ segment.process_response_headers(wrapped_response)
58
58
  end
59
59
  ensure
60
60
  segment.finish if segment