newrelic_rpm 6.10.0.364 → 8.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (440) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +13 -1
  3. data/.rubocop.yml +1946 -0
  4. data/.rubocop_todo.yml +62 -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 +3737 -2592
  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 +9 -8
  15. data/LICENSE +202 -38
  16. data/README.md +85 -87
  17. data/Rakefile +27 -27
  18. data/THIRD_PARTY_NOTICES.md +28 -0
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +77 -54
  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 +97 -919
  30. data/lib/new_relic/agent/agent_helpers/connect.rb +227 -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 +75 -0
  34. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -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 +24 -20
  38. data/lib/new_relic/agent/attribute_filter.rb +67 -48
  39. data/lib/new_relic/agent/attribute_processing.rb +8 -8
  40. data/lib/new_relic/agent/attributes.rb +8 -5
  41. data/lib/new_relic/agent/audit_logger.rb +19 -4
  42. data/lib/new_relic/agent/autostart.rb +21 -20
  43. data/lib/new_relic/agent/chained_call.rb +2 -2
  44. data/lib/new_relic/agent/commands/agent_command.rb +4 -4
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +13 -12
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +10 -8
  47. data/lib/new_relic/agent/configuration/default_source.rb +1783 -1158
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
  49. data/lib/new_relic/agent/configuration/environment_source.rb +12 -10
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +10 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +83 -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 +91 -78
  56. data/lib/new_relic/agent/configuration/server_source.rb +22 -20
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +32 -8
  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 +15 -15
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
  64. data/lib/new_relic/agent/database/obfuscator.rb +3 -3
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
  66. data/lib/new_relic/agent/database.rb +54 -48
  67. data/lib/new_relic/agent/database_adapter.rb +35 -0
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +18 -19
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +7 -11
  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 +6 -12
  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/distributed_tracing/cross_app_payload.rb +13 -12
  77. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -33
  78. data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +28 -24
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +20 -20
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +53 -56
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -7
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +77 -78
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +40 -39
  84. data/lib/new_relic/agent/distributed_tracing.rb +33 -101
  85. data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
  86. data/lib/new_relic/agent/error_collector.rb +74 -55
  87. data/lib/new_relic/agent/error_event_aggregator.rb +5 -6
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
  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 +27 -25
  94. data/lib/new_relic/agent/external.rb +12 -45
  95. data/lib/new_relic/agent/guid_generator.rb +14 -12
  96. data/lib/new_relic/agent/harvester.rb +5 -6
  97. data/lib/new_relic/agent/heap.rb +8 -10
  98. data/lib/new_relic/agent/hostname.rb +21 -14
  99. data/lib/new_relic/agent/http_clients/abstract.rb +11 -12
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -12
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +9 -10
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +5 -6
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +3 -5
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +9 -5
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -6
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +10 -12
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -9
  108. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +39 -32
  109. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +16 -18
  110. data/lib/new_relic/agent/instrumentation/active_job.rb +21 -14
  111. data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
  112. data/lib/new_relic/agent/instrumentation/active_record.rb +94 -47
  113. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -61
  114. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +50 -63
  115. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
  116. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +28 -21
  117. data/lib/new_relic/agent/instrumentation/active_storage.rb +4 -4
  118. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +19 -16
  119. data/lib/new_relic/agent/instrumentation/active_support.rb +12 -0
  120. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  121. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  122. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  123. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  124. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +12 -3
  125. data/lib/new_relic/agent/instrumentation/authlogic.rb +11 -3
  126. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  127. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  128. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  129. data/lib/new_relic/agent/instrumentation/bunny.rb +12 -153
  130. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  131. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  132. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  133. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  134. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +70 -60
  135. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  136. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  137. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  138. data/lib/new_relic/agent/instrumentation/curb.rb +14 -240
  139. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
  140. data/lib/new_relic/agent/instrumentation/data_mapper.rb +77 -66
  141. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
  142. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  143. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  144. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -52
  145. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  146. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  147. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  148. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  149. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +7 -7
  150. data/lib/new_relic/agent/instrumentation/excon.rb +28 -30
  151. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  152. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  153. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  154. data/lib/new_relic/agent/instrumentation/grape.rb +15 -116
  155. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  156. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  157. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  158. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  159. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  160. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  161. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  162. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  163. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  164. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  165. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  166. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  167. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  168. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  169. data/lib/new_relic/agent/instrumentation/httpclient.rb +11 -33
  170. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  171. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  172. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  173. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  174. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
  175. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  176. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  177. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  178. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  179. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  180. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +58 -129
  181. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  182. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  183. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
  184. data/lib/new_relic/agent/instrumentation/memcache.rb +57 -73
  185. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +14 -13
  186. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +10 -10
  187. data/lib/new_relic/agent/instrumentation/mongo.rb +7 -138
  188. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +41 -18
  189. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  190. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
  191. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  192. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  193. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +12 -11
  194. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  195. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  196. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  197. data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
  198. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
  199. data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
  200. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  201. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  202. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  203. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  204. data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
  205. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +19 -55
  206. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
  207. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
  208. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +5 -5
  209. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
  210. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  211. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +15 -5
  212. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  213. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
  214. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  215. data/lib/new_relic/agent/instrumentation/rake.rb +17 -157
  216. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  217. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  218. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +93 -0
  219. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  220. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  221. data/lib/new_relic/agent/instrumentation/redis.rb +19 -108
  222. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  223. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  224. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  225. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  226. data/lib/new_relic/agent/instrumentation/resque.rb +33 -44
  227. data/lib/new_relic/agent/instrumentation/sequel.rb +16 -18
  228. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +3 -3
  229. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  230. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  231. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  232. data/lib/new_relic/agent/instrumentation/sidekiq.rb +29 -45
  233. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  234. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
  235. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
  236. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  237. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +3 -3
  238. data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
  239. data/lib/new_relic/agent/instrumentation/sunspot.rb +14 -6
  240. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  241. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +32 -0
  242. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  243. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  244. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  245. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  246. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  247. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  248. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  249. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  250. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  251. data/lib/new_relic/agent/instrumentation/typhoeus.rb +13 -92
  252. data/lib/new_relic/agent/instrumentation.rb +2 -2
  253. data/lib/new_relic/agent/internal_agent_error.rb +3 -3
  254. data/lib/new_relic/agent/javascript_instrumentor.rb +49 -43
  255. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  256. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  257. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  258. data/lib/new_relic/agent/log_once.rb +2 -2
  259. data/lib/new_relic/agent/log_priority.rb +20 -0
  260. data/lib/new_relic/agent/logging.rb +25 -22
  261. data/lib/new_relic/agent/memory_logger.rb +3 -3
  262. data/lib/new_relic/agent/messaging.rb +66 -82
  263. data/lib/new_relic/agent/method_tracer.rb +152 -146
  264. data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
  265. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -18
  266. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +6 -5
  267. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +2 -3
  268. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +7 -10
  269. data/lib/new_relic/agent/monitors.rb +7 -8
  270. data/lib/new_relic/agent/new_relic_service/encoders.rb +7 -7
  271. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
  272. data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
  273. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +6 -5
  274. data/lib/new_relic/agent/new_relic_service.rb +258 -184
  275. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +3 -6
  276. data/lib/new_relic/agent/null_logger.rb +8 -4
  277. data/lib/new_relic/agent/obfuscator.rb +9 -11
  278. data/lib/new_relic/agent/parameter_filtering.rb +25 -11
  279. data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
  280. data/lib/new_relic/agent/pipe_channel_manager.rb +28 -18
  281. data/lib/new_relic/agent/pipe_service.rb +9 -6
  282. data/lib/new_relic/agent/prepend_supportability.rb +3 -3
  283. data/lib/new_relic/agent/priority_sampled_buffer.rb +15 -15
  284. data/lib/new_relic/agent/range_extensions.rb +9 -29
  285. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
  286. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +14 -14
  287. data/lib/new_relic/agent/rules_engine.rb +6 -5
  288. data/lib/new_relic/agent/sampler.rb +4 -5
  289. data/lib/new_relic/agent/sampler_collection.rb +4 -5
  290. data/lib/new_relic/agent/samplers/cpu_sampler.rb +4 -3
  291. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
  292. data/lib/new_relic/agent/samplers/memory_sampler.rb +26 -15
  293. data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
  294. data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
  295. data/lib/new_relic/agent/span_event_aggregator.rb +13 -13
  296. data/lib/new_relic/agent/span_event_primitive.rb +85 -54
  297. data/lib/new_relic/agent/sql_sampler.rb +20 -20
  298. data/lib/new_relic/agent/stats.rb +79 -42
  299. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
  300. data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
  301. data/lib/new_relic/agent/stats_engine.rb +9 -9
  302. data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
  303. data/lib/new_relic/agent/system_info.rb +95 -66
  304. data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
  305. data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
  306. data/lib/new_relic/agent/threading/backtrace_service.rb +15 -15
  307. data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
  308. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
  309. data/lib/new_relic/agent/tracer.rb +81 -86
  310. data/lib/new_relic/agent/transaction/abstract_segment.rb +107 -43
  311. data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
  312. data/lib/new_relic/agent/transaction/distributed_tracer.rb +67 -54
  313. data/lib/new_relic/agent/transaction/distributed_tracing.rb +45 -46
  314. data/lib/new_relic/agent/transaction/external_request_segment.rb +47 -37
  315. data/lib/new_relic/agent/transaction/message_broker_segment.rb +32 -36
  316. data/lib/new_relic/agent/transaction/request_attributes.rb +36 -36
  317. data/lib/new_relic/agent/transaction/segment.rb +41 -11
  318. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
  319. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
  320. data/lib/new_relic/agent/transaction/trace.rb +16 -12
  321. data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
  322. data/lib/new_relic/agent/transaction/trace_context.rb +36 -36
  323. data/lib/new_relic/agent/transaction/trace_node.rb +26 -25
  324. data/lib/new_relic/agent/transaction/tracing.rb +15 -12
  325. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
  326. data/lib/new_relic/agent/transaction.rb +182 -146
  327. data/lib/new_relic/agent/transaction_error_primitive.rb +29 -27
  328. data/lib/new_relic/agent/transaction_event_aggregator.rb +13 -13
  329. data/lib/new_relic/agent/transaction_event_primitive.rb +34 -35
  330. data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
  331. data/lib/new_relic/agent/transaction_metrics.rb +11 -10
  332. data/lib/new_relic/agent/transaction_sampler.rb +6 -7
  333. data/lib/new_relic/agent/transaction_time_aggregator.rb +27 -26
  334. data/lib/new_relic/agent/utilization/aws.rb +34 -4
  335. data/lib/new_relic/agent/utilization/azure.rb +4 -4
  336. data/lib/new_relic/agent/utilization/gcp.rb +8 -8
  337. data/lib/new_relic/agent/utilization/pcf.rb +6 -5
  338. data/lib/new_relic/agent/utilization/vendor.rb +44 -29
  339. data/lib/new_relic/agent/utilization_data.rb +8 -6
  340. data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
  341. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
  342. data/lib/new_relic/agent/vm/mri_vm.rb +46 -19
  343. data/lib/new_relic/agent/vm/snapshot.rb +6 -6
  344. data/lib/new_relic/agent/vm.rb +2 -2
  345. data/lib/new_relic/agent/worker_loop.rb +11 -13
  346. data/lib/new_relic/agent.rb +80 -76
  347. data/lib/new_relic/cli/command.rb +21 -23
  348. data/lib/new_relic/cli/commands/deployments.rb +93 -44
  349. data/lib/new_relic/cli/commands/install.rb +13 -16
  350. data/lib/new_relic/coerce.rb +16 -14
  351. data/lib/new_relic/collection_helper.rb +51 -49
  352. data/lib/new_relic/constants.rb +7 -2
  353. data/lib/new_relic/control/class_methods.rb +4 -4
  354. data/lib/new_relic/control/frameworks/external.rb +3 -3
  355. data/lib/new_relic/control/frameworks/rails.rb +24 -18
  356. data/lib/new_relic/control/frameworks/rails3.rb +4 -5
  357. data/lib/new_relic/control/frameworks/rails4.rb +2 -2
  358. data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
  359. data/lib/new_relic/control/frameworks/ruby.rb +4 -4
  360. data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
  361. data/lib/new_relic/control/frameworks.rb +2 -2
  362. data/lib/new_relic/control/instance_methods.rb +28 -46
  363. data/lib/new_relic/control/instrumentation.rb +40 -12
  364. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  365. data/lib/new_relic/control/server_methods.rb +4 -5
  366. data/lib/new_relic/control.rb +2 -3
  367. data/lib/new_relic/delayed_job_injection.rb +2 -2
  368. data/lib/new_relic/dependency_detection.rb +129 -18
  369. data/lib/new_relic/environment_report.rb +41 -35
  370. data/lib/new_relic/helper.rb +49 -8
  371. data/lib/new_relic/language_support.rb +30 -6
  372. data/lib/new_relic/latest_changes.rb +9 -8
  373. data/lib/new_relic/local_environment.rb +25 -19
  374. data/lib/new_relic/metric_data.rb +32 -27
  375. data/lib/new_relic/metric_spec.rb +9 -7
  376. data/lib/new_relic/noticed_error.rb +23 -31
  377. data/lib/new_relic/rack/agent_hooks.rb +2 -2
  378. data/lib/new_relic/rack/agent_middleware.rb +6 -4
  379. data/lib/new_relic/rack/browser_monitoring.rb +134 -124
  380. data/lib/new_relic/rack.rb +2 -2
  381. data/lib/new_relic/recipes/capistrano3.rb +4 -62
  382. data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
  383. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  384. data/lib/new_relic/recipes.rb +2 -2
  385. data/lib/new_relic/supportability_helper.rb +12 -11
  386. data/lib/new_relic/traced_thread.rb +39 -0
  387. data/lib/new_relic/version.rb +7 -18
  388. data/lib/newrelic_rpm.rb +20 -33
  389. data/lib/sequel/extensions/newrelic_instrumentation.rb +14 -17
  390. data/lib/sequel/plugins/newrelic_instrumentation.rb +6 -12
  391. data/lib/tasks/all.rb +4 -4
  392. data/lib/tasks/config.rake +22 -117
  393. data/lib/tasks/coverage_report.rake +28 -0
  394. data/lib/tasks/helpers/config.html.erb +21 -0
  395. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  396. data/lib/tasks/helpers/format.rb +123 -0
  397. data/lib/tasks/helpers/matches.rb +12 -0
  398. data/lib/tasks/helpers/prompt.rb +24 -0
  399. data/lib/tasks/helpers/removers.rb +33 -0
  400. data/lib/tasks/install.rake +4 -0
  401. data/lib/tasks/instrumentation_generator/README.md +63 -0
  402. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  403. data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
  404. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  405. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  406. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  407. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  408. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  409. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  410. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  411. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  412. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  413. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  414. data/lib/tasks/multiverse.rake +4 -0
  415. data/lib/tasks/multiverse.rb +7 -25
  416. data/lib/tasks/newrelic.rb +2 -2
  417. data/lib/tasks/tests.rake +11 -16
  418. data/newrelic.yml +666 -3
  419. data/newrelic_rpm.gemspec +28 -27
  420. data/recipes/newrelic.rb +3 -3
  421. data/test/agent_helper.rb +245 -189
  422. metadata +182 -130
  423. data/.travis.yml +0 -225
  424. data/bin/mongrel_rpm +0 -33
  425. data/cert/cacert.pem +0 -1177
  426. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  427. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  428. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  429. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  430. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  431. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  432. data/lib/new_relic/agent/instrumentation/net.rb +0 -53
  433. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  434. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  435. data/lib/new_relic/agent/supported_versions.rb +0 -275
  436. data/lib/new_relic/build.rb +0 -2
  437. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  438. data/lib/new_relic/metrics.rb +0 -13
  439. data/lib/tasks/config.html.erb +0 -32
  440. data/true +0 -0
