newrelic_rpm 8.2.0 → 9.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (439) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +5 -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 +3654 -2951
  10. data/CONTRIBUTING.md +21 -6
  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 +20 -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 +11 -7
  29. data/lib/new_relic/agent/agent.rb +94 -924
  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 +5 -7
  47. data/lib/new_relic/agent/configuration/default_source.rb +1353 -1355
  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 +13 -6
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +8 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +82 -68
  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 +19 -18
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +16 -13
  58. data/lib/new_relic/agent/configuration.rb +1 -1
  59. data/lib/new_relic/agent/connect/request_builder.rb +17 -19
  60. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -15
  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 +37 -48
  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 +1 -1
  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 +7 -9
  75. data/lib/new_relic/agent/deprecator.rb +1 -1
  76. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +6 -6
  77. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +31 -29
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -21
  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 +49 -51
  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 +37 -36
  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 +27 -23
  87. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  88. data/lib/new_relic/agent/error_filter.rb +15 -16
  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 +22 -20
  94. data/lib/new_relic/agent/external.rb +11 -12
  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 +8 -9
  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 +2 -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 +37 -30
  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 +19 -5
  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 +26 -17
  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 +20 -22
  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 +67 -58
  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 +4 -9
  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 +24 -8
  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 +2 -2
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +27 -20
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -1
  189. data/lib/new_relic/agent/instrumentation/logger.rb +7 -6
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +26 -18
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -10
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +20 -18
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +22 -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 +3 -3
  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 +8 -8
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +51 -9
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -1
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +4 -3
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +2 -2
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +4 -9
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +5 -6
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +27 -19
  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 +13 -7
  215. data/lib/new_relic/agent/instrumentation/rack.rb +15 -15
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +15 -15
  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 +13 -7
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +4 -5
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +2 -2
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +4 -5
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +2 -3
  236. data/lib/new_relic/agent/instrumentation/resque.rb +17 -17
  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 -70
  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 +5 -4
  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 +1 -1
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +2 -2
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -1
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +4 -4
  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 +38 -37
  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 +21 -17
  270. data/lib/new_relic/agent/memory_logger.rb +2 -2
  271. data/lib/new_relic/agent/messaging.rb +61 -63
  272. data/lib/new_relic/agent/method_tracer.rb +28 -22
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +88 -11
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +16 -16
  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 +242 -185
  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 +17 -11
  290. data/lib/new_relic/agent/pipe_service.rb +7 -4
  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 +2 -1
  300. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +6 -6
  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 +10 -10
  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 +7 -7
  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 +10 -9
  316. data/lib/new_relic/agent/threading/thread_profile.rb +22 -22
  317. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  318. data/lib/new_relic/agent/tracer.rb +82 -56
  319. data/lib/new_relic/agent/transaction/abstract_segment.rb +100 -37
  320. data/lib/new_relic/agent/transaction/datastore_segment.rb +19 -18
  321. data/lib/new_relic/agent/transaction/distributed_tracer.rb +62 -56
  322. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  323. data/lib/new_relic/agent/transaction/external_request_segment.rb +41 -34
  324. data/lib/new_relic/agent/transaction/message_broker_segment.rb +30 -29
  325. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  326. data/lib/new_relic/agent/transaction/segment.rb +17 -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 +169 -125
  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 +21 -20
  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 +4 -4
  353. data/lib/new_relic/agent/vm.rb +1 -1
  354. data/lib/new_relic/agent/worker_loop.rb +5 -7
  355. data/lib/new_relic/agent.rb +62 -81
  356. data/lib/new_relic/cli/command.rb +20 -22
  357. data/lib/new_relic/cli/commands/deployments.rb +91 -41
  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 +2 -1
  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 +17 -21
  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 +6 -17
  397. data/lib/newrelic_rpm.rb +14 -3
  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 +2 -2
  401. data/lib/tasks/config.rake +21 -117
  402. data/lib/tasks/coverage_report.rake +28 -0
  403. data/lib/tasks/helpers/format.rb +123 -0
  404. data/lib/tasks/helpers/matches.rb +12 -0
  405. data/lib/tasks/helpers/prompt.rb +24 -0
  406. data/lib/tasks/helpers/removers.rb +33 -0
  407. data/lib/tasks/install.rake +4 -0
  408. data/lib/tasks/instrumentation_generator/README.md +63 -0
  409. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  410. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  411. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  412. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  414. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  415. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  417. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  418. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  420. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  421. data/lib/tasks/multiverse.rake +4 -0
  422. data/lib/tasks/multiverse.rb +5 -32
  423. data/lib/tasks/newrelic.rb +1 -1
  424. data/lib/tasks/tests.rake +10 -15
  425. data/newrelic.yml +544 -452
  426. data/newrelic_rpm.gemspec +35 -31
  427. data/recipes/newrelic.rb +2 -2
  428. data/test/agent_helper.rb +196 -180
  429. metadata +130 -102
  430. data/ROADMAP.md +0 -24
  431. data/bin/mongrel_rpm +0 -33
  432. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  433. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
  434. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  435. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
  436. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  437. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  438. /data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
  439. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,10 +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 HTTPClient
