newrelic_rpm 8.9.0 → 8.10.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (377) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +23 -8
  4. data/.rubocop_todo.yml +243 -0
  5. data/.simplecov +10 -2
  6. data/.snyk +11 -0
  7. data/Brewfile +1 -0
  8. data/CHANGELOG.md +78 -0
  9. data/Guardfile +1 -0
  10. data/Rakefile +5 -0
  11. data/Thorfile +6 -0
  12. data/bin/newrelic +2 -1
  13. data/bin/newrelic_cmd +1 -0
  14. data/bin/nrdebug +3 -2
  15. data/init.rb +3 -2
  16. data/install.rb +1 -0
  17. data/lib/new_relic/agent/adaptive_sampler.rb +4 -3
  18. data/lib/new_relic/agent/agent/shutdown.rb +3 -2
  19. data/lib/new_relic/agent/agent/special_startup.rb +3 -2
  20. data/lib/new_relic/agent/agent/start_worker_thread.rb +15 -14
  21. data/lib/new_relic/agent/agent/startup.rb +11 -10
  22. data/lib/new_relic/agent/agent.rb +35 -33
  23. data/lib/new_relic/agent/agent_logger.rb +2 -1
  24. data/lib/new_relic/agent/attribute_filter.rb +1 -0
  25. data/lib/new_relic/agent/attribute_processing.rb +4 -3
  26. data/lib/new_relic/agent/attributes.rb +2 -1
  27. data/lib/new_relic/agent/audit_logger.rb +1 -0
  28. data/lib/new_relic/agent/autostart.rb +1 -0
  29. data/lib/new_relic/agent/chained_call.rb +1 -0
  30. data/lib/new_relic/agent/commands/agent_command.rb +1 -0
  31. data/lib/new_relic/agent/commands/agent_command_router.rb +4 -3
  32. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -0
  33. data/lib/new_relic/agent/configuration/default_source.rb +35 -7
  34. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -0
  35. data/lib/new_relic/agent/configuration/environment_source.rb +2 -1
  36. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -0
  37. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -0
  38. data/lib/new_relic/agent/configuration/manager.rb +2 -1
  39. data/lib/new_relic/agent/configuration/manual_source.rb +1 -0
  40. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -0
  41. data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -3
  42. data/lib/new_relic/agent/configuration/server_source.rb +7 -6
  43. data/lib/new_relic/agent/configuration/yaml_source.rb +4 -1
  44. data/lib/new_relic/agent/configuration.rb +1 -0
  45. data/lib/new_relic/agent/connect/request_builder.rb +1 -0
  46. data/lib/new_relic/agent/connect/response_handler.rb +4 -3
  47. data/lib/new_relic/agent/custom_event_aggregator.rb +5 -4
  48. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -0
  49. data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -0
  50. data/lib/new_relic/agent/database/obfuscator.rb +2 -1
  51. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -0
  52. data/lib/new_relic/agent/database.rb +3 -2
  53. data/lib/new_relic/agent/database_adapter.rb +1 -0
  54. data/lib/new_relic/agent/datastores/metric_helper.rb +9 -8
  55. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -0
  56. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -0
  57. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -1
  58. data/lib/new_relic/agent/datastores/mongo.rb +1 -0
  59. data/lib/new_relic/agent/datastores/redis.rb +3 -2
  60. data/lib/new_relic/agent/datastores.rb +4 -3
  61. data/lib/new_relic/agent/deprecator.rb +1 -0
  62. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -0
  63. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -16
  64. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -9
  65. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -18
  66. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -8
  67. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -2
  68. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -39
  69. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -14
  70. data/lib/new_relic/agent/distributed_tracing.rb +17 -17
  71. data/lib/new_relic/agent/encoding_normalizer.rb +1 -0
  72. data/lib/new_relic/agent/error_collector.rb +6 -4
  73. data/lib/new_relic/agent/error_event_aggregator.rb +3 -3
  74. data/lib/new_relic/agent/error_filter.rb +1 -0
  75. data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
  76. data/lib/new_relic/agent/event_aggregator.rb +20 -19
  77. data/lib/new_relic/agent/event_buffer.rb +1 -0
  78. data/lib/new_relic/agent/event_listener.rb +1 -0
  79. data/lib/new_relic/agent/event_loop.rb +7 -6
  80. data/lib/new_relic/agent/external.rb +9 -8
  81. data/lib/new_relic/agent/guid_generator.rb +2 -1
  82. data/lib/new_relic/agent/harvester.rb +1 -0
  83. data/lib/new_relic/agent/heap.rb +3 -2
  84. data/lib/new_relic/agent/hostname.rb +4 -2
  85. data/lib/new_relic/agent/http_clients/abstract.rb +1 -1
  86. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -5
  87. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
  88. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -1
  89. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -1
  90. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -4
  91. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +10 -4
  92. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +6 -4
  93. data/lib/new_relic/agent/instrumentation/active_job.rb +2 -1
  94. data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -1
  95. data/lib/new_relic/agent/instrumentation/active_record.rb +9 -8
  96. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +15 -14
  97. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -2
  98. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -0
  99. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +5 -3
  100. data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -1
  101. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -14
  102. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -0
  103. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -0
  104. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -0
  105. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -1
  106. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -1
  107. data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -1
  108. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -9
  109. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -10
  110. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -3
  111. data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
  112. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +13 -9
  113. data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -21
  114. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +8 -8
  115. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -2
  116. data/lib/new_relic/agent/instrumentation/curb.rb +2 -1
  117. data/lib/new_relic/agent/instrumentation/data_mapper.rb +43 -42
  118. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -1
  119. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -2
  120. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -1
  121. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -2
  122. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  123. data/lib/new_relic/agent/instrumentation/excon.rb +2 -1
  124. data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -5
  125. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -4
  126. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -3
  127. data/lib/new_relic/agent/instrumentation/grape.rb +1 -0
  128. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +98 -0
  129. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
  130. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +112 -0
  131. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
  132. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +33 -0
  133. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +70 -0
  134. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +135 -0
  135. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +36 -0
  136. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +27 -0
  137. data/lib/new_relic/agent/instrumentation/grpc_client.rb +24 -0
  138. data/lib/new_relic/agent/instrumentation/grpc_server.rb +26 -0
  139. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -0
  140. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -5
  141. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -0
  142. data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -1
  143. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -0
  144. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -3
  145. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -0
  146. data/lib/new_relic/agent/instrumentation/httprb.rb +2 -1
  147. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -1
  148. data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -1
  149. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -0
  150. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -0
  151. data/lib/new_relic/agent/instrumentation/logger.rb +2 -1
  152. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -2
  153. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +19 -19
  154. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -8
  155. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -14
  156. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +14 -14
  157. data/lib/new_relic/agent/instrumentation/memcache.rb +1 -1
  158. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -0
  159. data/lib/new_relic/agent/instrumentation/mongo.rb +2 -1
  160. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +14 -12
  161. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -0
  162. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -4
  163. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -0
  164. data/lib/new_relic/agent/instrumentation/net_http.rb +2 -1
  165. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +5 -4
  166. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -0
  167. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -0
  168. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -0
  169. data/lib/new_relic/agent/instrumentation/padrino.rb +2 -1
  170. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -2
  171. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -0
  172. data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -11
  173. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -0
  174. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -6
  175. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -3
  176. data/lib/new_relic/agent/instrumentation/rack.rb +1 -0
  177. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -5
  178. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -0
  179. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -1
  180. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -1
  181. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -1
  182. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -2
  183. data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -1
  184. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +1 -1
  185. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -0
  186. data/lib/new_relic/agent/instrumentation/rake.rb +3 -2
  187. data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -3
  188. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -5
  189. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -3
  190. data/lib/new_relic/agent/instrumentation/redis.rb +2 -1
  191. data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -1
  192. data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -0
  193. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -0
  194. data/lib/new_relic/agent/instrumentation/resque.rb +3 -2
  195. data/lib/new_relic/agent/instrumentation/sequel.rb +8 -7
  196. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -0
  197. data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -4
  198. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -0
  199. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -1
  200. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -0
  201. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -0
  202. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -1
  203. data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -1
  204. data/lib/new_relic/agent/instrumentation/sunspot.rb +2 -1
  205. data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -1
  206. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -0
  207. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -0
  208. data/lib/new_relic/agent/instrumentation/thread.rb +2 -1
  209. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -0
  210. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -0
  211. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -0
  212. data/lib/new_relic/agent/instrumentation/tilt.rb +1 -0
  213. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -0
  214. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +6 -5
  215. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -0
  216. data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -1
  217. data/lib/new_relic/agent/instrumentation.rb +1 -0
  218. data/lib/new_relic/agent/internal_agent_error.rb +1 -0
  219. data/lib/new_relic/agent/javascript_instrumentor.rb +7 -6
  220. data/lib/new_relic/agent/linking_metadata.rb +2 -2
  221. data/lib/new_relic/agent/log_event_aggregator.rb +6 -5
  222. data/lib/new_relic/agent/log_once.rb +1 -0
  223. data/lib/new_relic/agent/log_priority.rb +1 -0
  224. data/lib/new_relic/agent/logging.rb +13 -12
  225. data/lib/new_relic/agent/memory_logger.rb +1 -0
  226. data/lib/new_relic/agent/messaging.rb +18 -18
  227. data/lib/new_relic/agent/method_tracer.rb +6 -5
  228. data/lib/new_relic/agent/method_tracer_helpers.rb +8 -5
  229. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +3 -2
  230. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -2
  231. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -0
  232. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -1
  233. data/lib/new_relic/agent/monitors.rb +5 -4
  234. data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -1
  235. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -3
  236. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -0
  237. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -0
  238. data/lib/new_relic/agent/new_relic_service.rb +11 -11
  239. data/lib/new_relic/agent/noticible_error.rb +1 -1
  240. data/lib/new_relic/agent/null_logger.rb +1 -0
  241. data/lib/new_relic/agent/obfuscator.rb +2 -1
  242. data/lib/new_relic/agent/parameter_filtering.rb +1 -0
  243. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -0
  244. data/lib/new_relic/agent/pipe_channel_manager.rb +6 -5
  245. data/lib/new_relic/agent/pipe_service.rb +1 -0
  246. data/lib/new_relic/agent/prepend_supportability.rb +2 -1
  247. data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -1
  248. data/lib/new_relic/agent/range_extensions.rb +8 -27
  249. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -1
  250. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -0
  251. data/lib/new_relic/agent/rules_engine.rb +2 -1
  252. data/lib/new_relic/agent/sampler.rb +1 -0
  253. data/lib/new_relic/agent/sampler_collection.rb +1 -0
  254. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -0
  255. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -0
  256. data/lib/new_relic/agent/samplers/memory_sampler.rb +5 -4
  257. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -0
  258. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -0
  259. data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
  260. data/lib/new_relic/agent/span_event_primitive.rb +15 -11
  261. data/lib/new_relic/agent/sql_sampler.rb +7 -6
  262. data/lib/new_relic/agent/stats.rb +3 -1
  263. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -0
  264. data/lib/new_relic/agent/stats_engine/stats_hash.rb +3 -2
  265. data/lib/new_relic/agent/stats_engine.rb +1 -0
  266. data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -5
  267. data/lib/new_relic/agent/system_info.rb +8 -7
  268. data/lib/new_relic/agent/threading/agent_thread.rb +11 -6
  269. data/lib/new_relic/agent/threading/backtrace_node.rb +6 -3
  270. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -0
  271. data/lib/new_relic/agent/threading/thread_profile.rb +1 -0
  272. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -0
  273. data/lib/new_relic/agent/tracer.rb +17 -14
  274. data/lib/new_relic/agent/transaction/abstract_segment.rb +64 -31
  275. data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -11
  276. data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -47
  277. data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -21
  278. data/lib/new_relic/agent/transaction/external_request_segment.rb +36 -27
  279. data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -5
  280. data/lib/new_relic/agent/transaction/request_attributes.rb +29 -28
  281. data/lib/new_relic/agent/transaction/segment.rb +8 -7
  282. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -0
  283. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -0
  284. data/lib/new_relic/agent/transaction/trace.rb +3 -2
  285. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -9
  286. data/lib/new_relic/agent/transaction/trace_context.rb +22 -19
  287. data/lib/new_relic/agent/transaction/trace_node.rb +9 -8
  288. data/lib/new_relic/agent/transaction/tracing.rb +7 -6
  289. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -0
  290. data/lib/new_relic/agent/transaction.rb +22 -21
  291. data/lib/new_relic/agent/transaction_error_primitive.rb +9 -8
  292. data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -4
  293. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  294. data/lib/new_relic/agent/transaction_event_recorder.rb +14 -12
  295. data/lib/new_relic/agent/transaction_metrics.rb +3 -2
  296. data/lib/new_relic/agent/transaction_sampler.rb +4 -3
  297. data/lib/new_relic/agent/transaction_time_aggregator.rb +13 -12
  298. data/lib/new_relic/agent/utilization/aws.rb +4 -3
  299. data/lib/new_relic/agent/utilization/azure.rb +1 -0
  300. data/lib/new_relic/agent/utilization/gcp.rb +6 -5
  301. data/lib/new_relic/agent/utilization/pcf.rb +3 -2
  302. data/lib/new_relic/agent/utilization/vendor.rb +27 -26
  303. data/lib/new_relic/agent/utilization_data.rb +1 -0
  304. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -0
  305. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -0
  306. data/lib/new_relic/agent/vm/mri_vm.rb +1 -0
  307. data/lib/new_relic/agent/vm/snapshot.rb +1 -0
  308. data/lib/new_relic/agent/vm.rb +1 -0
  309. data/lib/new_relic/agent/worker_loop.rb +2 -1
  310. data/lib/new_relic/agent.rb +11 -10
  311. data/lib/new_relic/cli/command.rb +5 -4
  312. data/lib/new_relic/cli/commands/deployments.rb +9 -8
  313. data/lib/new_relic/cli/commands/install.rb +6 -5
  314. data/lib/new_relic/coerce.rb +4 -4
  315. data/lib/new_relic/collection_helper.rb +2 -1
  316. data/lib/new_relic/control/class_methods.rb +1 -0
  317. data/lib/new_relic/control/frameworks/external.rb +1 -0
  318. data/lib/new_relic/control/frameworks/rails.rb +3 -2
  319. data/lib/new_relic/control/frameworks/rails3.rb +1 -0
  320. data/lib/new_relic/control/frameworks/rails4.rb +1 -0
  321. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -0
  322. data/lib/new_relic/control/frameworks/ruby.rb +1 -0
  323. data/lib/new_relic/control/frameworks/sinatra.rb +1 -0
  324. data/lib/new_relic/control/frameworks.rb +1 -0
  325. data/lib/new_relic/control/instance_methods.rb +5 -4
  326. data/lib/new_relic/control/instrumentation.rb +7 -6
  327. data/lib/new_relic/control/server_methods.rb +2 -1
  328. data/lib/new_relic/control.rb +1 -0
  329. data/lib/new_relic/delayed_job_injection.rb +1 -0
  330. data/lib/new_relic/dependency_detection.rb +18 -16
  331. data/lib/new_relic/environment_report.rb +1 -0
  332. data/lib/new_relic/helper.rb +4 -3
  333. data/lib/new_relic/language_support.rb +6 -0
  334. data/lib/new_relic/latest_changes.rb +1 -0
  335. data/lib/new_relic/local_environment.rb +5 -6
  336. data/lib/new_relic/metric_data.rb +3 -2
  337. data/lib/new_relic/metric_spec.rb +2 -1
  338. data/lib/new_relic/noticed_error.rb +1 -1
  339. data/lib/new_relic/rack/agent_hooks.rb +1 -0
  340. data/lib/new_relic/rack/agent_middleware.rb +1 -0
  341. data/lib/new_relic/rack/browser_monitoring.rb +3 -2
  342. data/lib/new_relic/rack.rb +1 -0
  343. data/lib/new_relic/recipes/capistrano3.rb +7 -6
  344. data/lib/new_relic/recipes/capistrano_legacy.rb +12 -11
  345. data/lib/new_relic/recipes.rb +1 -0
  346. data/lib/new_relic/supportability_helper.rb +5 -4
  347. data/lib/new_relic/version.rb +3 -2
  348. data/lib/newrelic_rpm.rb +1 -0
  349. data/lib/sequel/extensions/newrelic_instrumentation.rb +6 -5
  350. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -0
  351. data/lib/tasks/all.rb +1 -0
  352. data/lib/tasks/config.rake +2 -1
  353. data/lib/tasks/coverage_report.rake +22 -11
  354. data/lib/tasks/install.rake +1 -0
  355. data/lib/tasks/instrumentation_generator/README.md +63 -0
  356. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  357. data/lib/tasks/instrumentation_generator/instrumentation.thor +96 -0
  358. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +10 -0
  359. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  360. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
  361. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +30 -0
  362. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  363. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  364. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  365. data/lib/tasks/instrumentation_generator/templates/prepend.tt +14 -0
  366. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  367. data/lib/tasks/instrumentation_generator/templates/test.tt +16 -0
  368. data/lib/tasks/multiverse.rake +1 -0
  369. data/lib/tasks/multiverse.rb +8 -7
  370. data/lib/tasks/newrelic.rb +1 -0
  371. data/lib/tasks/tests.rake +1 -0
  372. data/newrelic.yml +505 -486
  373. data/newrelic_rpm.gemspec +15 -17
  374. data/recipes/newrelic.rb +1 -0
  375. data/test/agent_helper.rb +114 -118
  376. metadata +58 -89
  377. data/bin/mongrel_rpm +0 -32
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic::Agent::Instrumentation
6
7
  module HTTPrb