@@ -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 Redis
7
+ module Prepend
8
+ include NewRelic::Agent::Instrumentation::Redis
9
+
10
+ # Defined in version 5.x+
11
+ def call_v(*args, &block)
12
+ call_with_tracing(args[0]) { super }
13
+ end
14
+
15
+ # Defined in version 4.x, 3.x
16
+ def call(*args, &block)
17
+ call_with_tracing(args[0]) { super }
18
+ end
19
+
20
+ def call_pipeline(*args, &block)
21
+ call_pipeline_with_tracing(args[0]) { super }
22
+ end
23
+
24
+ def connect(*args, &block)
25
+ connect_with_tracing { super }
26
+ end
27
+ end
28
+ end
29
+ end
@@ -1,47 +1,27 @@
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/datastores'
6
6
  require 'new_relic/agent/datastores/redis'
7
7
 
8
- module NewRelic
9
- module Agent
10
- module Instrumentation
11
- module Redis
12
- extend self
13
-
14
- UNKNOWN = "unknown".freeze
15
- LOCALHOST = "localhost".freeze
16
-
17
- def host_for(client)
18
- client.path ? LOCALHOST : client.host
19
- rescue => e
20
- NewRelic::Agent.logger.debug "Failed to retrieve Redis host: #{e}"
21
- UNKNOWN
22
- end
23
-
24
- def port_path_or_id_for(client)
25
- client.path || client.port
26
- rescue => e
27
- NewRelic::Agent.logger.debug "Failed to retrieve Redis port_path_or_id: #{e}"
28
- UNKNOWN
29
- end
30
- end
31
- end
32
- end
33
- end
8
+ require_relative 'redis/instrumentation'
9
+ require_relative 'redis/chain'
10
+ require_relative 'redis/constants'
11
+ require_relative 'redis/prepend'
12
+ require_relative 'redis/middleware'
34
13
 
