newrelic_rpm 7.0.0 → 9.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (448) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +7 -2
  3. data/.rubocop.yml +1919 -0
  4. data/.rubocop_todo.yml +100 -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 +3754 -2825
  10. data/CONTRIBUTING.md +33 -7
  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 +23 -19
  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.rb +96 -925
  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 +74 -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 +23 -19
  38. data/lib/new_relic/agent/attribute_filter.rb +64 -47
  39. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  40. data/lib/new_relic/agent/attributes.rb +5 -4
  41. data/lib/new_relic/agent/audit_logger.rb +8 -3
  42. data/lib/new_relic/agent/autostart.rb +20 -18
  43. data/lib/new_relic/agent/chained_call.rb +1 -1
  44. data/lib/new_relic/agent/commands/agent_command.rb +3 -3
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +12 -10
  47. data/lib/new_relic/agent/configuration/default_source.rb +1366 -1297
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  49. data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +8 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +82 -69
  53. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  54. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  55. data/lib/new_relic/agent/configuration/security_policy_source.rb +82 -85
  56. data/lib/new_relic/agent/configuration/server_source.rb +21 -19
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
  58. data/lib/new_relic/agent/configuration.rb +1 -1
  59. data/lib/new_relic/agent/connect/request_builder.rb +18 -18
  60. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
  64. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  66. data/lib/new_relic/agent/database.rb +42 -50
  67. data/lib/new_relic/agent/database_adapter.rb +3 -1
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
  71. data/lib/new_relic/agent/datastores/mongo.rb +6 -11
  72. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  73. data/lib/new_relic/agent/datastores/redis.rb +5 -7
  74. data/lib/new_relic/agent/datastores.rb +13 -15
  75. data/lib/new_relic/agent/deprecator.rb +1 -1
  76. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
  77. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -34
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
  84. data/lib/new_relic/agent/distributed_tracing.rb +33 -35
  85. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  86. data/lib/new_relic/agent/error_collector.rb +73 -54
  87. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
  90. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  91. data/lib/new_relic/agent/event_buffer.rb +7 -8
  92. data/lib/new_relic/agent/event_listener.rb +1 -2
  93. data/lib/new_relic/agent/event_loop.rb +26 -24
  94. data/lib/new_relic/agent/external.rb +11 -44
  95. data/lib/new_relic/agent/guid_generator.rb +13 -11
  96. data/lib/new_relic/agent/harvester.rb +4 -5
  97. data/lib/new_relic/agent/heap.rb +7 -9
  98. data/lib/new_relic/agent/hostname.rb +20 -13
  99. data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
  108. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +39 -0
  109. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
  110. data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
  111. data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
  112. data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
  113. data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
  114. data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
  115. data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
  116. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +18 -19
  117. data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
  118. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +37 -35
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +49 -46
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
  127. data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
  128. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  129. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  130. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  131. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  132. data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
  133. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +11 -11
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +21 -23
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +4 -5
  137. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  138. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  139. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  140. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  141. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +69 -59
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +41 -43
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +52 -53
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +12 -14
  145. data/lib/new_relic/agent/instrumentation/curb.rb +7 -7
  146. data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
  147. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
  148. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +6 -9
  149. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +7 -12
  150. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
  151. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +28 -10
  152. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  153. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  154. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  155. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  156. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +6 -6
  157. data/lib/new_relic/agent/instrumentation/excon.rb +27 -30
  158. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
  159. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
  160. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
  161. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  162. data/lib/new_relic/agent/instrumentation/grape/chain.rb +7 -8
  163. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +12 -12
  164. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
  165. data/lib/new_relic/agent/instrumentation/grape.rb +12 -13
  166. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  167. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  168. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  169. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  170. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  171. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  172. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  173. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  174. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  175. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  176. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  177. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +3 -4
  178. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +7 -8
  179. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -3
  180. data/lib/new_relic/agent/instrumentation/httpclient.rb +3 -3
  181. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +3 -3
  182. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +11 -11
  183. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +2 -2
  184. data/lib/new_relic/agent/instrumentation/httprb.rb +4 -4
  185. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
  186. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  189. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +31 -19
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +12 -9
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +20 -18
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +28 -15
  195. data/lib/new_relic/agent/instrumentation/memcache.rb +22 -23
  196. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +11 -12
  197. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
  198. data/lib/new_relic/agent/instrumentation/mongo.rb +6 -144
  199. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
  200. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +4 -5
  201. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +10 -10
  202. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +5 -5
  203. data/lib/new_relic/agent/instrumentation/net_http.rb +12 -7
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +51 -9
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +24 -20
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +4 -3
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +3 -3
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +5 -8
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +30 -21
  212. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +3 -2
  213. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +14 -12
  214. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +15 -8
  215. data/lib/new_relic/agent/instrumentation/rack.rb +15 -15
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +18 -54
  217. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
  218. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
  219. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +17 -5
  220. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
  221. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  222. data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -7
  223. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +14 -16
  224. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
  225. data/lib/new_relic/agent/instrumentation/rake.rb +9 -9
  226. data/lib/new_relic/agent/instrumentation/redis/chain.rb +25 -14
  227. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  228. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +53 -25
  229. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  230. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +10 -5
  231. data/lib/new_relic/agent/instrumentation/redis.rb +16 -6
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +4 -5
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +9 -8
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +2 -3
  236. data/lib/new_relic/agent/instrumentation/resque.rb +25 -16
  237. data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
  238. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
  239. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  240. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  241. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  242. data/lib/new_relic/agent/instrumentation/sidekiq.rb +24 -65
  243. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
  244. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -3
  245. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +13 -6
  246. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
  247. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  248. data/lib/new_relic/agent/instrumentation/sinatra.rb +26 -17
  249. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  250. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  251. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  252. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  253. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  257. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +5 -5
  258. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +13 -15
  259. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +2 -2
  260. data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
  261. data/lib/new_relic/agent/instrumentation.rb +1 -1
  262. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  263. data/lib/new_relic/agent/javascript_instrumentor.rb +48 -42
  264. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  265. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  266. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  267. data/lib/new_relic/agent/log_once.rb +1 -1
  268. data/lib/new_relic/agent/log_priority.rb +20 -0
  269. data/lib/new_relic/agent/logging.rb +24 -21
  270. data/lib/new_relic/agent/memory_logger.rb +2 -2
  271. data/lib/new_relic/agent/messaging.rb +65 -81
  272. data/lib/new_relic/agent/method_tracer.rb +154 -149
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +88 -11
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +24 -17
  275. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  276. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  277. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
  278. data/lib/new_relic/agent/monitors.rb +6 -7
  279. data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
  280. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
  281. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  282. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
  283. data/lib/new_relic/agent/new_relic_service.rb +247 -186
  284. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  285. data/lib/new_relic/agent/null_logger.rb +7 -3
  286. data/lib/new_relic/agent/obfuscator.rb +8 -10
  287. data/lib/new_relic/agent/parameter_filtering.rb +24 -10
  288. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  289. data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
  290. data/lib/new_relic/agent/pipe_service.rb +8 -5
  291. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  292. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
  293. data/lib/new_relic/agent/range_extensions.rb +8 -28
  294. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  295. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -13
  296. data/lib/new_relic/agent/rules_engine.rb +5 -4
  297. data/lib/new_relic/agent/sampler.rb +3 -4
  298. data/lib/new_relic/agent/sampler_collection.rb +3 -4
  299. data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
  300. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
  301. data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
  302. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  303. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  304. data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
  305. data/lib/new_relic/agent/span_event_primitive.rb +62 -56
  306. data/lib/new_relic/agent/sql_sampler.rb +17 -17
  307. data/lib/new_relic/agent/stats.rb +78 -41
  308. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  309. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  310. data/lib/new_relic/agent/stats_engine.rb +8 -8
  311. data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
  312. data/lib/new_relic/agent/system_info.rb +85 -65
  313. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  314. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  315. data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
  316. data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
  317. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  318. data/lib/new_relic/agent/tracer.rb +89 -85
  319. data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
  320. data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
  321. data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
  322. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  323. data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
  324. data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
  325. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  326. data/lib/new_relic/agent/transaction/segment.rb +20 -10
  327. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  328. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  329. data/lib/new_relic/agent/transaction/trace.rb +15 -11
  330. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  331. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  332. data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
  333. data/lib/new_relic/agent/transaction/tracing.rb +14 -11
  334. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +5 -5
  335. data/lib/new_relic/agent/transaction.rb +175 -152
  336. data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
  337. data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
  338. data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
  339. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  340. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  341. data/lib/new_relic/agent/transaction_sampler.rb +5 -6
  342. data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
  343. data/lib/new_relic/agent/utilization/aws.rb +33 -3
  344. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  345. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  346. data/lib/new_relic/agent/utilization/pcf.rb +5 -4
  347. data/lib/new_relic/agent/utilization/vendor.rb +43 -28
  348. data/lib/new_relic/agent/utilization_data.rb +7 -5
  349. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  350. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
  351. data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
  352. data/lib/new_relic/agent/vm/snapshot.rb +5 -5
  353. data/lib/new_relic/agent/vm.rb +1 -1
  354. data/lib/new_relic/agent/worker_loop.rb +10 -12
  355. data/lib/new_relic/agent.rb +70 -86
  356. data/lib/new_relic/cli/command.rb +20 -22
  357. data/lib/new_relic/cli/commands/deployments.rb +92 -42
  358. data/lib/new_relic/cli/commands/install.rb +21 -24
  359. data/lib/new_relic/coerce.rb +15 -13
  360. data/lib/new_relic/collection_helper.rb +50 -48
  361. data/lib/new_relic/constants.rb +1 -4
  362. data/lib/new_relic/control/class_methods.rb +3 -3
  363. data/lib/new_relic/control/frameworks/external.rb +2 -2
  364. data/lib/new_relic/control/frameworks/rails.rb +13 -9
  365. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  366. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  367. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  368. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  369. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  370. data/lib/new_relic/control/frameworks.rb +1 -1
  371. data/lib/new_relic/control/instance_methods.rb +26 -45
  372. data/lib/new_relic/control/instrumentation.rb +39 -11
  373. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  374. data/lib/new_relic/control/server_methods.rb +3 -4
  375. data/lib/new_relic/control.rb +1 -2
  376. data/lib/new_relic/delayed_job_injection.rb +1 -1
  377. data/lib/new_relic/dependency_detection.rb +29 -28
  378. data/lib/new_relic/environment_report.rb +40 -32
  379. data/lib/new_relic/helper.rb +48 -7
  380. data/lib/new_relic/language_support.rb +29 -5
  381. data/lib/new_relic/latest_changes.rb +7 -6
  382. data/lib/new_relic/local_environment.rb +22 -26
  383. data/lib/new_relic/metric_data.rb +31 -26
  384. data/lib/new_relic/metric_spec.rb +8 -6
  385. data/lib/new_relic/noticed_error.rb +21 -25
  386. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  387. data/lib/new_relic/rack/agent_middleware.rb +5 -3
  388. data/lib/new_relic/rack/browser_monitoring.rb +133 -123
  389. data/lib/new_relic/rack.rb +1 -1
  390. data/lib/new_relic/recipes/capistrano3.rb +3 -61
  391. data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
  392. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  393. data/lib/new_relic/recipes.rb +1 -1
  394. data/lib/new_relic/supportability_helper.rb +8 -9
  395. data/lib/new_relic/traced_thread.rb +39 -0
  396. data/lib/new_relic/version.rb +5 -16
  397. data/lib/newrelic_rpm.rb +19 -32
  398. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +15 -18
  399. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +8 -14
  400. data/lib/tasks/all.rb +3 -3
  401. data/lib/tasks/config.rake +22 -117
  402. data/lib/tasks/coverage_report.rake +28 -0
  403. data/lib/tasks/helpers/config.html.erb +21 -0
  404. data/lib/tasks/helpers/format.rb +123 -0
  405. data/lib/tasks/helpers/matches.rb +12 -0
  406. data/lib/tasks/helpers/prompt.rb +24 -0
  407. data/lib/tasks/helpers/removers.rb +33 -0
  408. data/lib/tasks/install.rake +4 -0
  409. data/lib/tasks/instrumentation_generator/README.md +63 -0
  410. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  411. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  412. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  414. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  415. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  417. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  418. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  420. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  421. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  422. data/lib/tasks/multiverse.rake +4 -0
  423. data/lib/tasks/multiverse.rb +5 -32
  424. data/lib/tasks/newrelic.rb +1 -1
  425. data/lib/tasks/tests.rake +10 -15
  426. data/newrelic.yml +672 -3
  427. data/newrelic_rpm.gemspec +35 -31
  428. data/recipes/newrelic.rb +2 -2
  429. data/test/agent_helper.rb +221 -180
  430. metadata +141 -111
  431. data/ROADMAP.md +0 -24
  432. data/bin/mongrel_rpm +0 -33
  433. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  434. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  435. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
  436. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  437. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
  438. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  439. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  440. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  441. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  442. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  443. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  444. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  445. data/lib/new_relic/agent/supported_versions.rb +0 -275
  446. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  447. data/lib/tasks/config.html.erb +0 -32
  448. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,96 +1,55 @@
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
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
- 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
@@ -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::Agent::Instrumentation
6
6
  module Sinatra
