newrelic_rpm 8.7.0 → 8.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (398) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +4 -0
  3. data/.rubocop.yml +68 -189
  4. data/.rubocop_todo.yml +52 -0
  5. data/.simplecov +15 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +1 -0
  8. data/Brewfile +1 -0
  9. data/CHANGELOG.md +181 -23
  10. data/CONTRIBUTING.md +1 -1
  11. data/Gemfile +0 -1
  12. data/Guardfile +1 -0
  13. data/README.md +1 -1
  14. data/Rakefile +13 -20
  15. data/Thorfile +5 -0
  16. data/bin/newrelic +2 -1
  17. data/bin/newrelic_cmd +1 -0
  18. data/bin/nrdebug +66 -45
  19. data/config.dot +5 -5
  20. data/init.rb +4 -4
  21. data/install.rb +2 -2
  22. data/lib/new_relic/agent/adaptive_sampler.rb +4 -4
  23. data/lib/new_relic/agent/agent/shutdown.rb +34 -0
  24. data/lib/new_relic/agent/agent/special_startup.rb +70 -0
  25. data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
  26. data/lib/new_relic/agent/agent/startup.rb +196 -0
  27. data/lib/new_relic/agent/agent.rb +134 -534
  28. data/lib/new_relic/agent/agent_logger.rb +8 -10
  29. data/lib/new_relic/agent/attribute_filter.rb +40 -21
  30. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  31. data/lib/new_relic/agent/attributes.rb +2 -2
  32. data/lib/new_relic/agent/audit_logger.rb +3 -3
  33. data/lib/new_relic/agent/autostart.rb +2 -2
  34. data/lib/new_relic/agent/chained_call.rb +1 -1
  35. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  36. data/lib/new_relic/agent/commands/agent_command_router.rb +8 -8
  37. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  38. data/lib/new_relic/agent/configuration/default_source.rb +105 -41
  39. data/lib/new_relic/agent/configuration/dotted_hash.rb +2 -2
  40. data/lib/new_relic/agent/configuration/environment_source.rb +5 -5
  41. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
  42. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  43. data/lib/new_relic/agent/configuration/manager.rb +5 -5
  44. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  45. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  46. data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -4
  47. data/lib/new_relic/agent/configuration/server_source.rb +7 -7
  48. data/lib/new_relic/agent/configuration/yaml_source.rb +6 -4
  49. data/lib/new_relic/agent/configuration.rb +1 -1
  50. data/lib/new_relic/agent/connect/request_builder.rb +3 -3
  51. data/lib/new_relic/agent/connect/response_handler.rb +5 -5
  52. data/lib/new_relic/agent/custom_event_aggregator.rb +5 -5
  53. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  54. data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
  55. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  56. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  57. data/lib/new_relic/agent/database.rb +21 -21
  58. data/lib/new_relic/agent/database_adapter.rb +1 -1
  59. data/lib/new_relic/agent/datastores/metric_helper.rb +12 -13
  60. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +4 -3
  61. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +2 -4
  62. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -2
  63. data/lib/new_relic/agent/datastores/mongo.rb +1 -1
  64. data/lib/new_relic/agent/datastores/redis.rb +3 -3
  65. data/lib/new_relic/agent/datastores.rb +4 -4
  66. data/lib/new_relic/agent/deprecator.rb +1 -1
  67. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -1
  68. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -17
  69. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -10
  70. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -19
  71. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -10
  72. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -3
  73. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -40
  74. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -15
  75. data/lib/new_relic/agent/distributed_tracing.rb +17 -18
  76. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  77. data/lib/new_relic/agent/error_collector.rb +6 -5
  78. data/lib/new_relic/agent/error_event_aggregator.rb +3 -4
  79. data/lib/new_relic/agent/error_filter.rb +5 -5
  80. data/lib/new_relic/agent/error_trace_aggregator.rb +3 -3
  81. data/lib/new_relic/agent/event_aggregator.rb +20 -20
  82. data/lib/new_relic/agent/event_buffer.rb +1 -1
  83. data/lib/new_relic/agent/event_listener.rb +1 -1
  84. data/lib/new_relic/agent/event_loop.rb +9 -9
  85. data/lib/new_relic/agent/external.rb +10 -10
  86. data/lib/new_relic/agent/guid_generator.rb +2 -2
  87. data/lib/new_relic/agent/harvester.rb +1 -1
  88. data/lib/new_relic/agent/heap.rb +5 -5
  89. data/lib/new_relic/agent/hostname.rb +4 -3
  90. data/lib/new_relic/agent/http_clients/abstract.rb +1 -2
  91. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -6
  92. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -5
  93. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +2 -3
  94. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
  95. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +0 -1
  96. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +1 -2
  97. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -2
  98. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -5
  99. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +31 -23
  100. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +7 -6
  101. data/lib/new_relic/agent/instrumentation/active_job.rb +11 -4
  102. data/lib/new_relic/agent/instrumentation/active_merchant.rb +4 -3
  103. data/lib/new_relic/agent/instrumentation/active_record.rb +9 -9
  104. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +37 -21
  105. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -3
  106. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -1
  107. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +21 -11
  108. data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
  109. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -15
  110. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -1
  111. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -1
  112. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -1
  113. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -2
  114. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -2
  115. data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -2
  116. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -10
  117. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -11
  118. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
  119. data/lib/new_relic/agent/instrumentation/bunny.rb +1 -2
  120. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +25 -17
  121. data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -22
  122. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +19 -16
  123. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -3
  124. data/lib/new_relic/agent/instrumentation/curb.rb +2 -2
  125. data/lib/new_relic/agent/instrumentation/data_mapper.rb +44 -44
  126. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -2
  127. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -3
  128. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
  129. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -3
  130. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -3
  131. data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
  132. data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -6
  133. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -5
  134. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
  135. data/lib/new_relic/agent/instrumentation/grape.rb +1 -1
  136. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  137. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  138. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  139. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  140. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  141. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  142. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  143. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  144. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  145. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  146. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  147. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -1
  148. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -6
  149. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -1
  150. data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -2
  151. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -1
  152. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -4
  153. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -1
  154. data/lib/new_relic/agent/instrumentation/httprb.rb +2 -2
  155. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -2
  156. data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -2
  157. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -1
  158. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -1
  159. data/lib/new_relic/agent/instrumentation/logger.rb +2 -2
  160. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
  161. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +24 -17
  162. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -9
  163. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -15
  164. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +21 -15
  165. data/lib/new_relic/agent/instrumentation/memcache.rb +5 -6
  166. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +2 -2
  167. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +0 -1
  168. data/lib/new_relic/agent/instrumentation/mongo.rb +2 -2
  169. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +15 -14
  170. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -1
  171. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -5
  172. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -1
  173. data/lib/new_relic/agent/instrumentation/net_http.rb +2 -2
  174. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +6 -6
  175. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -1
  176. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -1
  177. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -1
  178. data/lib/new_relic/agent/instrumentation/padrino.rb +2 -2
  179. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
  180. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -2
  181. data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -12
  182. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -1
  183. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -7
  184. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -4
  185. data/lib/new_relic/agent/instrumentation/rack.rb +1 -1
  186. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -6
  187. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  188. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -2
  189. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -2
  190. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
  191. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -3
  192. data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -2
  193. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -2
  194. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
  195. data/lib/new_relic/agent/instrumentation/rake.rb +3 -3
  196. data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -4
  197. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -6
  198. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -4
  199. data/lib/new_relic/agent/instrumentation/redis.rb +2 -2
  200. data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -2
  201. data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
  202. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +0 -1
  203. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -1
  204. data/lib/new_relic/agent/instrumentation/resque.rb +3 -3
  205. data/lib/new_relic/agent/instrumentation/sequel.rb +8 -8
  206. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  207. data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -5
  208. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
  209. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -2
  210. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -1
  211. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
  212. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  213. data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -2
  214. data/lib/new_relic/agent/instrumentation/sunspot.rb +4 -4
  215. data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -2
  216. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -1
  217. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -1
  218. data/lib/new_relic/agent/instrumentation/thread.rb +2 -2
  219. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -1
  220. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -1
  221. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -1
  222. data/lib/new_relic/agent/instrumentation/tilt.rb +1 -1
  223. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -1
  224. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +8 -8
  225. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -1
  226. data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
  227. data/lib/new_relic/agent/instrumentation.rb +1 -1
  228. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  229. data/lib/new_relic/agent/javascript_instrumentor.rb +8 -8
  230. data/lib/new_relic/agent/linking_metadata.rb +2 -3
  231. data/lib/new_relic/agent/local_log_decorator.rb +0 -1
  232. data/lib/new_relic/agent/log_event_aggregator.rb +7 -7
  233. data/lib/new_relic/agent/log_once.rb +1 -1
  234. data/lib/new_relic/agent/log_priority.rb +1 -1
  235. data/lib/new_relic/agent/logging.rb +13 -13
  236. data/lib/new_relic/agent/memory_logger.rb +1 -1
  237. data/lib/new_relic/agent/messaging.rb +19 -20
  238. data/lib/new_relic/agent/method_tracer.rb +15 -10
  239. data/lib/new_relic/agent/method_tracer_helpers.rb +83 -1
  240. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -4
  241. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -3
  242. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -1
  243. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -2
  244. data/lib/new_relic/agent/monitors.rb +5 -5
  245. data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -2
  246. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -4
  247. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
  248. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
  249. data/lib/new_relic/agent/new_relic_service.rb +214 -166
  250. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -3
  251. data/lib/new_relic/agent/null_logger.rb +1 -1
  252. data/lib/new_relic/agent/obfuscator.rb +3 -3
  253. data/lib/new_relic/agent/parameter_filtering.rb +1 -1
  254. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  255. data/lib/new_relic/agent/pipe_channel_manager.rb +10 -5
  256. data/lib/new_relic/agent/pipe_service.rb +2 -2
  257. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  258. data/lib/new_relic/agent/priority_sampled_buffer.rb +4 -4
  259. data/lib/new_relic/agent/range_extensions.rb +8 -28
  260. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -2
  261. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  262. data/lib/new_relic/agent/rules_engine.rb +2 -2
  263. data/lib/new_relic/agent/sampler.rb +1 -1
  264. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  265. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  266. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +2 -2
  267. data/lib/new_relic/agent/samplers/memory_sampler.rb +10 -10
  268. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  269. data/lib/new_relic/agent/samplers/vm_sampler.rb +3 -1
  270. data/lib/new_relic/agent/span_event_aggregator.rb +2 -2
  271. data/lib/new_relic/agent/span_event_primitive.rb +24 -19
  272. data/lib/new_relic/agent/sql_sampler.rb +8 -8
  273. data/lib/new_relic/agent/stats.rb +15 -4
  274. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -2
  275. data/lib/new_relic/agent/stats_engine/stats_hash.rb +4 -4
  276. data/lib/new_relic/agent/stats_engine.rb +1 -1
  277. data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -6
  278. data/lib/new_relic/agent/system_info.rb +68 -53
  279. data/lib/new_relic/agent/threading/agent_thread.rb +13 -9
  280. data/lib/new_relic/agent/threading/backtrace_node.rb +6 -4
  281. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
  282. data/lib/new_relic/agent/threading/thread_profile.rb +4 -4
  283. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  284. data/lib/new_relic/agent/tracer.rb +19 -17
  285. data/lib/new_relic/agent/transaction/abstract_segment.rb +93 -34
  286. data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -12
  287. data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -48
  288. data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -22
  289. data/lib/new_relic/agent/transaction/external_request_segment.rb +37 -29
  290. data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -6
  291. data/lib/new_relic/agent/transaction/request_attributes.rb +29 -29
  292. data/lib/new_relic/agent/transaction/segment.rb +8 -8
  293. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  294. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  295. data/lib/new_relic/agent/transaction/trace.rb +3 -3
  296. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  297. data/lib/new_relic/agent/transaction/trace_context.rb +22 -20
  298. data/lib/new_relic/agent/transaction/trace_node.rb +9 -9
  299. data/lib/new_relic/agent/transaction/tracing.rb +7 -7
  300. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -2
  301. data/lib/new_relic/agent/transaction.rb +35 -31
  302. data/lib/new_relic/agent/transaction_error_primitive.rb +9 -9
  303. data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -5
  304. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -4
  305. data/lib/new_relic/agent/transaction_event_recorder.rb +15 -14
  306. data/lib/new_relic/agent/transaction_metrics.rb +4 -4
  307. data/lib/new_relic/agent/transaction_sampler.rb +5 -5
  308. data/lib/new_relic/agent/transaction_time_aggregator.rb +14 -14
  309. data/lib/new_relic/agent/utilization/aws.rb +4 -4
  310. data/lib/new_relic/agent/utilization/azure.rb +2 -2
  311. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  312. data/lib/new_relic/agent/utilization/pcf.rb +4 -4
  313. data/lib/new_relic/agent/utilization/vendor.rb +28 -28
  314. data/lib/new_relic/agent/utilization_data.rb +1 -1
  315. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  316. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  317. data/lib/new_relic/agent/vm/mri_vm.rb +36 -23
  318. data/lib/new_relic/agent/vm/snapshot.rb +2 -2
  319. data/lib/new_relic/agent/vm.rb +1 -1
  320. data/lib/new_relic/agent/worker_loop.rb +2 -2
  321. data/lib/new_relic/agent.rb +27 -27
  322. data/lib/new_relic/cli/command.rb +6 -6
  323. data/lib/new_relic/cli/commands/deployments.rb +81 -29
  324. data/lib/new_relic/cli/commands/install.rb +6 -6
  325. data/lib/new_relic/coerce.rb +5 -6
  326. data/lib/new_relic/collection_helper.rb +4 -4
  327. data/lib/new_relic/constants.rb +0 -1
  328. data/lib/new_relic/control/class_methods.rb +1 -1
  329. data/lib/new_relic/control/frameworks/external.rb +1 -1
  330. data/lib/new_relic/control/frameworks/rails.rb +3 -3
  331. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  332. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  333. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  334. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  335. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  336. data/lib/new_relic/control/frameworks.rb +1 -1
  337. data/lib/new_relic/control/instance_methods.rb +20 -42
  338. data/lib/new_relic/control/instrumentation.rb +7 -7
  339. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  340. data/lib/new_relic/control/server_methods.rb +2 -2
  341. data/lib/new_relic/control.rb +1 -1
  342. data/lib/new_relic/delayed_job_injection.rb +1 -1
  343. data/lib/new_relic/dependency_detection.rb +23 -22
  344. data/lib/new_relic/environment_report.rb +24 -14
  345. data/lib/new_relic/helper.rb +5 -5
  346. data/lib/new_relic/language_support.rb +8 -3
  347. data/lib/new_relic/latest_changes.rb +4 -4
  348. data/lib/new_relic/local_environment.rb +9 -11
  349. data/lib/new_relic/metric_data.rb +30 -24
  350. data/lib/new_relic/metric_spec.rb +3 -3
  351. data/lib/new_relic/noticed_error.rb +3 -6
  352. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  353. data/lib/new_relic/rack/agent_middleware.rb +1 -1
  354. data/lib/new_relic/rack/browser_monitoring.rb +132 -123
  355. data/lib/new_relic/rack.rb +1 -1
  356. data/lib/new_relic/recipes/capistrano3.rb +3 -59
  357. data/lib/new_relic/recipes/capistrano_legacy.rb +13 -13
  358. data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
  359. data/lib/new_relic/recipes.rb +1 -1
  360. data/lib/new_relic/supportability_helper.rb +6 -6
  361. data/lib/new_relic/traced_thread.rb +5 -7
  362. data/lib/new_relic/version.rb +2 -2
  363. data/lib/newrelic_rpm.rb +1 -1
  364. data/lib/sequel/extensions/newrelic_instrumentation.rb +8 -8
  365. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
  366. data/lib/tasks/all.rb +1 -1
  367. data/lib/tasks/config.rake +8 -112
  368. data/lib/tasks/coverage_report.rake +28 -0
  369. data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
  370. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  371. data/lib/tasks/helpers/format.rb +120 -0
  372. data/lib/tasks/helpers/matches.rb +12 -0
  373. data/lib/tasks/helpers/prompt.rb +24 -0
  374. data/lib/tasks/helpers/removers.rb +33 -0
  375. data/lib/tasks/install.rake +4 -0
  376. data/lib/tasks/instrumentation_generator/README.md +63 -0
  377. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  378. data/lib/tasks/instrumentation_generator/instrumentation.thor +102 -0
  379. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  380. data/lib/tasks/instrumentation_generator/templates/chain.tt +21 -0
  381. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
  382. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  383. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +12 -0
  384. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  385. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  386. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  387. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  388. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  389. data/lib/tasks/multiverse.rake +4 -0
  390. data/lib/tasks/multiverse.rb +5 -30
  391. data/lib/tasks/newrelic.rb +1 -1
  392. data/lib/tasks/tests.rake +7 -8
  393. data/newrelic.yml +514 -483
  394. data/newrelic_rpm.gemspec +16 -21
  395. data/recipes/newrelic.rb +1 -1
  396. data/test/agent_helper.rb +125 -147
  397. metadata +82 -90
  398. data/bin/mongrel_rpm +0 -32