35
14
  DependencyDetection.defer do
36
15
  # Why not :redis? newrelic-redis used that name, so avoid conflicting
37
16
  named :redis_instrumentation
17
+ configure_with :redis
38
18
 
39
19
  depends_on do
40
- defined? ::Redis
20
+ defined?(Redis) && defined?(Redis::VERSION)
41
21
  end
42
22
 
43
- depends_on do
44
- NewRelic::Agent.config[:disable_redis] == false
23
+ conflicts_with_prepend do
24
+ defined?(PrometheusExporter)
45
25
  end
46
26
 
47
27
  depends_on do
@@ -50,84 +30,15 @@ DependencyDetection.defer do
50
30
  end
51
31
 
52
32
  executes do
53
- NewRelic::Agent.logger.info 'Installing Redis Instrumentation'
54
-
55
- Redis::Client.class_eval do
56
- alias_method :call_without_new_relic, :call
57
-
58
- def call(*args, &block)
59
- operation = args[0][0]
60
- statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
61
-
62
- hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
63
- port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
64
-
65
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
66
- product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
67
- operation: operation,
68
- host: hostname,
69
- port_path_or_id: port_path_or_id,
70
- database_name: db
71
- )
72
- begin
73
- segment.notice_nosql_statement(statement) if statement
74
- NewRelic::Agent::Tracer.capture_segment_error segment do
75
- call_without_new_relic(*args, &block)
76
- end
77
- ensure
78
- segment.finish if segment
79
- end
80
- end
81
-
82
- alias_method :call_pipeline_without_new_relic, :call_pipeline
83
-
84
- def call_pipeline(*args, &block)
85
- pipeline = args[0]
86
- operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
87
- statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
88
-
89
- hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
90
- port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
91
-
92
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
93
- product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
94
- operation: operation,
95
- host: hostname,
96
- port_path_or_id: port_path_or_id,
97
- database_name: db
98
- )
99
- begin
100
- segment.notice_nosql_statement(statement)
101
- NewRelic::Agent::Tracer.capture_segment_error segment do
102
- call_pipeline_without_new_relic(*args, &block)
103
- end
104
- ensure
105
- segment.finish if segment
106
- end
107
- end
108
-
109
- alias_method :connect_without_new_relic, :connect
110
-
111
- def connect(*args, &block)
112
- hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
113
- port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
114
-
115
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
116
- product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
117
- operation: NewRelic::Agent::Datastores::Redis::CONNECT,
118
- host: hostname,
119
- port_path_or_id: port_path_or_id,
120
- database_name: db
121
- )
33
+ NewRelic::Agent.logger.info('Installing Redis Instrumentation')
34
+ if NewRelic::Agent::Instrumentation::Redis::Constants::HAS_REDIS_CLIENT
35
+ RedisClient.register(NewRelic::Agent::Instrumentation::RedisClient::Middleware)
36
+ end
122
37
 