@@ -14,12 +15,12 @@ module NewRelic::Agent::Instrumentation
14
15
  procedure: wrapped_request.method
15
16
  )
16
17
 
17
- segment.add_request_headers wrapped_request
18
+ segment.add_request_headers(wrapped_request)
18
19
 
19
20
  response = NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
20
21
 
21
- wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
22
- segment.process_response_headers wrapped_response
22
+ wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new(response)
23
+ segment.process_response_headers(wrapped_response)
23
24
 
24
25
  response
25
26
  ensure
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic::Agent::Instrumentation
6
7
  module HTTPrb
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require_relative 'httprb/instrumentation'
6
7
  require_relative 'httprb/chain'
@@ -14,7 +15,7 @@ DependencyDetection.defer do
14
15
  end
15
16
 
16
17
  executes do
17
- ::NewRelic::Agent.logger.info "Installing http.rb Wrappers"
18
+ ::NewRelic::Agent.logger.info("Installing http.rb Wrappers")
18
19
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
19
20
  require 'new_relic/agent/http_clients/http_rb_wrappers'
20
21
  end
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic
6
7
  module Agent
@@ -10,7 +11,7 @@ module NewRelic
10
11
  # We'll walk the superclass chain and see if
11
12
  # any class says 'yes, filter this one'.