@@ -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
@@ -15,7 +14,7 @@ module NewRelic
15
14
  def instrument!
16
15
  if supports_datastore_instances?
17
16
  instrument_methods(::Dalli::Client, dalli_methods)
18
- instrument_multi_method :get_multi
17
+ instrument_multi_method(:get_multi)
19
18
  instrument_send_multiget
20
19
  instrument_server_for_key
21
20
  else
@@ -23,19 +22,19 @@ module NewRelic
23
22
  end
24
23
  end
25
24
 
26
- def instrument_multi_method method_name
27
- 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)
28
27
  method_name_without = :"#{method_name}_without_newrelic_trace"
29
28
 
30
29
  ::Dalli::Client.class_eval do
31
- alias_method method_name_without, method_name
30
+ alias_method(method_name_without, method_name)
32
31
 
33
- define_method method_name do |*args, &block|
34
- 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) }
35
34
  end
36
35
 
37
- __send__ visibility, method_name
38
- __send__ visibility, method_name_without
36
+ __send__(visibility, method_name)
37
+ __send__(visibility, method_name_without)
39
38
  end
40
39
  end
41
40
 
@@ -43,10 +42,10 @@ module NewRelic
43
42
  ::Dalli::Ring.class_eval do
44
43
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
45
44
 
46
- alias_method :server_for_key_without_newrelic_trace, :server_for_key
45
+ alias_method(:server_for_key_without_newrelic_trace, :server_for_key)
47
46
 