123
- begin
124
- NewRelic::Agent::Tracer.capture_segment_error segment do
125
- connect_without_new_relic(*args, &block)
126
- end
127
- ensure
128
- segment.finish if segment
129
- end
130
- end
38
+ if use_prepend?
39
+ prepend_instrument Redis::Client, NewRelic::Agent::Instrumentation::Redis::Prepend
40
+ else
41
+ chain_instrument NewRelic::Agent::Instrumentation::Redis::Chain
131
42
  end
132
43
  end
133
44
  end
@@ -0,0 +1,21 @@
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 Resque
7
+ module Chain
8
+ def self.instrument!
9
+ ::Resque::Job.class_eval do
10
+ include NewRelic::Agent::Instrumentation::Resque
11
+
12
+ alias_method(:perform_without_instrumentation, :perform)
13
+
14
+ def perform
15
+ with_tracing { perform_without_instrumentation }
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
21
+ end
@@ -0,0 +1,19 @@
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 Resque
9
+ module Helper
10
+ extend self
11
+
12
+ def resque_fork_per_job?
13
+ ENV["FORK_PER_JOB"] != 'false' && NewRelic::LanguageSupport.can_fork?
14
+ end
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,34 @@
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 Resque
7
+ include NewRelic::Agent::Instrumentation::ControllerInstrumentation
8
+
9
+ def with_tracing
10
+ begin
11
+ perform_action_with_newrelic_trace(
12
+ :name => 'perform',
13
+ :class_name => self.payload_class,
14
+ :category => 'OtherTransaction/ResqueJob'
15
+ ) do
16
+ NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(
17
+ args,
18
+ :'job.resque.args',
19
+ NewRelic::Agent::AttributeFilter::DST_NONE
20
+ )
21
+
22
+ yield
23
+ end
24
+ ensure
25
+ # Stopping the event loop before flushing the pipe.
26
+ # The goal is to avoid conflict during write.
27
+ if NewRelic::Agent::Instrumentation::Resque::Helper.resque_fork_per_job?
28
+ NewRelic::Agent.agent.stop_event_loop
29
+ NewRelic::Agent.agent.flush_pipe_data
30
+ end
31
+ end
32
+ end
33
+ end
34
+ end
@@ -0,0 +1,15 @@
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 Resque
7
+ module Prepend
8
+ include NewRelic::Agent::Instrumentation::Resque
9
+
10
+ def perform
11
+ with_tracing { super }
12
+ end
13
+ end
14
+ end
15
+ end
@@ -1,75 +1,64 @@
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
+
5
+ require_relative 'resque/instrumentation'
6
+ require_relative 'resque/chain'
7
+ require_relative 'resque/prepend'
4
8
 