12
13
 
13
- while klass.respond_to? :newrelic_read_attr
14
+ while klass.respond_to?(:newrelic_read_attr)
14
15
  ignore_actions = klass.newrelic_read_attr(key)
15
16
 
16
17
  should_filter = case ignore_actions
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic::Agent::Instrumentation
6
7
  module Logger
@@ -8,7 +9,7 @@ module NewRelic::Agent::Instrumentation
8
9
  ::Logger.class_eval do
9
10
  include NewRelic::Agent::Instrumentation::Logger
10
11
 
11
- alias_method :format_message_without_new_relic, :format_message
12
+ alias_method(:format_message_without_new_relic, :format_message)
12
13
 
13
14
  def format_message(severity, datetime, progname, msg)
14
15
  format_message_with_tracing(severity, datetime, progname, msg) do
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic
6
7
  module Agent
@@ -14,18 +15,22 @@ module NewRelic
14
15
  # instrumentation installed yet. This lets us disable in AgentLogger
15
16
  # and AuditLogger without them having to know the inner details.
16
17
  def self.mark_skip_instrumenting(logger)
18
+ return if logger.frozen?
17
19
  logger.instance_variable_set(:@skip_instrumenting, true)
18
20
  end
19
21
 
20
22
  def self.clear_skip_instrumenting(logger)