48
- def server_for_key key
49
- 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) }
50
49
  end
51
50
  end
52
51
  end
@@ -58,10 +57,18 @@ module NewRelic
58
57
  ::Dalli::Server
59
58
  end.class_eval do
60
59
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
61
- alias_method :send_multiget_without_newrelic_trace, :send_multiget
62
60
 
63
- def send_multiget keys
64
- 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
65
72
  end
66
73
  end
67
74
  end
@@ -78,8 +85,8 @@ module NewRelic
78
85
  end
79
86
 
80
87
  def instrument!
81
- instrument_methods ::Dalli::Client, dalli_cas_methods
82
- instrument_multi_method :get_multi_cas
88
+ instrument_methods(::Dalli::Client, dalli_cas_methods)
89
+ instrument_multi_method(:get_multi_cas)
83
90
  end
84
91
  end
85
92
  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
@@ -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,20 +37,20 @@ 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
@@ -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,16 +11,17 @@ 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
26
  segment.finish if segment
27
27
  end
@@ -37,14 +37,15 @@ 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 }
@@ -53,35 +54,36 @@ module NewRelic::Agent::Instrumentation
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
70
  segment.finish if 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
@@ -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
@@ -10,7 +9,7 @@ module NewRelic::Agent::Instrumentation
10
9
 