5
9
  DependencyDetection.defer do
6
10
  @name = :resque
7
11
 
8
12
  depends_on do
9
- defined?(::Resque::Job) && !NewRelic::Agent.config[:disable_resque]
13
+ defined?(Resque::Job) && !NewRelic::Agent.config[:disable_resque]
14
+ end
15
+
16
+ # Airbrake uses method chaining on Resque::Job on versions < 11.0.3
17
+ conflicts_with_prepend do
18
+ defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) && Gem::Version.create(Airbrake::AIRBRAKE_VERSION) < Gem::Version.create('11.0.3')
10
19
  end
11
20
 
12
21
  executes do
13
- ::NewRelic::Agent.logger.info 'Installing Resque instrumentation'
22
+ NewRelic::Agent.logger.info('Installing Resque instrumentation')
14
23
  end
15
24
 
16
25
  executes do
17
26
  if NewRelic::Agent.config[:'resque.use_ruby_dns'] && NewRelic::Agent.config[:dispatcher] == :resque
18
- ::NewRelic::Agent.logger.info 'Requiring resolv-replace'
27
+ NewRelic::Agent.logger.info('Requiring resolv-replace')
19
28
  require 'resolv'
20
29
  require 'resolv-replace'
21
30
  end
22
31
  end
23
32
 