23
+ return if logger.frozen?
21
24
  logger.instance_variable_set(:@skip_instrumenting, false)
22
25
  end
23
26
 
24
27
  def mark_skip_instrumenting
28
+ return if frozen?
25
29
  @skip_instrumenting = true
26
30
  end
27
31
 
28
32
  def clear_skip_instrumenting
33
+ return if frozen?
29
34
  @skip_instrumenting = false
30
35
  end
31
36
 
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic::Agent::Instrumentation
6
7
  module Logger::Prepend
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require_relative 'logger/instrumentation'
6
7
  require_relative 'logger/chain'
@@ -15,7 +16,7 @@ DependencyDetection.defer do
15
16
  end
16
17
 
17
18
  executes do
18
- ::NewRelic::Agent.logger.info "Installing Logger instrumentation"
19
+ ::NewRelic::Agent.logger.info("Installing Logger instrumentation")
19
20
 
20
21
  if use_prepend?
21
22
  prepend_instrument ::Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
@@ -8,8 +8,8 @@ module NewRelic::Agent::Instrumentation
8
8
  module Chain
9
9
  extend Helper
10
10
 
11
- def self.instrument! target_class
12
- instrument_methods target_class, client_methods
11
+ def self.instrument!(target_class)
12
+ instrument_methods(target_class, client_methods)
13
13
  end
