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,10 @@
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 'resque/instrumentation'
6
+ require_relative 'resque/chain'
7
+ require_relative 'resque/prepend'
4
8
 
5
9
  DependencyDetection.defer do
6
10
  @name = :resque
@@ -9,67 +13,52 @@ DependencyDetection.defer do
9
13
  defined?(::Resque::Job) && !NewRelic::Agent.config[:disable_resque]
10
14
  end
11
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')
19
+ end
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?
40
+ if NewRelic::Agent::Instrumentation::Resque::Helper.resque_fork_per_job?
56
41
  ::Resque.before_first_fork do
57
- NewRelic::Agent.manual_start(:dispatcher => :resque,
58
- :sync_startup => true,
59
- :start_channel_listener => true)
42
+ NewRelic::Agent.manual_start(:dispatcher => :resque,
43
+ :sync_startup => true,
44
+ :start_channel_listener => true)
60
45
  end
61
46
 
62
47
  ::Resque.before_fork do |job|
63
- if ENV['FORK_PER_JOB'] != 'false'
64
- NewRelic::Agent.register_report_channel(job.object_id)
65
- end
48
+ NewRelic::Agent.register_report_channel(job.object_id)
66
49
  end
67
50
 
68
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,7 +1,7 @@
1
1
  # -*- ruby -*-
2
- # encoding: utf-8
3
2
  # This file is distributed under New Relic's license terms.
4
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
@@ -12,39 +12,37 @@ DependencyDetection.defer do
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
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,5 +1,9 @@
1
1
  # This file is distributed under New Relic's license terms.
2
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
@@ -9,88 +13,43 @@ DependencyDetection.defer do
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
- module NewRelic::SidekiqInstrumentation
17
- class Server
18
- include NewRelic::Agent::Instrumentation::ControllerInstrumentation
19
-
20
- # Client middleware has additional parameters, and our tests use the
21
- # middleware client-side to work inline.
22
- def call(worker, msg, queue, *_)
23
- trace_args = if worker.respond_to?(:newrelic_trace_args)
24
- worker.newrelic_trace_args(msg, queue)
25
- else
26
- self.class.default_trace_args(msg)
27
- end
28
- trace_headers = msg.delete(NewRelic::NEWRELIC_KEY)
29
-
30
- perform_action_with_newrelic_trace(trace_args) do
31
- NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
32
- NewRelic::Agent::AttributeFilter::DST_NONE)
33
-
34
- ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, "Other") if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
35
- yield
36
- end
37
- end
38
-
39
- def self.default_trace_args(msg)
40
- {
41
- :name => 'perform',
42
- :class_name => msg['class'],
43
- :category => 'OtherTransaction/SidekiqJob'
44
- }
45
- end
46
- end
47
- class Client
48
- def call(_worker_class, job, *_)
49
- job[NewRelic::NEWRELIC_KEY] ||= distributed_tracing_headers if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
50
- yield
51
- end
52
-
53
- def distributed_tracing_headers
54
- headers = {}
55
- ::NewRelic::Agent::DistributedTracing.insert_distributed_trace_headers(headers)
56
- headers
57
- end
58
- end
59
- end
60
-
61
- class Sidekiq::Extensions::DelayedClass
62
- def newrelic_trace_args(msg, queue)
63
- (target, method_name, _args) = YAML.load(msg['args'][0])
64
- {
65
- :name => method_name,
66
- :class_name => target.name,
67
- :category => 'OtherTransaction/SidekiqJob'
68
- }
69
- rescue => e
70
- NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
71
- NewRelic::SidekiqInstrumentation::Server.default_trace_args(msg)
72
- end
73
- end
74
-
75
20
  Sidekiq.configure_client do |config|
76
21
  config.client_middleware do |chain|
77
- chain.add NewRelic::SidekiqInstrumentation::Client
22
+ chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Client)
78
23
  end
79
24
  end
80
25
 
81
26
  Sidekiq.configure_server do |config|
82
27
  config.client_middleware do |chain|
83
- chain.add NewRelic::SidekiqInstrumentation::Client
28
+ chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Client)
84
29
  end
85
30
  config.server_middleware do |chain|
86
- chain.add NewRelic::SidekiqInstrumentation::Server
31
+ chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Server)
87
32
  end
88
33
 
89
34
  if config.respond_to?(:error_handlers)
90
- config.error_handlers << Proc.new do |error, *_|
35
+ config.error_handlers << proc do |error, *_|
91
36
  NewRelic::Agent.notice_error(error)
92
37
  end
93
38
  end
94
39
  end
95
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
96
55
  end