24
33
  executes do
25
- module ::Resque
26
- class Job
27
- include NewRelic::Agent::Instrumentation::ControllerInstrumentation
28
-
29
- alias_method :perform_without_instrumentation, :perform
30
-
31
- def perform
32
- begin
33
- perform_action_with_newrelic_trace(
34
- :name => 'perform',
35
- :class_name => self.payload_class,
36
- :category => 'OtherTransaction/ResqueJob') do
37
-
38
- NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(
39
- args,
40
- :'job.resque.args',
41
- NewRelic::Agent::AttributeFilter::DST_NONE)
42
-
43
- perform_without_instrumentation
44
- end
45
- ensure
46
- # Stopping the event loop before flushing the pipe.
47
- # The goal is to avoid conflict during write.
48
- NewRelic::Agent.agent.stop_event_loop
49
- NewRelic::Agent.agent.flush_pipe_data
50
- end
51
- end
52
- end
34
+ if use_prepend?
35
+ prepend_instrument Resque::Job, NewRelic::Agent::Instrumentation::Resque::Prepend
36
+ else
37
+ chain_instrument NewRelic::Agent::Instrumentation::Resque::Chain
53
38
  end
54
39
 
55
- if NewRelic::LanguageSupport.can_fork?
56
- ::Resque.before_first_fork do
57
- NewRelic::Agent.manual_start(:dispatcher => :resque,
58
- :sync_startup => true,
59
- :start_channel_listener => true)
40
+ if NewRelic::Agent::Instrumentation::Resque::Helper.resque_fork_per_job?
41
+ Resque.before_first_fork do
42
+ NewRelic::Agent.manual_start(:dispatcher => :resque,
43
+ :sync_startup => true,
44
+ :start_channel_listener => true)
60
45
  end
61
46
 
62
- ::Resque.before_fork do |job|
63
- if ENV['FORK_PER_JOB'] != 'false'
64
- NewRelic::Agent.register_report_channel(job.object_id)
65
- end
47
+ Resque.before_fork do |job|
48
+ NewRelic::Agent.register_report_channel(job.object_id)
66
49
  end
67
50
 
68
- ::Resque.after_fork do |job|
51
+ Resque.after_fork do |job|
69
52
  # Only suppress reporting Instance/Busy for forked children
70
53
  # Traced errors UI relies on having the parent process report that metric
71
54
  NewRelic::Agent.after_fork(:report_to_channel => job.object_id,
72
- :report_instance_busy => false)
55
+ :report_instance_busy => false)
56
+ end
57
+ else
58
+ Resque.before_first_fork do
59
+ NewRelic::Agent.manual_start(:dispatcher => :resque,
60
+ :sync_startup => true,
61
+ :start_channel_listener => false)
73
62
  end
74
63
  end
75
64
  end
@@ -1,50 +1,48 @@
1
1
  # -*- ruby -*-
2
- # encoding: utf-8
3
2
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
5
5
 
6
6
  DependencyDetection.defer do
7
7
  @name = :sequel
8
8
 
9
9
  depends_on do
10
- defined?(::Sequel)
10
+ defined?(Sequel)
11
11
  end