14
14
  end
15
15
  end
@@ -15,7 +15,7 @@ module NewRelic
15
15
  def instrument!
16
16
  if supports_datastore_instances?
17
17
  instrument_methods(::Dalli::Client, dalli_methods)
18
- instrument_multi_method :get_multi
18
+ instrument_multi_method(:get_multi)
19
19
  instrument_send_multiget
20
20
  instrument_server_for_key
21
21
  else
@@ -23,19 +23,19 @@ module NewRelic
23
23
  end
24
24
  end
25
25
 
26
- def instrument_multi_method method_name
27
- visibility = NewRelic::Helper.instance_method_visibility ::Dalli::Client, method_name
26
+ def instrument_multi_method(method_name)
27
+ visibility = NewRelic::Helper.instance_method_visibility(::Dalli::Client, method_name)
28
28
  method_name_without = :"#{method_name}_without_newrelic_trace"
29
29
 
30
30
  ::Dalli::Client.class_eval do
31
- alias_method method_name_without, method_name
31
+ alias_method(method_name_without, method_name)
32
32
 
33
- define_method method_name do |*args, &block|
34
- get_multi_with_newrelic_tracing(method_name) { __send__ method_name_without, *args, &block }
33
+ define_method(method_name) do |*args, &block|
34
+ get_multi_with_newrelic_tracing(method_name) { __send__(method_name_without, *args, &block) }
35
35
  end
36
36
 
37
- __send__ visibility, method_name
38
- __send__ visibility, method_name_without
37
+ __send__(visibility, method_name)
38
+ __send__(visibility, method_name_without)
39
39
  end
40
40
  end
41
41
 
@@ -43,10 +43,10 @@ module NewRelic
43
43
  ::Dalli::Ring.class_eval do
44
44
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
45
45
 
46
- alias_method :server_for_key_without_newrelic_trace, :server_for_key
46
+ alias_method(:server_for_key_without_newrelic_trace, :server_for_key)
47
47
 
48
- def server_for_key key
49
- server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace key }
48
+ def server_for_key(key)
49
+ server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace(key) }
50
50
  end
51
51
  end
52
52
  end
@@ -61,14 +61,14 @@ module NewRelic
61
61
 
62
62
  # TODO: Dalli - 3.1.0 renamed send_multiget to piplined_get, but the method is otherwise the same
63
63
  if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
64
- alias_method :pipelined_get_without_newrelic_trace, :pipelined_get
65
- def pipelined_get keys
66
- send_multiget_with_newrelic_tracing(keys) { pipelined_get_without_newrelic_trace keys }
64
+ alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
65
+ def pipelined_get(keys)
66
+ send_multiget_with_newrelic_tracing(keys) { pipelined_get_without_newrelic_trace(keys) }
67
67
  end
68
68
  else
69
- alias_method :send_multiget_without_newrelic_trace, :send_multiget
70
- def send_multiget keys
71
- send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace keys }
69
+ alias_method(:send_multiget_without_newrelic_trace, :send_multiget)
70
+ def send_multiget(keys)
71
+ send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace(keys) }
72
72
  end