11
10
  module_function
12
11
 
13
- def client_prepender client_class
12
+ def client_prepender(client_class)
14
13
  Module.new do
15
14
  extend Helper
16
15
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
@@ -24,28 +23,28 @@ module NewRelic::Agent::Instrumentation
24
23
  end
25
24
 
26
25
  def dalli_cas_prependers
27
- yield ::Dalli::Client, dalli_client_prepender(dalli_cas_methods)
28
- yield ::Dalli::Client, dalli_get_multi_prepender(:get_multi_cas)
26
+ yield(::Dalli::Client, dalli_client_prepender(dalli_cas_methods))
27
+ yield(::Dalli::Client, dalli_get_multi_prepender(:get_multi_cas))
29
28
  end
30
29
 
31
30
  def dalli_prependers
32
31
  if supports_datastore_instances?
33
- yield ::Dalli::Client, dalli_client_prepender(dalli_methods)
34
- yield ::Dalli::Client, dalli_get_multi_prepender(:get_multi)
32
+ yield(::Dalli::Client, dalli_client_prepender(dalli_methods))
33
+ yield(::Dalli::Client, dalli_get_multi_prepender(:get_multi))
35
34
 
36
35
  if supports_binary_protocol?
37
- yield ::Dalli::Protocol::Binary, dalli_server_prepender
36
+ yield(::Dalli::Protocol::Binary, dalli_server_prepender)
38
37
  else