7
- module Chain
7
+ module Chain
8
8
  def self.instrument!
9
9
  ::HTTPClient.class_eval do
10
10
  include NewRelic::Agent::Instrumentation::HTTPClient::Instrumentation
@@ -14,7 +14,7 @@ module NewRelic::Agent::Instrumentation
14
14
  do_get_block_without_newrelic(req, proxy, conn, &block)
15
15
  end
16
16
  end
17
-
17
+
18
18
  alias :do_get_block_without_newrelic :do_get_block
19
19
  alias :do_get_block :do_get_block_with_newrelic
20
20
  end
@@ -22,4 +22,3 @@ module NewRelic::Agent::Instrumentation
22
22
  end
23
23
  end
24
24
  end
25
-
@@ -1,11 +1,11 @@
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 HTTPClient
7
7
  module Instrumentation
8
- def with_tracing request, connection
8
+ def with_tracing(request, connection)
9
9
  wrapped_request = NewRelic::Agent::HTTPClients::HTTPClientRequest.new(request)
10
10
  segment = NewRelic::Agent::Tracer.start_external_request_segment(
11
11
  library: wrapped_request.type,
@@ -15,24 +15,23 @@ module NewRelic::Agent::Instrumentation
15
15
 
16
16
  begin
17
17
  response = nil
18
- segment.add_request_headers wrapped_request
18
+ segment.add_request_headers(wrapped_request)
19
19
 
20
- NewRelic::Agent::Tracer.capture_segment_error segment do
20
+ NewRelic::Agent::Tracer.capture_segment_error(segment) do
21
21
  yield
22
22
  end
23
23
 
24
24
  response = connection.pop
25
- connection.push response
25
+ connection.push(response)
26
26
 
27
27
  wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPClientResponse.new(response)
28
- segment.process_response_headers wrapped_response
28
+ segment.process_response_headers(wrapped_response)
29
29
 
30
30
  response
31
31
  ensure
32
- segment.finish if segment
32
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
33
33
  end
34
34
  end
35
35
  end
36
36
  end
37
37
  end
38
-
@@ -1,7 +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.
4
-
3
+ # frozen_string_literal: true
5
4
 
6
5
  module NewRelic::Agent::Instrumentation
7
6
  module HTTPClient
@@ -14,4 +13,3 @@ module NewRelic::Agent::Instrumentation
14
13
  end
15
14
  end
16
15
  end
17
-
@@ -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 'httpclient/instrumentation'
6
6
  require_relative 'httpclient/chain'
@@ -23,14 +23,14 @@ DependencyDetection.defer do
23
23
  end
24
24
 
25
25
  executes do
26
- ::NewRelic::Agent.logger.info 'Installing HTTPClient instrumentation'
26
+ NewRelic::Agent.logger.info('Installing HTTPClient instrumentation')
27
27
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
28
28
  require 'new_relic/agent/http_clients/httpclient_wrappers'
29
29
  end
30
30
 
31
31
  executes do
32
32
  if use_prepend?
33
- prepend_instrument ::HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
33
+ prepend_instrument HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
34
34
  else
35
35
  chain_instrument NewRelic::Agent::Instrumentation::HTTPClient::Chain
36
36
  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 HTTPrb
@@ -12,11 +12,11 @@ module NewRelic::Agent::Instrumentation
12
12
  def perform_with_newrelic_trace(request, options)
13
13
  with_tracing(request) { perform_without_newrelic_trace(request, options) }
14
14
  end
15
-
15
+
16
16
  alias perform_without_newrelic_trace perform
17
17
  alias perform perform_with_newrelic_trace
18
18
  end
19
19
  end
20
20
  end
21
21
  end
22
- end
22
+ end
@@ -1,30 +1,30 @@
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 HTTPrb
7
7
  def with_tracing(request)
8
8
  wrapped_request = ::NewRelic::Agent::HTTPClients::HTTPRequest.new(request)
9
-
9
+
10
10
  begin
11
11
  segment = NewRelic::Agent::Tracer.start_external_request_segment(
12
12
  library: wrapped_request.type,
13
13
  uri: wrapped_request.uri,
14
14
  procedure: wrapped_request.method
15
15
  )
16
-
17
- segment.add_request_headers wrapped_request
18
-
16
+
17
+ segment.add_request_headers(wrapped_request)
18
+
19
19
  response = NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
20
-
21
- wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
22
- segment.process_response_headers wrapped_response
23
-
20
+
21
+ wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new(response)
22
+ segment.process_response_headers(wrapped_response)
23
+
24
24
  response
25
25
  ensure
26
- segment.finish if segment
26
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
27
27
  end
28
28
  end
29
29
  end
30
- end
30
+ 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 HTTPrb
@@ -8,7 +8,7 @@ module NewRelic::Agent::Instrumentation
8
8
  include NewRelic::Agent::Instrumentation::HTTPrb
9
9
 
10
10
  def perform(request, options)
11
- with_tracing(request) { super }
11
+ with_tracing(request) { super }
12
12
  end
13
13
  end
14
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 'httprb/instrumentation'
6
6
  require_relative 'httprb/chain'
@@ -14,16 +14,16 @@ DependencyDetection.defer do
14
14
  end
15
15
 
16
16
  executes do
17
- ::NewRelic::Agent.logger.info "Installing http.rb Wrappers"
17
+ NewRelic::Agent.logger.info("Installing http.rb Wrappers")
18
18
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
19
19
  require 'new_relic/agent/http_clients/http_rb_wrappers'
20
20
  end
21
21
 
22
22
  executes do
23
23
  if use_prepend?
24
- prepend_instrument HTTP::Client, ::NewRelic::Agent::Instrumentation::HTTPrb::Prepend
24
+ prepend_instrument HTTP::Client, NewRelic::Agent::Instrumentation::HTTPrb::Prepend
25
25
  else
26
- chain_instrument ::NewRelic::Agent::Instrumentation::HTTPrb::Chain
26
+ chain_instrument NewRelic::Agent::Instrumentation::HTTPrb::Chain
27
27
  end
28
28
  end
29
29
  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
@@ -10,14 +10,14 @@ module NewRelic
10
10
  # We'll walk the superclass chain and see if
11
11
  # any class says 'yes, filter this one'.
12
12
 
13
- while klass.respond_to? :newrelic_read_attr
13
+ while klass.respond_to?(:newrelic_read_attr)
14
14
  ignore_actions = klass.newrelic_read_attr(key)
15
15
 
16
16
  should_filter = case ignore_actions
17
17
  when Hash
18
- only_actions = Array(ignore_actions[:only])
18
+ only_actions = Array(ignore_actions[:only])
19
19
  except_actions = Array(ignore_actions[:except])
20
- action_name = action_name.to_sym
20
+ action_name = action_name.to_sym
21
21
 
22
22
  only_actions.include?(action_name) || (!except_actions.empty? && !except_actions.include?(action_name))
23
23
  else
@@ -38,4 +38,3 @@ module NewRelic
38
38
  end
39
39
  end
40
40
  end
41
-
@@ -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 Logger
@@ -8,7 +8,7 @@ module NewRelic::Agent::Instrumentation
8
8
  ::Logger.class_eval do
9
9
  include NewRelic::Agent::Instrumentation::Logger
10
10
 
11
- alias_method :format_message_without_new_relic, :format_message
11
+ alias_method(:format_message_without_new_relic, :format_message)
12
12
 
13
13
  def format_message(severity, datetime, progname, msg)
14
14
  format_message_with_tracing(severity, datetime, progname, msg) do
@@ -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
@@ -10,27 +10,36 @@ module NewRelic
10
10
  defined?(@skip_instrumenting) && @skip_instrumenting
11
11
  end
12
12
 
13
- def mark_skip_instrumenting
14
- @skip_instrumenting = true
13
+ # We support setting this on loggers which might not have
14
+ # instrumentation installed yet. This lets us disable in AgentLogger
15
+ # and AuditLogger without them having to know the inner details.
16
+ def self.mark_skip_instrumenting(logger)
17
+ return if logger.frozen?
18
+
19
+ logger.instance_variable_set(:@skip_instrumenting, true)
15
20
  end
16
21
 
17
- def clear_skip_instrumenting
18
- @skip_instrumenting = false
22
+ def self.clear_skip_instrumenting(logger)
23
+ return if logger.frozen?
24
+
25
+ logger.instance_variable_set(:@skip_instrumenting, false)
19
26
  end
20
27
 
21
- LINES = "Logging/lines".freeze
22
- SIZE = "Logging/size".freeze
28
+ def mark_skip_instrumenting
29
+ return if frozen?
23
30
 
24
- def line_metric_name_by_severity(severity)
25
- @line_metrics ||= {}
26
- @line_metrics[severity] ||= "Logging/lines/#{severity}".freeze
31
+ @skip_instrumenting = true
27
32
  end
28
33
 
29
- def size_metric_name_by_severity(severity)
30
- @size_metrics ||= {}
31
- @size_metrics[severity] ||= "Logging/size/#{severity}".freeze
34
+ def clear_skip_instrumenting
35
+ return if frozen?
36
+
37
+ @skip_instrumenting = false
32
38
  end
33
39
 
40
+ def self.enabled?
41
+ NewRelic::Agent.config[:'instrumentation.logger'] != 'disabled'
42
+ end
34
43
 
35
44
  def format_message_with_tracing(severity, datetime, progname, msg)
36
45
  formatted_message = yield
@@ -41,14 +50,12 @@ module NewRelic
41
50
  # methods within NewRelic::Agent, or we'll stack overflow!!
42
51
  mark_skip_instrumenting
43
52
 
44
- NewRelic::Agent.increment_metric(LINES)
45
- NewRelic::Agent.increment_metric(line_metric_name_by_severity(severity))
46
-
47
- size = formatted_message.nil? ? 0 : formatted_message.bytesize
48
- NewRelic::Agent.record_metric(SIZE, size)
49
- NewRelic::Agent.record_metric(size_metric_name_by_severity(severity), size)
53
+ unless ::NewRelic::Agent.agent.nil?
54
+ ::NewRelic::Agent.agent.log_event_aggregator.record(formatted_message, severity)
55
+ formatted_message = LocalLogDecorator.decorate(formatted_message)
56
+ end
50
57
 
51
- return formatted_message
58
+ formatted_message
52
59
  ensure
53
60
  clear_skip_instrumenting
54
61
  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 Logger::Prepend
@@ -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 'logger/instrumentation'
6
6
  require_relative 'logger/chain'
@@ -9,15 +9,16 @@ require_relative 'logger/prepend'
9
9
  DependencyDetection.defer do
10
10
  named :logger
11
11
 
12
- depends_on { defined?(::Logger) }
13
-
14
- executes do
15
- ::NewRelic::Agent.logger.info "Installing Logger instrumentation"
12
+ depends_on do
13
+ defined?(Logger) &&
14
+ NewRelic::Agent.config[:'application_logging.enabled']
16
15
  end
17
16
 
18
17
  executes do
18
+ NewRelic::Agent.logger.info("Installing Logger instrumentation")
19
+
19
20
  if use_prepend?
20
- prepend_instrument ::Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
21
+ prepend_instrument Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
21
22
  else
22
23
  chain_instrument NewRelic::Agent::Instrumentation::Logger
23
24
  end
@@ -1,4 +1,3 @@
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.
4
3
  # frozen_string_literal: true
@@ -8,8 +7,8 @@ module NewRelic::Agent::Instrumentation
8
7
  module Chain
9
8
  extend Helper
10
9
 
11
- def self.instrument! target_class
12
- instrument_methods target_class, client_methods
10
+ def self.instrument!(target_class)
11
+ instrument_methods(target_class, client_methods)
13
12
  end
14
13
  end
15
14
  end
@@ -1,4 +1,3 @@
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.
4
3
  # frozen_string_literal: true
@@ -9,12 +8,13 @@ module NewRelic
9
8
  module Memcache
10
9
  module Dalli
11
10
  extend Helper
11
+
12
12
  module_function
13
13
 
14
14
  def instrument!
15
15
  if supports_datastore_instances?
16
16
  instrument_methods(::Dalli::Client, dalli_methods)
17
- instrument_multi_method :get_multi
17
+ instrument_multi_method(:get_multi)
18
18
  instrument_send_multiget
19
19
  instrument_server_for_key
20
20
  else
@@ -22,19 +22,19 @@ module NewRelic
22
22
  end
23
23
  end
24
24
 
25
- def instrument_multi_method method_name
26
- visibility = NewRelic::Helper.instance_method_visibility ::Dalli::Client, method_name
25
+ def instrument_multi_method(method_name)
26
+ visibility = NewRelic::Helper.instance_method_visibility(::Dalli::Client, method_name)
27
27
  method_name_without = :"#{method_name}_without_newrelic_trace"
28
28
 
29
29
  ::Dalli::Client.class_eval do
30
- alias_method method_name_without, method_name
30
+ alias_method(method_name_without, method_name)
31
31
 
32
- define_method method_name do |*args, &block|
33
- get_multi_with_newrelic_tracing(method_name) { __send__ method_name_without, *args, &block }
32
+ define_method(method_name) do |*args, &block|
33
+ get_multi_with_newrelic_tracing(method_name) { __send__(method_name_without, *args, &block) }
34
34
  end
35
35
 
36
- __send__ visibility, method_name
37
- __send__ visibility, method_name_without
36
+ __send__(visibility, method_name)
37
+ __send__(visibility, method_name_without)
38
38
  end
39
39
  end
40
40
 
@@ -42,10 +42,10 @@ module NewRelic
42
42
  ::Dalli::Ring.class_eval do
43
43
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
44
44
 
45
- alias_method :server_for_key_without_newrelic_trace, :server_for_key
45
+ alias_method(:server_for_key_without_newrelic_trace, :server_for_key)
46
46
 
47
- def server_for_key key
48
- server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace key }
47
+ def server_for_key(key)
48
+ server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace(key) }
49
49
  end