73
73
  end
74
74
  end
@@ -86,8 +86,8 @@ module NewRelic
86
86
  end
87
87
 
88
88
  def instrument!
89
- instrument_methods ::Dalli::Client, dalli_cas_methods
90
- instrument_multi_method :get_multi_cas
89
+ instrument_methods(::Dalli::Client, dalli_cas_methods)
90
+ instrument_multi_method(:get_multi_cas)
91
91
  end
92
92
  end
93
93
  end
@@ -6,8 +6,8 @@
6
6
  module NewRelic::Agent::Instrumentation
7
7
  module Memcache
8
8
  module Helper
9
- DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new '2.6.4'
10
- BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new '3.0.2'
9
+ DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new('2.6.4')
10
+ BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new('3.0.2')
11
11
 
12
12
  def supports_datastore_instances?
13
13
  DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
@@ -38,20 +38,20 @@ module NewRelic::Agent::Instrumentation
38
38
 
39
39
  def instrument_methods(client_class, requested_methods = METHODS)
40
40
  supported_methods_for(client_class, requested_methods).each do |method_name|
41
- visibility = NewRelic::Helper.instance_method_visibility client_class, method_name
41
+ visibility = NewRelic::Helper.instance_method_visibility(client_class, method_name)
42
42
  method_name_without = :"#{method_name}_without_newrelic_trace"
43
43
 
44
44
  client_class.class_eval do
45
45
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
46
46
 
47
- alias_method method_name_without, method_name
47
+ alias_method(method_name_without, method_name)
48
48
 
49
- define_method method_name do |*args, &block|
50
- with_newrelic_tracing(method_name, *args) { __send__ method_name_without, *args, &block }
49
+ define_method(method_name) do |*args, &block|
50
+ with_newrelic_tracing(method_name, *args) { __send__(method_name_without, *args, &block) }
51
51
  end
52
52
 
53
- __send__ visibility, method_name
54
- __send__ visibility, method_name_without
53
+ __send__(visibility, method_name)
54
+ __send__(visibility, method_name_without)
55
55
  end
56
56
  end
57
57
  end
@@ -12,16 +12,17 @@ module NewRelic::Agent::Instrumentation
12
12
  MULTIGET_METRIC_NAME = "get_multi_request"
13
13
  MEMCACHED = "Memcached"
14
14
 
15
- def with_newrelic_tracing operation, *args
16
- segment = NewRelic::Agent::Tracer.start_datastore_segment \
15
+ def with_newrelic_tracing(operation, *args)
16
+ segment = NewRelic::Agent::Tracer.start_datastore_segment( \
17
17
  product: MEMCACHED,
18
18
  operation: operation
19
+ )
19
20
 
20
21
  begin
21
22
  NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
22
23
  ensure
23
24
  if NewRelic::Agent.config[:capture_memcache_keys]
24
- segment.notice_nosql_statement "#{operation} #{args.first.inspect}"
25
+ segment.notice_nosql_statement("#{operation} #{args.first.inspect}")
25
26
  end
26
27
  segment.finish if segment
27
28
  end
@@ -37,14 +38,15 @@ module NewRelic::Agent::Instrumentation
37
38
  end
38
39
  end
39
40
  rescue => e
40
- ::NewRelic::Agent.logger.warn "Unable to set instance info on datastore segment: #{e.message}"
41
+ ::NewRelic::Agent.logger.warn("Unable to set instance info on datastore segment: #{e.message}")
41
42
  end
42
43
  end
43
44
  end
44
45
 
45
- def get_multi_with_newrelic_tracing method_name
46
- segment = NewRelic::Agent::Tracer.start_segment \
46
+ def get_multi_with_newrelic_tracing(method_name)
47
+ segment = NewRelic::Agent::Tracer.start_segment( \
47
48
  name: "Ruby/Memcached/Dalli/#{method_name}"
49
+ )
48
50
 
49
51
  begin
50
52
  NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
@@ -53,35 +55,36 @@ module NewRelic::Agent::Instrumentation
53
55
  end
54
56
  end
55
57
 
56
- def send_multiget_with_newrelic_tracing keys
57
- segment = ::NewRelic::Agent::Tracer.start_datastore_segment \
58
+ def send_multiget_with_newrelic_tracing(keys)
59
+ segment = ::NewRelic::Agent::Tracer.start_datastore_segment( \
58
60
  product: MEMCACHED,
59
61
  operation: MULTIGET_METRIC_NAME
62
+ )
60
63
 
61
64
  begin
62
65
  assign_instance_to(segment, self)
63
66
  NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
64
67
  ensure
65
68
  if ::NewRelic::Agent.config[:capture_memcache_keys]
66
- segment.notice_nosql_statement "#{MULTIGET_METRIC_NAME} #{keys.inspect}"
69
+ segment.notice_nosql_statement("#{MULTIGET_METRIC_NAME} #{keys.inspect}")
67
70
  end