@@ -1,11 +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
4
 
5
5
  module NewRelic::Agent::Instrumentation
6
6
  module Sinatra
7
7
  module Ignorer
8
-
9
8
  def self.should_ignore?(app, type)
10
9
  return false if !app.settings.respond_to?(:newrelic_ignores)
11
10
 
@@ -31,7 +30,7 @@ module NewRelic::Agent::Instrumentation
31
30
  def set_newrelic_ignore(type, *routes)
32
31
  # Important to default this in the context of the actual app
33
32
  # If it's done at register time, ignores end up shared between apps.
34
- set :newrelic_ignores, Hash.new([]) if !respond_to?(:newrelic_ignores)
33
+ set(:newrelic_ignores, Hash.new([])) if !respond_to?(:newrelic_ignores)
35
34
 
36
35
  # If we call an ignore without a route, it applies to the whole app
37
36
  routes = ["*"] if routes.empty?
@@ -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
  # NewRelic instrumentation for Sinatra applications. Sinatra actions will
6
6
  # appear in the UI similar to controller actions, and have breakdown charts
@@ -39,9 +39,15 @@ module NewRelic::Agent::Instrumentation
39
39
  yield
40
40
  end
41
41
 
42
+ def install_lock
43
+ @install_lock ||= Mutex.new
44
+ end
45
+
42
46
  def try_to_use(app, clazz)