@@ -0,0 +1,55 @@
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 Sinatra
7
+ module Chain
8
+ def self.instrument!
9
+ ::Sinatra::Base.class_eval do
10
+ include ::NewRelic::Agent::Instrumentation::Sinatra::Tracer
11
+
12
+ def dispatch_with_newrelic
13
+ dispatch_with_tracing { dispatch_without_newrelic }
14
+ end
15
+ alias dispatch_without_newrelic dispatch!
16
+ alias dispatch! dispatch_with_newrelic
17
+
18
+ def process_route_with_newrelic(*args, &block)
19
+ process_route_with_tracing(*args) do
20
+ process_route_without_newrelic(*args, &block)
21
+ end
22
+ end
23
+ alias process_route_without_newrelic process_route
24
+ alias process_route process_route_with_newrelic
25
+
26
+ def route_eval_with_newrelic(*args, &block)
27
+ route_eval_with_tracing(*args) do
28
+ route_eval_without_newrelic(*args, &block)
29
+ end
30
+ end
31
+ alias route_eval_without_newrelic route_eval
32
+ alias route_eval route_eval_with_newrelic
33
+ end
34
+ end
35
+ end
36
+
37
+ module Build
38
+ module Chain
39
+ def self.instrument!
40
+ ::Sinatra::Base.class_eval do
41
+ class << self
42
+ def build_with_newrelic(*args, &block)
43
+ build_with_tracing(*args) do
44
+ build_without_newrelic(*args, &block)
45
+ end
46
+ end
47
+ alias build_without_newrelic build
48
+ alias build build_with_newrelic
49
+ end
50
+ end
51
+ end
52
+ end
53
+ end
54
+ end
55
+ end
@@ -1,50 +1,44 @@
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
- module NewRelic
6
- module Agent
7
- module Instrumentation
8
- module Sinatra
9
- module Ignorer
5
+ module NewRelic::Agent::Instrumentation
6
+ module Sinatra
7
+ module Ignorer
8
+ def self.should_ignore?(app, type)
9
+ return false if !app.settings.respond_to?(:newrelic_ignores)
10
10
 
11
- def self.should_ignore?(app, type)
12
- return false if !app.settings.respond_to?(:newrelic_ignores)
13
-
14
- app.settings.newrelic_ignores[type].any? do |pattern|
15
- pattern.match(app.request.path_info)
16
- end
17
- end
18
-
19
- def newrelic_ignore(*routes)
20
- set_newrelic_ignore(:routes, *routes)
21
- end
11
+ app.settings.newrelic_ignores[type].any? do |pattern|
12
+ pattern.match(app.request.path_info)
13
+ end
14
+ end
22
15
 
23
- def newrelic_ignore_apdex(*routes)
24
- set_newrelic_ignore(:apdex, *routes)
25
- end
16
+ def newrelic_ignore(*routes)
17
+ set_newrelic_ignore(:routes, *routes)
18
+ end
26
19
 
27
- def newrelic_ignore_enduser(*routes)
28
- set_newrelic_ignore(:enduser, *routes)
29
- end
20
+ def newrelic_ignore_apdex(*routes)
21
+ set_newrelic_ignore(:apdex, *routes)
22
+ end
30
23
 
31
- private
24
+ def newrelic_ignore_enduser(*routes)
25
+ set_newrelic_ignore(:enduser, *routes)
26
+ end
32
27
 
33
- def set_newrelic_ignore(type, *routes)
34
- # Important to default this in the context of the actual app
35
- # If it's done at register time, ignores end up shared between apps.
36
- set :newrelic_ignores, Hash.new([]) if !respond_to?(:newrelic_ignores)
28
+ private
37
29
 
38
- # If we call an ignore without a route, it applies to the whole app
39
- routes = ["*"] if routes.empty?
30
+ def set_newrelic_ignore(type, *routes)
31
+ # Important to default this in the context of the actual app
32
+ # If it's done at register time, ignores end up shared between apps.
33
+ set(:newrelic_ignores, Hash.new([])) if !respond_to?(:newrelic_ignores)
40
34
 
41
- settings.newrelic_ignores[type] += routes.map do |r|
42
- # Ugly sending to private Base#compile, but we want to mimic
43
- # exactly Sinatra's mapping of route text to regex
44
- Array(send(:compile, r)).first
45
- end
46
- end
35
+ # If we call an ignore without a route, it applies to the whole app
36
+ routes = ["*"] if routes.empty?
47
37
 
38
+ settings.newrelic_ignores[type] += routes.map do |r|
39
+ # Ugly sending to private Base#compile, but we want to mimic
40
+ # exactly Sinatra's mapping of route text to regex
41
+ Array(send(:compile, r)).first
48
42
  end
49
43
  end
50
44
  end