68
71
  segment.finish if segment
69
72
  end
70
73
  end
71
74
 
72
- def assign_instance_to segment, server
75
+ def assign_instance_to(segment, server)
73
76
  host = port_path_or_id = nil
74
- if server.hostname.start_with? SLASH
77
+ if server.hostname.start_with?(SLASH)
75
78
  host = LOCALHOST
76
79
  port_path_or_id = server.hostname
77
80
  else
78
81
  host = server.hostname
79
82
  port_path_or_id = server.port
80
83
  end
81
- segment.set_instance_info host, port_path_or_id
84
+ segment.set_instance_info(host, port_path_or_id)
82
85
  rescue => e
83
- ::NewRelic::Agent.logger.debug "Failed to retrieve memcached instance info: #{e.message}"
84
- segment.set_instance_info UNKNOWN, UNKNOWN
86
+ ::NewRelic::Agent.logger.debug("Failed to retrieve memcached instance info: #{e.message}")
87
+ segment.set_instance_info(UNKNOWN, UNKNOWN)
85
88
  end
86
89
  end
87
90
  end
@@ -10,7 +10,7 @@ module NewRelic::Agent::Instrumentation
10
10
 
11
11
  module_function
12
12
 
13
- def client_prepender client_class
13
+ def client_prepender(client_class)
14
14
  Module.new do
15
15
  extend Helper
16
16
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
@@ -24,28 +24,28 @@ module NewRelic::Agent::Instrumentation
24
24
  end
25
25
 
26
26
  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)
27
+ yield(::Dalli::Client, dalli_client_prepender(dalli_cas_methods))
28
+ yield(::Dalli::Client, dalli_get_multi_prepender(:get_multi_cas))
29
29
  end
30
30
 
31
31
  def dalli_prependers
32
32
  if supports_datastore_instances?
33
- yield ::Dalli::Client, dalli_client_prepender(dalli_methods)
34
- yield ::Dalli::Client, dalli_get_multi_prepender(:get_multi)
33
+ yield(::Dalli::Client, dalli_client_prepender(dalli_methods))
34
+ yield(::Dalli::Client, dalli_get_multi_prepender(:get_multi))
35
35
 
36
36
  if supports_binary_protocol?
37
- yield ::Dalli::Protocol::Binary, dalli_server_prepender
37
+ yield(::Dalli::Protocol::Binary, dalli_server_prepender)
38
38
  else
39
- yield ::Dalli::Server, dalli_server_prepender
39
+ yield(::Dalli::Server, dalli_server_prepender)
40
40
  end
41
41
 
42
- yield ::Dalli::Ring, dalli_ring_prepender
42
+ yield(::Dalli::Ring, dalli_ring_prepender)
43
43
  else
44
- yield ::Dalli::Client, dalli_client_prepender(client_methods)
44
+ yield(::Dalli::Client, dalli_client_prepender(client_methods))
45
45
  end
46
46
  end
47
47
 
48
- def dalli_client_prepender supported_methods
48
+ def dalli_client_prepender(supported_methods)
49
49
  Module.new do
50
50
  extend Helper
51
51
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
@@ -58,7 +58,7 @@ module NewRelic::Agent::Instrumentation
58
58
  end
59
59
  end
60
60
 
61
- def dalli_get_multi_prepender method_name
61
+ def dalli_get_multi_prepender(method_name)
62
62
  Module.new do
63
63
  extend Helper
64
64
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
@@ -74,7 +74,7 @@ module NewRelic::Agent::Instrumentation
74
74
  extend Helper
75
75
  include NewRelic::Agent::Instrumentation::Memcache::Tracer
76
76
 
77
- def server_for_key key
77
+ def server_for_key(key)
78
78
  server_for_key_with_newrelic_tracing { super }
79
79
  end
80
80
  end
@@ -87,11 +87,11 @@ module NewRelic::Agent::Instrumentation
87
87
 
88
88
  # TODO: Dalli - 3.1.0 renamed send_multiget to piplined_get, but the method is otherwise the same
89
89
  if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
90
- def pipelined_get keys
90
+ def pipelined_get(keys)
91
91
  send_multiget_with_newrelic_tracing(keys) { super }
92
92
  end
93
93
  else
94
- def send_multiget keys
94
+ def send_multiget(keys)
95
95
  send_multiget_with_newrelic_tracing(keys) { super }
96
96
  end
97
97
  end