43
- has_middleware = app.middleware.any? { |info| info[0] == clazz }
44
- app.use(clazz) unless has_middleware
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
45
51
  end
46
52
 
47
53
  # Capture last route we've seen. Will set for transaction on route_eval
@@ -64,7 +70,8 @@ module NewRelic::Agent::Instrumentation
64
70
  begin
65
71
  if txn_name = TransactionNamer.transaction_name_for_route(env, request)
66
72
  ::NewRelic::Agent::Transaction.set_default_transaction_name(
67
- "#{self.class.name}/#{txn_name}", :sinatra)
73
+ "#{self.class.name}/#{txn_name}", :sinatra
74
+ )
68
75
  end
69
76
  rescue => e
70
77
  ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
@@ -87,8 +94,8 @@ module NewRelic::Agent::Instrumentation
87
94
 
88
95
  name = TransactionNamer.initial_transaction_name(request)
89
96
  perform_action_with_newrelic_trace(:category => :sinatra,
90
- :name => name,
91
- :params => filtered_params) do
97
+ :name => name,
98
+ :params => filtered_params) do
92
99
  begin
93
100
  yield
94
101
  ensure
@@ -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::Agent::Instrumentation
6
6
  module Sinatra
@@ -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
@@ -12,7 +12,7 @@ module NewRelic
12
12
  SINATRA_ROUTE = 'sinatra.route'