39
- yield ::Dalli::Server, dalli_server_prepender
38
+ yield(::Dalli::Server, dalli_server_prepender)
40
39
  end
41
40
 
42
- yield ::Dalli::Ring, dalli_ring_prepender
41
+ yield(::Dalli::Ring, dalli_ring_prepender)
43
42
  else
44
- yield ::Dalli::Client, dalli_client_prepender(client_methods)
43
+ yield(::Dalli::Client, dalli_client_prepender(client_methods))
45
44
  end
46
45
  end
47
46
 
48
- def dalli_client_prepender supported_methods
47
+ def dalli_client_prepender(supported_methods)
49
48
  Module.new do
50
49
  extend Helper
51
50
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
@@ -58,7 +57,7 @@ module NewRelic::Agent::Instrumentation
58
57
  end
59
58
  end
60
59
 
61
- def dalli_get_multi_prepender method_name
60
+ def dalli_get_multi_prepender(method_name)
62
61
  Module.new do
63
62
  extend Helper
64
63
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
@@ -74,7 +73,7 @@ module NewRelic::Agent::Instrumentation
74
73
  extend Helper
75
74
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
76
75
 
77
- def server_for_key key
76
+ def server_for_key(key)
78
77
  server_for_key_with_newrelic_tracing { super }