50
50
  end
51
51
  end
@@ -57,10 +57,18 @@ module NewRelic
57
57
  ::Dalli::Server
58
58
  end.class_eval do
59
59
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
60
- alias_method :send_multiget_without_newrelic_trace, :send_multiget
61
60
 
62
- def send_multiget keys
63
- send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace keys }
61
+ # TODO: Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
62
+ if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
63
+ alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
64
+ def pipelined_get(keys)
65
+ send_multiget_with_newrelic_tracing(keys) { pipelined_get_without_newrelic_trace(keys) }
66
+ end
67
+ else
68
+ alias_method(:send_multiget_without_newrelic_trace, :send_multiget)
69
+ def send_multiget(keys)
70
+ send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace(keys) }
71
+ end
64
72
  end
65
73
  end
66
74
  end
@@ -69,6 +77,7 @@ module NewRelic
69
77
  module DalliCAS
70
78
  extend Dalli
71
79
  extend Helper
80
+
72
81
  module_function
73
82
 
74
83
  def should_instrument?
@@ -76,12 +85,11 @@ module NewRelic
76
85
  end
77
86
 
78
87
  def instrument!
79
- instrument_methods ::Dalli::Client, dalli_cas_methods
80
- instrument_multi_method :get_multi_cas
88
+ instrument_methods(::Dalli::Client, dalli_cas_methods)
89
+ instrument_multi_method(:get_multi_cas)
81
90
  end