13
13
 
14
14
  def transaction_name_for_route(env, request)
15
- if env.key? SINATRA_ROUTE
15
+ if env.key?(SINATRA_ROUTE)
16
16
  env[SINATRA_ROUTE]
17
17
  else
18
18
  name = route_for_sinatra(env)
@@ -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
  require_relative 'sinatra/transaction_namer'
6
6
  require_relative 'sinatra/ignorer'
@@ -11,39 +11,48 @@ require_relative 'sinatra/prepend'
11
11
  DependencyDetection.defer do
12
12
  named :sinatra
13
13
 
14
- depends_on { defined?(::Sinatra) && defined?(::Sinatra::Base) }
14
+ depends_on { defined?(Sinatra) && defined?(Sinatra::Base) }
15
15
  depends_on { Sinatra::Base.private_method_defined?(:dispatch!) }
16
16
  depends_on { Sinatra::Base.private_method_defined?(:process_route) }
17
17
  depends_on { Sinatra::Base.private_method_defined?(:route_eval) }
18
18
 
19
19
  executes do
20
- ::NewRelic::Agent.logger.info 'Installing Sinatra instrumentation'
20
+ NewRelic::Agent.logger.info('Installing Sinatra instrumentation')
21
21
  end
22
22
 
23
23
  executes do