12
12
 
13
13
  depends_on do
14
14
  !NewRelic::Agent.config[:disable_sequel_instrumentation] &&
15
- !NewRelic::Agent.config[:disable_database_instrumentation]
15
+ !NewRelic::Agent.config[:disable_database_instrumentation]
16
16
  end
17
17
 
18
18
  def supported_sequel_version?
19
- Sequel.const_defined?( :MAJOR ) &&
20
- ( Sequel::MAJOR > 3 ||
21
- Sequel::MAJOR == 3 && Sequel::MINOR >= 37 )
19
+ Sequel.const_defined?(:MAJOR) &&
20
+ (Sequel::MAJOR > 3 ||
21
+ Sequel::MAJOR == 3 && Sequel::MINOR >= 37)
22
22
  end
23
23
 
24
24
  executes do
25
25
  if supported_sequel_version?
26
26
 
27
- ::NewRelic::Agent.logger.info 'Installing Sequel instrumentation'
27
+ NewRelic::Agent.logger.info('Installing Sequel instrumentation')
28
28
 
29
- if Sequel::Database.respond_to?( :extension )
30
- Sequel::Database.extension :newrelic_instrumentation
29
+ if Sequel::Database.respond_to?(:extension)
30
+ Sequel::Database.extension(:newrelic_instrumentation)
31
31
  else
32
- NewRelic::Agent.logger.info "Detected Sequel version %s." % [ Sequel::VERSION ]
33
- NewRelic::Agent.logger.info "Please see additional documentation: " +
34
- "https://newrelic.com/docs/ruby/sequel-instrumentation"
32
+ NewRelic::Agent.logger.info("Detected Sequel version %s." % [Sequel::VERSION])
33
+ NewRelic::Agent.logger.info("Please see additional documentation: " +
34
+ "https://newrelic.com/docs/ruby/sequel-instrumentation")
35
35
  end
36
36
 
37
- Sequel.synchronize{Sequel::DATABASES.dup}.each do |db|
38
- db.extension :newrelic_instrumentation
37
+ Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
38
+ db.extension(:newrelic_instrumentation)
39
39
  end
40
40
 
41
41
  Sequel::Model.plugin(:newrelic_instrumentation) if defined?(Sequel::Model)
42
42
  else
43
43
 
44
- NewRelic::Agent.logger.info "Sequel instrumentation requires at least version 3.37.0."
44
+ NewRelic::Agent.logger.info("Sequel instrumentation requires at least version 3.37.0.")
45
45
 
46
46
  end
47
-
48
47
  end
49
-
50
48
  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
  module NewRelic
6
6
  module Agent
@@ -33,4 +33,4 @@ module NewRelic
33
33
  end
34
34
  end
35
35
  end
36
- end
36
+ 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::Sidekiq
6
+ class Client
7
+ include Sidekiq::ClientMiddleware if defined?(Sidekiq::ClientMiddleware)
8
+
9
+ def call(_worker_class, job, *_)
10
+ job[NewRelic::NEWRELIC_KEY] ||= distributed_tracing_headers if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
11
+ yield
12
+ end
13
+
14
+ def distributed_tracing_headers
15
+ headers = {}
16
+ ::NewRelic::Agent::DistributedTracing.insert_distributed_trace_headers(headers)
17
+ headers
18
+ end
19
+ end
20
+ 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
+ # TODO: remove this class once Sidekiq v6 is no longer supported.
6
+ # Delayed extensions are disabled by default in Sidekiq 5 and 6 and
7
+ # were removed entirely in Sidekiq 7.
8
+ #
9
+ # see https://github.com/mperham/sidekiq/issues/5076 for the discussion
10
+ # of the removal, which includes mentions of alternatives
11
+ if defined?(Sidekiq::VERSION) && Sidekiq::VERSION < '7.0.0'
12
+ class Sidekiq::Extensions::DelayedClass
13
+ def newrelic_trace_args(msg, queue)
14
+ (target, method_name, _args) = if YAML.respond_to?(:unsafe_load)
15
+ YAML.unsafe_load(msg['args'][0])
16
+ else
17
+ YAML.load(msg['args'][0])
18
+ end
19
+
20
+ {
21
+ :name => method_name,
22
+ :class_name => target.name,
23
+ :category => 'OtherTransaction/SidekiqJob'
24
+ }
25
+ rescue => e
26
+ NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
27
+ NewRelic::Agent::Instrumentation::Sidekiq::Server.default_trace_args(msg)
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,37 @@
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::Sidekiq
6
+ class Server
7
+ include NewRelic::Agent::Instrumentation::ControllerInstrumentation
8
+ include Sidekiq::ServerMiddleware if defined?(Sidekiq::ServerMiddleware)
9
+
10
+ # Client middleware has additional parameters, and our tests use the
11
+ # middleware client-side to work inline.
12
+ def call(worker, msg, queue, *_)
13
+ trace_args = if worker.respond_to?(:newrelic_trace_args)
14
+ worker.newrelic_trace_args(msg, queue)
15
+ else
16
+ self.class.default_trace_args(msg)
17
+ end
18
+ trace_headers = msg.delete(NewRelic::NEWRELIC_KEY)
19
+
20
+ perform_action_with_newrelic_trace(trace_args) do
21
+ NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
22
+ NewRelic::Agent::AttributeFilter::DST_NONE)
23
+
24
+ ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, "Other") if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
25
+ yield
26
+ end
27
+ end
28
+
29
+ def self.default_trace_args(msg)
30
+ {
31
+ :name => 'perform',
32
+ :class_name => msg['class'],
33
+ :category => 'OtherTransaction/SidekiqJob'
34
+ }
35
+ end
36
+ end
37
+ end
@@ -1,71 +1,55 @@
1
1
  # This file is distributed under New Relic's license terms.