79
78
  end
80
79
  end
@@ -85,8 +84,15 @@ module NewRelic::Agent::Instrumentation
85
84
  extend Helper
86
85
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
87
86
 
88
- def send_multiget keys
89
- send_multiget_with_newrelic_tracing(keys) { super }
87
+ # TODO: Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
88
+ if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
89
+ def pipelined_get(keys)
90
+ send_multiget_with_newrelic_tracing(keys) { super }
91
+ end
92
+ else
93
+ def send_multiget(keys)
94
+ send_multiget_with_newrelic_tracing(keys) { super }
95
+ end
90
96
  end
91
97
  end
92
98
  end
@@ -1,10 +1,9 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
5
4
 
6
- # NOTE there are multiple implementations of the MemCache client in Ruby,
7
- # each with slightly different API's and semantics.
5
+ # NOTE: there are multiple implementations of the Memcached client in Ruby,
6
+ # each with slightly different APIs and semantics.
8
7
  # See:
9
8
  # http://www.deveiate.org/code/Ruby-MemCache/ (Gem: Ruby-MemCache)
10
9
  # http://seattlerb.rubyforge.org/memcache-client/ (Gem: memcache-client)
@@ -56,7 +55,7 @@ DependencyDetection.defer do
56
55
  if use_prepend?
57
56
  prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
58
57
  prepend_module.dalli_prependers do |client_class, instrumenting_module|
59
- prepend_instrument client_class, instrumenting_module, "MemecacheDalli"
58
+ prepend_instrument client_class, instrumenting_module, "MemcachedDalli"
60
59
  end
61
60
  else
62
61
  chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::Dalli
@@ -75,11 +74,11 @@ DependencyDetection.defer do
75
74
  depends_on { ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
76
75
 
77
76
  executes do
78
- ::NewRelic::Agent.logger.info 'Installing Dalli CAS Client Memcache instrumentation'
77
+ ::NewRelic::Agent.logger.info('Installing Dalli CAS Client Memcache instrumentation')
79
78
  if use_prepend?
80
79
  prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
81
80
  prepend_module.dalli_cas_prependers do |client_class, instrumenting_module|
82
- prepend_instrument client_class, instrumenting_module, "MemecacheDalliCAS"
81
+ prepend_instrument client_class, instrumenting_module, "MemcachedDalliCAS"
83
82
  end
84
83
  else
85
84
  chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS
@@ -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/method_tracer'
6
6
  require 'new_relic/agent/transaction'
@@ -86,7 +86,7 @@ module NewRelic
86
86
  # In 'normal' usage, the target will be an application instance that
87
87
  # responds to #call. With Rails, however, the target may be a subclass
88
88
  # of Rails::Application that defines a method_missing that proxies #call
89
- # to a singleton instance of the the subclass. We need to ensure that we
89
+ # to a singleton instance of the subclass. We need to ensure that we
90
90
  # capture the correct name in both cases.
91
91
  def determine_class_name
92
92
  clazz = class_for_target
@@ -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
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  DependencyDetection.defer do
6
6
  named :mongo
@@ -18,7 +18,7 @@ DependencyDetection.defer do
18
18
  end
19
19
 
20
20
  executes do
21
- NewRelic::Agent.logger.info 'Installing Mongo instrumentation'
21
+ NewRelic::Agent.logger.info('Installing Mongo instrumentation')
22
22
  install_mongo_command_subscriber
23
23
  end
24
24
 
@@ -1,6 +1,7 @@
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
  require 'new_relic/agent/datastores/mongo/event_formatter'
5
6
 
6
7
  module NewRelic
@@ -13,7 +14,7 @@ module NewRelic
13
14
  def started(event)
14
15
  begin
15
16
  return unless NewRelic::Agent::Tracer.tracing_enabled?
16
- segments[event.operation_id] = start_segment event
17
+ segments[event.operation_id] = start_segment(event)
17
18
  rescue Exception => e
18
19
  log_notification_error('started', e)
19
20
  end
@@ -36,16 +37,16 @@ module NewRelic
36
37
  return unless segment
37
38
 
38
39
  # operations that succeed but have errors return CommandSucceeded
39
- # with an error_key that is populated with error specfics
40
+ # with an error_key that is populated with error specifics
40
41
  if error_key = error_key_present?(event)
41
42
  # taking the last error as there can potentially be many
42
43
  attributes = event.reply[error_key][-1]
43
- segment.notice_error Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]])
44
+ segment.notice_error(Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]]))
44
45
 