82
91
  end
83
92
  end
84
93
  end
85
94
  end
86
95
  end
87
-
@@ -1,4 +1,3 @@
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.
4
3
  # frozen_string_literal: true
@@ -6,8 +5,8 @@
6
5
  module NewRelic::Agent::Instrumentation
7
6
  module Memcache
8
7
  module Helper
9
- DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new '2.6.4'
10
- BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new '3.0.2'
8
+ DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new('2.6.4')
9
+ BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new('3.0.2')
11
10
 
12
11
  def supports_datastore_instances?
13
12
  DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
@@ -38,24 +37,23 @@ module NewRelic::Agent::Instrumentation
38
37
 
39
38
  def instrument_methods(client_class, requested_methods = METHODS)
40
39
  supported_methods_for(client_class, requested_methods).each do |method_name|
41
- visibility = NewRelic::Helper.instance_method_visibility client_class, method_name
40
+ visibility = NewRelic::Helper.instance_method_visibility(client_class, method_name)
42
41
  method_name_without = :"#{method_name}_without_newrelic_trace"
43
42
 
44
43
  client_class.class_eval do
45
44
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
46
45
 
47
- alias_method method_name_without, method_name
46
+ alias_method(method_name_without, method_name)
48
47
 
49
- define_method method_name do |*args, &block|
50
- with_newrelic_tracing(method_name, *args) { __send__ method_name_without, *args, &block }
48
+ define_method(method_name) do |*args, &block|
49
+ with_newrelic_tracing(method_name, *args) { __send__(method_name_without, *args, &block) }
51
50
  end