24
24
  if use_prepend?
25
- prepend_instrument ::Sinatra::Base, NewRelic::Agent::Instrumentation::Sinatra::Prepend
25
+ prepend_instrument Sinatra::Base, NewRelic::Agent::Instrumentation::Sinatra::Prepend
26
26
  else
27
27
  chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Chain
28
28
  end
29
29
 
30
- ::Sinatra::Base.class_eval { register ::NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
31
- ::Sinatra.module_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
30
+ Sinatra::Base.class_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
31
+ Sinatra.module_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
32
32
  end
33
33
 
34
34
  executes do
35
- if Sinatra::Base.respond_to?(:build)
36
- # These requires are inside an executes block because they require rack, and
37
- # we can't be sure that rack is available when this file is first required.
38
- require 'new_relic/rack/agent_hooks'
39
- require 'new_relic/rack/browser_monitoring'
40
- if use_prepend?
41
- prepend_instrument ::Sinatra::Base.singleton_class, NewRelic::Agent::Instrumentation::Sinatra::Build::Prepend
42
- else
43
- chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Build::Chain
44
- end
35
+ # These requires are inside an executes block because they require rack, and
36
+ # we can't be sure that rack is available when this file is first required.
37
+ require 'new_relic/rack/agent_hooks'
38
+ require 'new_relic/rack/browser_monitoring'
39
+ if use_prepend?
40
+ prepend_instrument Sinatra::Base.singleton_class, NewRelic::Agent::Instrumentation::Sinatra::Build::Prepend
45
41
  else
46
- ::NewRelic::Agent.logger.info("Skipping auto-injection of middleware for Sinatra - requires Sinatra 1.2.1+")
42
+ chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Build::Chain
47
43
  end
48
44
  end
45
+
46
+ executes do
47
+ next unless Gem::Version.new(Sinatra::VERSION) < Gem::Version.new('2.0.0')
48
+
49
+ deprecation_msg = 'The Ruby Agent is dropping support for Sinatra versions below 2.0.0 ' \
50
+ 'in version 9.0.0. Please upgrade your Sinatra version to continue receiving full compatibility. ' \
51
+
52
+ NewRelic::Agent.logger.log_once(
53
+ :warn,
54
+ :deprecated_sinatra_version,
55
+ deprecation_msg
56
+ )
57
+ end
49
58
  end
@@ -0,0 +1,24 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'instrumentation'
6
+
7
+ module NewRelic::Agent::Instrumentation
8
+ module MonitoredThread
9
+ module Chain
10
+ def self.instrument!
11
+ ::Thread.class_eval do
12
+ include NewRelic::Agent::Instrumentation::MonitoredThread
13
+
14
+ alias_method(:initialize_without_new_relic, :initialize)
15
+
16
+ def initialize(*args, &block)
17
+ traced_block = add_thread_tracing(*args, &block)
18
+ initialize_with_newrelic_tracing { initialize_without_new_relic(*args, &traced_block) }
19
+ end
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
@@ -0,0 +1,28 @@
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 MonitoredThread
9
+ attr_reader :nr_parent_key
10
+
11
+ def initialize_with_newrelic_tracing
12
+ @nr_parent_key = NewRelic::Agent::Tracer.current_segment_key
13
+ yield
14
+ end
15
+
16
+ def add_thread_tracing(*args, &block)
17
+ return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
18
+
19
+ NewRelic::Agent::Tracer.thread_block_with_current_transaction(
20
+ *args,
21
+ segment_name: 'Ruby/Thread',
22
+ &block
23
+ )
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,22 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'instrumentation'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ module MonitoredThread
11
+ module Prepend
12
+ include NewRelic::Agent::Instrumentation::MonitoredThread
13
+
14
+ def initialize(*args, &block)
15
+ traced_block = add_thread_tracing(*args, &block)
16
+ initialize_with_newrelic_tracing { super(*args, &traced_block) }
17
+ end
18
+ end
19
+ end
20
+ end
21
+ end
22
+ 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
+ require_relative 'thread/chain'
6
+ require_relative 'thread/prepend'
7
+
8
+ DependencyDetection.defer do
9
+ named :thread
10
+
11
+ executes do
12
+ NewRelic::Agent.logger.info('Installing Thread Instrumentation')
13
+
14
+ if use_prepend?
15
+ prepend_instrument Thread, NewRelic::Agent::Instrumentation::MonitoredThread::Prepend
16
+ else
17
+ chain_instrument NewRelic::Agent::Instrumentation::MonitoredThread::Chain
18
+ end
19
+ end
20
+ end
@@ -0,0 +1,24 @@
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 Tilt
7
+ module Chain
8
+ def self.instrument!
9
+ ::Tilt::Template.module_eval do
10
+ include NewRelic::Agent::Instrumentation::Tilt
11
+
12
+ def render_with_new_relic(*args, &block)
13
+ render_with_tracing(*args) {
14
+ render_without_newrelic(*args, &block)
15
+ }
16
+ end
17
+
18
+ alias render_without_newrelic render
19
+ alias render render_with_new_relic
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
@@ -0,0 +1,41 @@
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 Tilt
9
+ def metric_name(klass, file)
10
+ "View/#{klass}/#{file}/Rendering"
11
+ end
12
+
13
+ # Sinatra uses #caller_locations for the file name in Tilt (unlike Rails/Rack)
14
+ # So here we are only grabbing the file name and name of directory it is in
15
+ def create_filename_for_metric(file)
16
+ return file unless defined?(::Sinatra) && defined?(::Sinatra::Base)
17
+
18
+ file.split('/')[-2..-1].join('/')
19
+ rescue NoMethodError
20
+ file
21
+ end
22
+
23
+ def render_with_tracing(*args, &block)
24
+ begin
25
+ finishable = Tracer.start_segment(
26
+ name: metric_name(self.class, create_filename_for_metric(self.file))
27
+ )
28
+ begin
29
+ yield
30
+ rescue => error
31
+ NewRelic::Agent.notice_error(error)
32
+ raise
33
+ end
34
+ ensure
35
+ finishable.finish if finishable
36
+ end
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end
@@ -0,0 +1,13 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic::Agent::Instrumentation
6
+ module Tilt::Prepend
7
+ include NewRelic::Agent::Instrumentation::Tilt
8
+
9
+ def render(*args, &block)
10
+ render_with_tracing { super }
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,25 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'tilt/instrumentation'
6
+ require_relative 'tilt/chain'
7
+ require_relative 'tilt/prepend'
8
+
9
+ DependencyDetection.defer do
10
+ named :tilt
11
+
12
+ depends_on { defined?(Tilt) }
13
+
14
+ executes do
15
+ NewRelic::Agent.logger.info('Installing Tilt instrumentation')
16
+ end
17
+
18
+ executes do
19
+ if use_prepend?
20
+ prepend_instrument Tilt::Template, NewRelic::Agent::Instrumentation::Tilt::Prepend
21
+ else
22
+ chain_instrument NewRelic::Agent::Instrumentation::Tilt::Chain
23
+ end
24
+ end
25
+ end
@@ -1,22 +1,22 @@
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::Agent::Instrumentation
6
6
  module Typhoeus
7
- module Chain
7
+ module Chain
8
8
  def self.instrument!
9
- ::Typhoeus::Hydra.class_eval do
9
+ ::Typhoeus::Hydra.class_eval do
10
10
  include NewRelic::Agent::Instrumentation::Typhoeus
11
11
 
12
12
  def run_with_newrelic(*args)
13
13
  with_tracing { run_without_newrelic(*args) }
14
14
  end
15
-
15
+
16
16
  alias run_without_newrelic run
17
17
  alias run run_with_newrelic
18
18
  end
19
19
  end
20
20
  end
21
21
  end
22
- end
22
+ end
@@ -1,14 +1,13 @@
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
7
7
  module Instrumentation
8
8
  module Typhoeus
9
-
10
- HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
11
- NOTICIBLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
9
+ HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
10
+ NOTICEABLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
12
11
 
13
12
  EARLIEST_VERSION = Gem::Version.new("0.5.3")
14
13
 
@@ -27,17 +26,17 @@ module NewRelic
27
26
  response.return_message
28
27
  else
29
28
  # 0.5.4 seems to have lost xxxx_message methods altogether.
30
- "timeout"
29
+ "timeout"
31
30
  end
32
31
  end
33
32
 
34
33
  def with_tracing
35
- segment = NewRelic::Agent::Tracer.start_segment name: HYDRA_SEGMENT_NAME
36
- instance_variable_set :@__newrelic_hydra_segment, segment
34
+ segment = NewRelic::Agent::Tracer.start_segment(name: HYDRA_SEGMENT_NAME)
35
+ instance_variable_set(:@__newrelic_hydra_segment, segment)
37
36
  begin
38
37
  yield
39
38
  ensure
40
- segment.finish if segment
39
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
41
40
  end
42
41
  end
43
42
 
@@ -58,21 +57,20 @@ module NewRelic
58
57
  parent: parent
59
58
  )