@@ -0,0 +1,125 @@
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
+ # NewRelic instrumentation for Sinatra applications. Sinatra actions will
6
+ # appear in the UI similar to controller actions, and have breakdown charts
7
+ # and transaction traces.
8
+ #
9
+ # The actions in the UI will correspond to the pattern expression used
10
+ # to match them, not directly to full URL's.
11
+ module NewRelic::Agent::Instrumentation
12
+ module Sinatra
13
+ module Tracer
14
+ include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
15
+
16
+ def self.included(clazz)
17
+ clazz.extend(self)
18
+ end
19
+
20
+ # Expected method for supporting ControllerInstrumentation
21
+ def newrelic_request_headers(_)
22
+ request.env
23
+ end
24
+
25
+ def newrelic_middlewares
26
+ middlewares = [NewRelic::Rack::BrowserMonitoring]
27
+ if NewRelic::Rack::AgentHooks.needed?
28
+ middlewares << NewRelic::Rack::AgentHooks
29
+ end
30
+ middlewares
31
+ end
32
+
33
+ def build_with_tracing(*args, &block)
34
+ unless NewRelic::Agent.config[:disable_sinatra_auto_middleware]
35
+ newrelic_middlewares.each do |middleware_class|
36
+ try_to_use(self, middleware_class)
37
+ end
38
+ end
39
+ yield
40
+ end
41
+
42
+ def install_lock
43
+ @install_lock ||= Mutex.new
44
+ end
45
+
46
+ def try_to_use(app, clazz)
47
+ install_lock.synchronize do
48
+ has_middleware = app.middleware && app.middleware.any? { |info| info && info[0] == clazz }
49
+ app.use(clazz) unless has_middleware
50
+ end
51
+ end
52
+
53
+ # Capture last route we've seen. Will set for transaction on route_eval
54
+ def process_route_with_tracing(*args)
55
+ begin
56
+ env["newrelic.last_route"] = args[0]
57
+ rescue => e
58
+ ::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
59
+ end
60
+ yield
61
+ end
62
+
63
+ # If a transaction name is already set, this call will tromple over it.
64
+ # This is intentional, as typically passing to a separate route is like
65
+ # an entirely separate transaction, so we pick up the new name.
66
+ #
67
+ # If we're ignored, this remains safe, since set_transaction_name
68
+ # care for the gating on the transaction's existence for us.
69
+ def route_eval_with_tracing(*args)
70
+ begin
71
+ if txn_name = TransactionNamer.transaction_name_for_route(env, request)
72
+ ::NewRelic::Agent::Transaction.set_default_transaction_name(
73
+ "#{self.class.name}/#{txn_name}", :sinatra
74
+ )
75
+ end
76
+ rescue => e
77
+ ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
78
+ end
79
+ yield
80
+ end
81
+
82
+ def get_request_params
83
+ begin
84
+ @request.params
85
+ rescue => e
86
+ NewRelic::Agent.logger.debug("Failed to get params from Rack request.", e)
87
+ nil
88
+ end
89
+ end
90
+
91
+ def dispatch_with_tracing
92
+ request_params = get_request_params
93
+ filtered_params = ::NewRelic::Agent::ParameterFiltering::apply_filters(request.env, request_params || {})
94
+
95
+ name = TransactionNamer.initial_transaction_name(request)
96
+ perform_action_with_newrelic_trace(:category => :sinatra,
97
+ :name => name,
98
+ :params => filtered_params) do
99
+ begin
100
+ yield
101
+ ensure
102
+ # Will only see an error raised if :show_exceptions is true, but
103
+ # will always see them in the env hash if they occur
104
+ had_error = env.has_key?('sinatra.error')
105
+ ::NewRelic::Agent.notice_error(env['sinatra.error']) if had_error
106
+ end
107
+ end
108
+ end
109
+
110
+ def do_not_trace?
111
+ Ignorer.should_ignore?(self, :routes)
112
+ end
113
+
114
+ # Overrides ControllerInstrumentation implementation
115
+ def ignore_apdex?
116
+ Ignorer.should_ignore?(self, :apdex)
117
+ end
118
+
119
+ # Overrides ControllerInstrumentation implementation
120
+ def ignore_enduser?
121
+ Ignorer.should_ignore?(self, :enduser)
122
+ end
123
+ end
124
+ end
125
+ 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
+ module NewRelic::Agent::Instrumentation
6
+ module Sinatra
7
+ module Prepend
8
+ include ::NewRelic::Agent::Instrumentation::Sinatra::Tracer
9
+
10
+ def dispatch!
11
+ dispatch_with_tracing { super }
12
+ end
13
+
14
+ def process_route(*args, &block)
15
+ process_route_with_tracing(*args) { super }
16
+ end
17
+
18
+ def route_eval(*args, &block)
19
+ route_eval_with_tracing(*args) { super }
20
+ end
21
+ end
22
+
23
+ module Build
24
+ module Prepend
25
+ include ::NewRelic::Agent::Instrumentation::Sinatra::Tracer
26
+
27
+ def build(*args, &block)
28
+ build_with_tracing(*args) { super }
29
+ end
30
+ end
31
+ end
32
+ end
33
+ end