2
- # 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
+ require_relative 'sidekiq/client'
5
+ require_relative 'sidekiq/server'
6
+ require_relative 'sidekiq/extensions/delayed_class'
3
7
 
4
8
  DependencyDetection.defer do
5
9
  @name = :sidekiq
6
10
 
7
11
  depends_on do
8
- defined?(::Sidekiq) && !NewRelic::Agent.config[:disable_sidekiq]
12
+ defined?(Sidekiq) && !NewRelic::Agent.config[:disable_sidekiq]
9
13
  end
10
14
 
11
15
  executes do
12
- ::NewRelic::Agent.logger.info 'Installing Sidekiq instrumentation'
16
+ NewRelic::Agent.logger.info('Installing Sidekiq instrumentation')
13
17
  end
14
18
 
15
19
  executes do
16
- class NewRelic::SidekiqInstrumentation
17
- include NewRelic::Agent::Instrumentation::ControllerInstrumentation
18
-
19
- # Client middleware has additional parameters, and our tests use the
20
- # middleware client-side to work inline.
21
- def call(worker, msg, queue, *_)
22
- trace_args = if worker.respond_to?(:newrelic_trace_args)
23
- worker.newrelic_trace_args(msg, queue)
24
- else
25
- self.class.default_trace_args(msg)
26
- end
27
-
28
- perform_action_with_newrelic_trace(trace_args) do
29
- NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
30
- NewRelic::Agent::AttributeFilter::DST_NONE)
31
-
32
- yield
33
- end
34
- end
35
-
36
- def self.default_trace_args(msg)
37
- {
38
- :name => 'perform',
39
- :class_name => msg['class'],
40
- :category => 'OtherTransaction/SidekiqJob'
41
- }
42
- end
43
- end
44
-
45
- class Sidekiq::Extensions::DelayedClass
46
- def newrelic_trace_args(msg, queue)
47
- (target, method_name, _args) = YAML.load(msg['args'][0])
48
- {
49
- :name => method_name,
50
- :class_name => target.name,
51
- :category => 'OtherTransaction/SidekiqJob'
52
- }
53
- rescue => e
54
- NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
55
- NewRelic::SidekiqInstrumentation.default_trace_args(msg)
20
+ Sidekiq.configure_client do |config|
21
+ config.client_middleware do |chain|
22
+ chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Client)
56
23
  end
57
24
  end
58
25
 
59
26
  Sidekiq.configure_server do |config|
27
+ config.client_middleware do |chain|
28
+ chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Client)
29
+ end
60
30
  config.server_middleware do |chain|
61
- chain.add NewRelic::SidekiqInstrumentation
31
+ chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Server)
62
32
  end
63
33
 
64
34
  if config.respond_to?(:error_handlers)
65
- config.error_handlers << Proc.new do |error, *_|
35
+ config.error_handlers << proc do |error, *_|
66
36
  NewRelic::Agent.notice_error(error)
67
37
  end
68
38
  end
69
39
  end
70
40
  end
41
+
42
+ executes do
43
+ next unless Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new('5.0.0')
44
+
45
+ deprecation_msg = 'Instrumentation for Sidekiq versions below 5.0.0 is deprecated.' \
46
+ 'They will stop being monitored in version 9.0.0. ' \
47
+ 'Please upgrade your Sidekiq version to continue receiving full support. '
48
+
49
+ NewRelic::Agent.logger.log_once(
50
+ :warn,
51
+ :deprecated_sidekiq_version,
52
+ deprecation_msg
53
+ )
54
+ end
71
55
  end