52
51
 
53
- __send__ visibility, method_name
54
- __send__ visibility, method_name_without
52
+ __send__(visibility, method_name)
53
+ __send__(visibility, method_name_without)
55
54
  end
56
55
  end
57
56
  end
58
57
  end
59
58
  end
60
59
  end
61
-
@@ -1,4 +1,3 @@
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.
4
3
  # frozen_string_literal: true
@@ -12,18 +11,19 @@ module NewRelic::Agent::Instrumentation
12
11
  MULTIGET_METRIC_NAME = "get_multi_request"
13
12
  MEMCACHED = "Memcached"
14
13
 
15
- def with_newrelic_tracing operation, *args
16
- segment = NewRelic::Agent::Tracer.start_datastore_segment \
14
+ def with_newrelic_tracing(operation, *args)
15
+ segment = NewRelic::Agent::Tracer.start_datastore_segment( \
17
16
  product: MEMCACHED,
18
17
  operation: operation
18
+ )
19
19
 
20
20
  begin
21
21
  NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
22
22
  ensure
23
23
  if NewRelic::Agent.config[:capture_memcache_keys]
24
- segment.notice_nosql_statement "#{operation} #{args.first.inspect}"
24
+ segment.notice_nosql_statement("#{operation} #{args.first.inspect}")
25
25
  end