@@ -75,7 +75,7 @@ DependencyDetection.defer do
75
75
  depends_on { ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
76
76
 
77
77
  executes do
78
- ::NewRelic::Agent.logger.info 'Installing Dalli CAS Client Memcache instrumentation'
78
+ ::NewRelic::Agent.logger.info('Installing Dalli CAS Client Memcache instrumentation')
79
79
  if use_prepend?
80
80
  prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
81
81
  prepend_module.dalli_cas_prependers do |client_class, instrumenting_module|
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require 'new_relic/agent/method_tracer'
6
7
  require 'new_relic/agent/transaction'
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  DependencyDetection.defer do
6
7
  named :mongo
@@ -18,7 +19,7 @@ DependencyDetection.defer do
18
19
  end
19
20
 
20
21
  executes do
21
- NewRelic::Agent.logger.info 'Installing Mongo instrumentation'
22
+ NewRelic::Agent.logger.info('Installing Mongo instrumentation')
22
23
  install_mongo_command_subscriber
23
24
  end
24
25
 
@@ -1,6 +1,8 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
5
+
4
6
  require 'new_relic/agent/datastores/mongo/event_formatter'
5
7
 
6
8
  module NewRelic
@@ -13,7 +15,7 @@ module NewRelic
13
15
  def started(event)
14
16
  begin
15
17
  return unless NewRelic::Agent::Tracer.tracing_enabled?
16
- segments[event.operation_id] = start_segment event
18
+ segments[event.operation_id] = start_segment(event)
17
19
  rescue Exception => e
18
20
  log_notification_error('started', e)
19
21
  end
@@ -40,12 +42,12 @@ module NewRelic
40
42
  if error_key = error_key_present?(event)
41
43
  # taking the last error as there can potentially be many
42
44
  attributes = event.reply[error_key][-1]
43
- segment.notice_error Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]])
45
+ segment.notice_error(Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]]))
44
46
 
45
47
  # failing commands return a CommandFailed event with an error message
46
48
  # 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)
49
+ elsif event.is_a?(Mongo::Monitoring::Event::CommandFailed)
50
+ segment.notice_error(Mongo::Error.new(event.message))
49
51
  end
50
52
  segment.finish
51
53
  rescue Exception => e
@@ -58,9 +60,9 @@ module NewRelic
58
60
 
59
61
  private
60
62
 
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
63
+ def start_segment(event)
64
+ host = host_from_address(event.address)
65
+ port_path_or_id = port_path_or_id_from_address(event.address)
64
66
  segment = NewRelic::Agent::Tracer.start_datastore_segment(
65
67
  product: MONGODB,
66
68
  operation: operation(event.command_name),
@@ -107,31 +109,31 @@ module NewRelic
107
109
  LOCALHOST = "localhost".freeze
108
110
 
109
111
  def host_from_address(address)
110
- if unix_domain_socket? address.host
112
+ if unix_domain_socket?(address.host)
111
113
  LOCALHOST
112
114
  else
113
115
  address.host
114
116
  end
115
117
  rescue => e
116
- NewRelic::Agent.logger.debug "Failed to retrieve Mongo host: #{e}"
118
+ NewRelic::Agent.logger.debug("Failed to retrieve Mongo host: #{e}")
117
119
  UNKNOWN
118
120
  end
119
121
 
120
122
  def port_path_or_id_from_address(address)
121
- if unix_domain_socket? address.host
123
+ if unix_domain_socket?(address.host)
122
124
  address.host
123
125
  else
124
126
  address.port
125
127
  end
126
128
  rescue => e
127
- NewRelic::Agent.logger.debug "Failed to retrieve Mongo port_path_or_id: #{e}"
129
+ NewRelic::Agent.logger.debug("Failed to retrieve Mongo port_path_or_id: #{e}")
128
130
  UNKNOWN
129
131
  end
130
132
 
131
133
  SLASH = "/".freeze
132
134
 
133
135
  def unix_domain_socket?(host)
134
- host.start_with? SLASH
136
+ host.start_with?(SLASH)
135
137
  end
136
138
  end
137
139
  end
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require_relative 'instrumentation'
6
7
 
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  module NewRelic
6
7
  module Agent
@@ -17,18 +18,18 @@ module NewRelic
17
18
 
18
19
  begin
19
20
  response = nil
20
- segment.add_request_headers wrapped_request
21
+ segment.add_request_headers(wrapped_request)
21
22
 
22
23
  # RUBY-1244 Disable further tracing in request to avoid double
23
24
  # counting if connection wasn't started (which calls request again).
24
25
  NewRelic::Agent.disable_all_tracing do
25
- response = NewRelic::Agent::Tracer.capture_segment_error segment do
26
+ response = NewRelic::Agent::Tracer.capture_segment_error(segment) do
26
27
  yield
27
28
  end
28
29
  end
29
30
 
30
- wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
31
- segment.process_response_headers wrapped_response
31
+ wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new(response)
32
+ segment.process_response_headers(wrapped_response)
32
33
  response
33
34
  ensure
34
35
  segment.finish
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require_relative 'instrumentation'
6
7
 
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require_relative 'net_http/chain'
6
7
  require_relative 'net_http/prepend'
@@ -13,7 +14,7 @@ DependencyDetection.defer do
13
14
  end
14
15
 
15
16
  executes do
16
- ::NewRelic::Agent.logger.info 'Installing Net:HTTP Wrappers'
17
+ ::NewRelic::Agent.logger.info('Installing Net:HTTP Wrappers')
17
18
  require 'new_relic/agent/http_clients/net_http_wrappers'
18
19
  end
19
20