60
59
 
61
- segment.add_request_headers wrapped_request
60
+ segment.add_request_headers(wrapped_request)
62
61
 
63
- callback = Proc.new do
62
+ callback = proc do
64
63
  wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
65
64
 
66
- segment.process_response_headers wrapped_response
65
+ segment.process_response_headers(wrapped_response)
67
66
 
68
67
  if request.response.code == 0
69
- segment.notice_error NoticibleError.new NOTICIBLE_ERROR_CLASS, response_message(request.response)
68
+ segment.notice_error(NoticeableError.new(NOTICEABLE_ERROR_CLASS, response_message(request.response)))
70
69
  end
71
-
72
- segment.finish if segment
70
+
71
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
73
72
  end
74
73
  request.on_complete.unshift(callback)
75
-
76
74
  rescue => e
77
75
  NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
78
76
  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::Agent::Instrumentation
6
6
  module Typhoeus
@@ -11,4 +11,4 @@ module NewRelic::Agent::Instrumentation
11
11
  end
12
12
  end
13
13
  end
14
- end
14
+ 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
  require_relative 'typhoeus/instrumentation'
6
6
  require_relative 'typhoeus/chain'
@@ -18,7 +18,7 @@ DependencyDetection.defer do
18
18
  end
19
19
 
20
20
  executes do
21
- ::NewRelic::Agent.logger.info 'Installing Typhoeus instrumentation'
21
+ NewRelic::Agent.logger.info('Installing Typhoeus instrumentation')
22
22
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
23
23
  require 'new_relic/agent/http_clients/typhoeus_wrappers'
24
24
  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
  require 'new_relic/agent'
6
6
  module NewRelic
@@ -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
  # This is the base class for all errors that we want to record through the
6
6
  # NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
@@ -10,7 +10,7 @@
10
10
  module NewRelic
11
11
  module Agent
12
12
  class InternalAgentError < StandardError
13
- def initialize(msg=nil)
13
+ def initialize(msg = nil)
14
14
  super("Ruby agent internal error. Please contact support referencing this error.\n #{msg}")
15
15
  end
16
16
  end