45
46
  # failing commands return a CommandFailed event with an error message
46
47
  # in the form of "% (%s)" for the message and code
47
- elsif event.is_a? Mongo::Monitoring::Event::CommandFailed
48
- segment.notice_error Mongo::Error.new(event.message)
48
+ elsif event.is_a?(Mongo::Monitoring::Event::CommandFailed)
49
+ segment.notice_error(Mongo::Error.new(event.message))
49
50
  end
50
51
  segment.finish
51
52
  rescue Exception => e
@@ -58,9 +59,9 @@ module NewRelic
58
59
 
59
60
  private
60
61
 
61
- def start_segment event
62
- host = host_from_address event.address
63
- port_path_or_id = port_path_or_id_from_address event.address
62
+ def start_segment(event)
63
+ host = host_from_address(event.address)
64
+ port_path_or_id = port_path_or_id_from_address(event.address)
64
65
  segment = NewRelic::Agent::Tracer.start_datastore_segment(
65
66
  product: MONGODB,
66
67
  operation: operation(event.command_name),
@@ -107,31 +108,31 @@ module NewRelic
107
108
  LOCALHOST = "localhost".freeze
108
109
 
109
110
  def host_from_address(address)
110
- if unix_domain_socket? address.host
111
+ if unix_domain_socket?(address.host)
111
112
  LOCALHOST
112
113
  else
113
114
  address.host
114
115
  end
115
116
  rescue => e
116
- NewRelic::Agent.logger.debug "Failed to retrieve Mongo host: #{e}"
117
+ NewRelic::Agent.logger.debug("Failed to retrieve Mongo host: #{e}")
117
118
  UNKNOWN
118
119
  end
119
120
 
120
121
  def port_path_or_id_from_address(address)
121
- if unix_domain_socket? address.host
122
+ if unix_domain_socket?(address.host)
122
123
  address.host
123
124
  else
124
125
  address.port
125
126
  end
126
127
  rescue => e
127
- NewRelic::Agent.logger.debug "Failed to retrieve Mongo port_path_or_id: #{e}"
128
+ NewRelic::Agent.logger.debug("Failed to retrieve Mongo port_path_or_id: #{e}")
128
129
  UNKNOWN
129
130
  end
130
131
 
131
132
  SLASH = "/".freeze
132
133
 
133
134
  def unix_domain_socket?(host)
134
- host.start_with? SLASH
135
+ host.start_with?(SLASH)
135
136
  end
136
137
  end
137
138
  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 'instrumentation'
6
6
 
@@ -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
@@ -17,18 +17,18 @@ module NewRelic
17
17
 
18
18
  begin
19
19
  response = nil
20
- segment.add_request_headers wrapped_request
20
+ segment.add_request_headers(wrapped_request)
21
21
 
22
22
  # RUBY-1244 Disable further tracing in request to avoid double
23
23
  # counting if connection wasn't started (which calls request again).
24
24
  NewRelic::Agent.disable_all_tracing do
25
- response = NewRelic::Agent::Tracer.capture_segment_error segment do
25
+ response = NewRelic::Agent::Tracer.capture_segment_error(segment) do
26
26
  yield
27
27
  end
28
28
  end
29
29
 
30
- wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
31
- segment.process_response_headers wrapped_response
30
+ wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new(response)
31
+ segment.process_response_headers(wrapped_response)
32
32
  response
33
33
  ensure
34
34
  segment.finish
@@ -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 'instrumentation'
6
6
 
@@ -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 'net_http/chain'
6
6
  require_relative 'net_http/prepend'
@@ -13,7 +13,7 @@ DependencyDetection.defer do
13
13
  end
14
14
 
15
15
  executes do
16
- ::NewRelic::Agent.logger.info 'Installing Net:HTTP Wrappers'
16
+ ::NewRelic::Agent.logger.info('Installing Net:HTTP Wrappers')
17
17
  require 'new_relic/agent/http_clients/net_http_wrappers'
18
18
  end
19
19
 
@@ -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
@@ -26,11 +26,11 @@ module NewRelic
26
26
  instance_variable_names.each do |name|
27
27
  if notifier.instance_variable_defined?(name)
28
28
  subscribers = notifier.instance_variable_get(name)
29
- if subscribers.is_a? Array
29
+ if subscribers.is_a?(Array)
30
30
  # Rails 5 @subscribers, and Rails 6 @other_subscribers is a
31
31
  # plain array of subscriber objects
32
32
  all_subscribers += subscribers
33
- elsif subscribers.is_a? Hash
33
+ elsif subscribers.is_a?(Hash)
34
34
  # Rails 6 @string_subscribers is a Hash mapping the pattern
35
35
  # string of a subscriber to an array of subscriber objects
36
36
  subscribers.values.each { |array| all_subscribers += array }
@@ -55,7 +55,7 @@ module NewRelic
55
55
  end
56
56
 
57
57
  def push_segment(id, segment)
58
- segment_stack[id].push segment
58
+ segment_stack[id].push(segment)
59
59
  end
60
60
 
61
61
  def pop_segment(id)
@@ -78,14 +78,14 @@ module NewRelic
78
78
  return unless defined?(::ActiveSupport::VERSION)
79
79
  if ::ActiveSupport::VERSION::STRING < "5.0.0"
80
80
  # Earlier versions of Rails did not add the exception itself to the
81
- # payload asssessible via :exception_object, so we create a stand-in
81
+ # payload accessible via :exception_object, so we create a stand-in
82
82
  # error object from the given class name and message.
83
83
  # NOTE: no backtrace available this way, but we can notice the error
84
84
  # well enough to send the necessary info the UI requires to present it.
85
85
  def exception_object(payload)
86
86
  exception_class, message = payload[:exception]
87
87
  return nil unless exception_class
88
- NewRelic::Agent::NoticibleError.new exception_class, message
88
+ NewRelic::Agent::NoticeableError.new(exception_class, message)
89
89
  end
90
90
  else
91
91
  def exception_object(payload)
@@ -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
@@ -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 Padrino
@@ -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 PadrinoTracer
@@ -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
  # Our Padrino instrumentation relies heavily on the fact that Padrino is
6
6
  # built on Sinatra. Although it wires up a lot of its own routing logic,
@@ -22,7 +22,7 @@ DependencyDetection.defer do
22
22
  depends_on { defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods) }
23
23
 
24
24
  executes do
25
- ::NewRelic::Agent.logger.info 'Installing Padrino instrumentation'
25
+ ::NewRelic::Agent.logger.info('Installing Padrino instrumentation')
26
26
  if use_prepend?
27
27
  prepend_instrument ::Padrino::Application, NewRelic::Agent::Instrumentation::PadrinoTracer::Prepend
28
28
  else
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  DependencyDetection.defer do
6
6
  @name = :passenger
@@ -10,10 +10,10 @@ DependencyDetection.defer do
10
10
  end
11
11
 
12
12
  executes do
13
- ::NewRelic::Agent.logger.debug "Installing Passenger event hooks."
13
+ ::NewRelic::Agent.logger.debug("Installing Passenger event hooks.")
14
14
 
15
15
  ::PhusionPassenger.on_event(:stopping_worker_process) do
16
- ::NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
16
+ ::NewRelic::Agent.logger.debug("Passenger stopping this process, shutdown the agent.")
17
17
  NewRelic::Agent.instance.shutdown
18
18
  end
19
19