26
- segment.finish if segment
26
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
27
27
  end
28
28
  end
29
29
 
@@ -37,51 +37,53 @@ module NewRelic::Agent::Instrumentation
37
37
  end
38
38
  end
39
39
  rescue => e
40
- ::NewRelic::Agent.logger.warn "Unable to set instance info on datastore segment: #{e.message}"
40
+ ::NewRelic::Agent.logger.warn("Unable to set instance info on datastore segment: #{e.message}")
41
41
  end
42
42
  end
43
43
  end
44
44
 
45
- def get_multi_with_newrelic_tracing method_name
46
- segment = NewRelic::Agent::Tracer.start_segment \
45
+ def get_multi_with_newrelic_tracing(method_name)
46
+ segment = NewRelic::Agent::Tracer.start_segment( \
47
47
  name: "Ruby/Memcached/Dalli/#{method_name}"
48
+ )
48
49
 
49
50
  begin
50
51
  NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
51
52
  ensure
52
- segment.finish if segment
53
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
53
54
  end
54
55
  end
55
56
 
56
- def send_multiget_with_newrelic_tracing keys
57
- segment = ::NewRelic::Agent::Tracer.start_datastore_segment \
57
+ def send_multiget_with_newrelic_tracing(keys)
58
+ segment = ::NewRelic::Agent::Tracer.start_datastore_segment( \
58
59
  product: MEMCACHED,
59
60
  operation: MULTIGET_METRIC_NAME
61
+ )
60
62
 
61
63
  begin
62
64
  assign_instance_to(segment, self)
63
65
  NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
64
66
  ensure
65
67
  if ::NewRelic::Agent.config[:capture_memcache_keys]
66
- segment.notice_nosql_statement "#{MULTIGET_METRIC_NAME} #{keys.inspect}"
68
+ segment.notice_nosql_statement("#{MULTIGET_METRIC_NAME} #{keys.inspect}")
67
69
  end
68
- segment.finish if segment
70
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
69
71
  end
70
72
  end
71
73
 
72
- def assign_instance_to segment, server
74
+ def assign_instance_to(segment, server)
73
75
  host = port_path_or_id = nil
74
- if server.hostname.start_with? SLASH
76
+ if server.hostname.start_with?(SLASH)
75
77
  host = LOCALHOST
76
78
  port_path_or_id = server.hostname
77
79
  else
78
80
  host = server.hostname
79
81
  port_path_or_id = server.port
80
82
  end
81
- segment.set_instance_info host, port_path_or_id
83
+ segment.set_instance_info(host, port_path_or_id)
82
84
  rescue => e
83
- ::NewRelic::Agent.logger.debug "Failed to retrieve memcached instance info: #{e.message}"
84
- segment.set_instance_info UNKNOWN, UNKNOWN
85
+ ::NewRelic::Agent.logger.debug("Failed to retrieve memcached instance info: #{e.message}")
86
+ segment.set_instance_info(UNKNOWN, UNKNOWN)
85
87
  end
86
88
  end
87
89
  end