newrelic_rpm 6.15.0 → 8.13.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (427) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +7 -1
  3. data/.rubocop.yml +1817 -0
  4. data/.rubocop_todo.yml +59 -0
  5. data/.simplecov +15 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +1 -0
  8. data/Brewfile +12 -0
  9. data/CHANGELOG.md +754 -40
  10. data/CONTRIBUTING.md +32 -5
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +0 -1
  14. data/Guardfile +9 -8
  15. data/LICENSE +0 -6
  16. data/README.md +21 -20
  17. data/Rakefile +27 -29
  18. data/THIRD_PARTY_NOTICES.md +14 -199
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +76 -53
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +4 -6
  26. data/install.rb +2 -2
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
  29. data/lib/new_relic/agent/agent/shutdown.rb +35 -0
  30. data/lib/new_relic/agent/agent/special_startup.rb +72 -0
  31. data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
  32. data/lib/new_relic/agent/agent/startup.rb +197 -0
  33. data/lib/new_relic/agent/agent.rb +178 -555
  34. data/lib/new_relic/agent/agent_logger.rb +23 -19
  35. data/lib/new_relic/agent/attribute_filter.rb +66 -47
  36. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  37. data/lib/new_relic/agent/attributes.rb +5 -4
  38. data/lib/new_relic/agent/audit_logger.rb +8 -3
  39. data/lib/new_relic/agent/autostart.rb +20 -19
  40. data/lib/new_relic/agent/chained_call.rb +1 -1
  41. data/lib/new_relic/agent/commands/agent_command.rb +3 -3
  42. data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
  43. data/lib/new_relic/agent/commands/thread_profiler_session.rb +9 -7
  44. data/lib/new_relic/agent/configuration/default_source.rb +1728 -1194
  45. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  46. data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
  47. data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
  48. data/lib/new_relic/agent/configuration/high_security_source.rb +9 -8
  49. data/lib/new_relic/agent/configuration/manager.rb +82 -69
  50. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  51. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  52. data/lib/new_relic/agent/configuration/security_policy_source.rb +90 -77
  53. data/lib/new_relic/agent/configuration/server_source.rb +21 -19
  54. data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
  55. data/lib/new_relic/agent/configuration.rb +1 -1
  56. data/lib/new_relic/agent/connect/request_builder.rb +18 -18
  57. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  58. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
  59. data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
  60. data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
  61. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  62. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  63. data/lib/new_relic/agent/database.rb +53 -47
  64. data/lib/new_relic/agent/database_adapter.rb +3 -1
  65. data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
  66. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  67. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
  68. data/lib/new_relic/agent/datastores/mongo.rb +6 -11
  69. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  70. data/lib/new_relic/agent/datastores/redis.rb +5 -11
  71. data/lib/new_relic/agent/datastores.rb +11 -13
  72. data/lib/new_relic/agent/deprecator.rb +1 -1
  73. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
  74. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +39 -32
  75. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
  76. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
  77. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
  79. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
  80. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
  81. data/lib/new_relic/agent/distributed_tracing.rb +32 -100
  82. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  83. data/lib/new_relic/agent/error_collector.rb +73 -54
  84. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  85. data/lib/new_relic/agent/error_filter.rb +174 -0
  86. data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
  87. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  88. data/lib/new_relic/agent/event_buffer.rb +7 -8
  89. data/lib/new_relic/agent/event_listener.rb +1 -2
  90. data/lib/new_relic/agent/event_loop.rb +25 -23
  91. data/lib/new_relic/agent/external.rb +11 -44
  92. data/lib/new_relic/agent/guid_generator.rb +4 -11
  93. data/lib/new_relic/agent/harvester.rb +4 -5
  94. data/lib/new_relic/agent/heap.rb +6 -8
  95. data/lib/new_relic/agent/hostname.rb +20 -13
  96. data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
  97. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
  98. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
  99. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
  100. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
  101. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
  102. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
  103. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
  104. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +8 -8
  105. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
  106. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -13
  107. data/lib/new_relic/agent/instrumentation/active_job.rb +14 -7
  108. data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
  109. data/lib/new_relic/agent/instrumentation/active_record.rb +29 -27
  110. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
  111. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +31 -44
  112. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
  113. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
  114. data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
  115. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +18 -15
  116. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  117. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  118. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  119. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  120. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +18 -10
  121. data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -2
  122. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  123. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  124. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  125. data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
  126. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +68 -58
  127. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  128. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  129. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  130. data/lib/new_relic/agent/instrumentation/curb.rb +11 -243
  131. data/lib/new_relic/agent/instrumentation/data_mapper.rb +65 -54
  132. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
  133. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  134. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  135. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +29 -53
  136. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  137. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  138. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  139. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  140. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +5 -5
  141. data/lib/new_relic/agent/instrumentation/excon.rb +22 -24
  142. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  143. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  144. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  145. data/lib/new_relic/agent/instrumentation/grape.rb +11 -112
  146. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  147. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  148. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  149. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  150. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  151. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  152. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  153. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  154. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  155. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  156. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  157. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  158. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  159. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  160. data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
  161. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  162. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  163. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  164. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  165. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
  166. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  167. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  168. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  169. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  170. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  171. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +57 -128
  172. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  173. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  174. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
  175. data/lib/new_relic/agent/instrumentation/memcache.rb +56 -72
  176. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -12
  177. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
  178. data/lib/new_relic/agent/instrumentation/mongo.rb +5 -136
  179. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
  180. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  181. data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +13 -13
  182. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  183. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  184. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +10 -9
  185. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  186. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  187. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  188. data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
  189. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
  190. data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
  191. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  192. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  193. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  194. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  195. data/lib/new_relic/agent/instrumentation/rack.rb +30 -140
  196. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +16 -52
  197. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  198. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +5 -4
  199. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -3
  200. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
  201. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +13 -3
  202. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  203. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
  204. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  205. data/lib/new_relic/agent/instrumentation/rake.rb +16 -157
  206. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  207. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  208. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +72 -0
  209. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  210. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  211. data/lib/new_relic/agent/instrumentation/redis.rb +18 -107
  212. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  213. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  214. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  215. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  216. data/lib/new_relic/agent/instrumentation/resque.rb +28 -39
  217. data/lib/new_relic/agent/instrumentation/sequel.rb +14 -16
  218. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
  219. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  220. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  221. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  222. data/lib/new_relic/agent/instrumentation/sidekiq.rb +23 -64
  223. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  224. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
  225. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
  226. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  227. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  228. data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
  229. data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -3
  230. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  231. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  232. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  233. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  234. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  235. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  236. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  237. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  238. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  239. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  240. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  241. data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
  242. data/lib/new_relic/agent/instrumentation.rb +1 -1
  243. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  244. data/lib/new_relic/agent/javascript_instrumentor.rb +47 -41
  245. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  246. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  247. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  248. data/lib/new_relic/agent/log_once.rb +1 -1
  249. data/lib/new_relic/agent/log_priority.rb +20 -0
  250. data/lib/new_relic/agent/logging.rb +24 -21
  251. data/lib/new_relic/agent/memory_logger.rb +2 -2
  252. data/lib/new_relic/agent/messaging.rb +65 -81
  253. data/lib/new_relic/agent/method_tracer.rb +154 -149
  254. data/lib/new_relic/agent/method_tracer_helpers.rb +85 -3
  255. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +25 -17
  256. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  257. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  258. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
  259. data/lib/new_relic/agent/monitors.rb +6 -7
  260. data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
  261. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
  262. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  263. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -4
  264. data/lib/new_relic/agent/new_relic_service.rb +248 -196
  265. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  266. data/lib/new_relic/agent/null_logger.rb +7 -3
  267. data/lib/new_relic/agent/obfuscator.rb +8 -10
  268. data/lib/new_relic/agent/parameter_filtering.rb +24 -10
  269. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  270. data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
  271. data/lib/new_relic/agent/pipe_service.rb +8 -5
  272. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  273. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
  274. data/lib/new_relic/agent/range_extensions.rb +8 -28
  275. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  276. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -13
  277. data/lib/new_relic/agent/rules_engine.rb +5 -4
  278. data/lib/new_relic/agent/sampler.rb +3 -4
  279. data/lib/new_relic/agent/sampler_collection.rb +3 -4
  280. data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
  281. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +12 -9
  282. data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
  283. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  284. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  285. data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
  286. data/lib/new_relic/agent/span_event_primitive.rb +62 -56
  287. data/lib/new_relic/agent/sql_sampler.rb +18 -18
  288. data/lib/new_relic/agent/stats.rb +78 -41
  289. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  290. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  291. data/lib/new_relic/agent/stats_engine.rb +8 -8
  292. data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
  293. data/lib/new_relic/agent/system_info.rb +85 -65
  294. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  295. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  296. data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
  297. data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
  298. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  299. data/lib/new_relic/agent/tracer.rb +76 -85
  300. data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
  301. data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
  302. data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
  303. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  304. data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
  305. data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
  306. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  307. data/lib/new_relic/agent/transaction/segment.rb +14 -10
  308. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  309. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  310. data/lib/new_relic/agent/transaction/trace.rb +15 -11
  311. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  312. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  313. data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
  314. data/lib/new_relic/agent/transaction/tracing.rb +14 -11
  315. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +4 -4
  316. data/lib/new_relic/agent/transaction.rb +164 -145
  317. data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
  318. data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
  319. data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
  320. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  321. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  322. data/lib/new_relic/agent/transaction_sampler.rb +5 -6
  323. data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
  324. data/lib/new_relic/agent/utilization/aws.rb +33 -3
  325. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  326. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  327. data/lib/new_relic/agent/utilization/pcf.rb +5 -4
  328. data/lib/new_relic/agent/utilization/vendor.rb +43 -28
  329. data/lib/new_relic/agent/utilization_data.rb +7 -5
  330. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  331. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
  332. data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
  333. data/lib/new_relic/agent/vm/snapshot.rb +5 -5
  334. data/lib/new_relic/agent/vm.rb +1 -1
  335. data/lib/new_relic/agent/worker_loop.rb +10 -12
  336. data/lib/new_relic/agent.rb +64 -75
  337. data/lib/new_relic/cli/command.rb +20 -22
  338. data/lib/new_relic/cli/commands/deployments.rb +92 -42
  339. data/lib/new_relic/cli/commands/install.rb +12 -15
  340. data/lib/new_relic/coerce.rb +15 -13
  341. data/lib/new_relic/collection_helper.rb +50 -48
  342. data/lib/new_relic/constants.rb +1 -4
  343. data/lib/new_relic/control/class_methods.rb +3 -3
  344. data/lib/new_relic/control/frameworks/external.rb +2 -2
  345. data/lib/new_relic/control/frameworks/rails.rb +23 -17
  346. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  347. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  348. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  349. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  350. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  351. data/lib/new_relic/control/frameworks.rb +1 -1
  352. data/lib/new_relic/control/instance_methods.rb +23 -45
  353. data/lib/new_relic/control/instrumentation.rb +39 -11
  354. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  355. data/lib/new_relic/control/server_methods.rb +3 -4
  356. data/lib/new_relic/control.rb +1 -2
  357. data/lib/new_relic/delayed_job_injection.rb +1 -1
  358. data/lib/new_relic/dependency_detection.rb +126 -19
  359. data/lib/new_relic/environment_report.rb +40 -32
  360. data/lib/new_relic/helper.rb +48 -7
  361. data/lib/new_relic/language_support.rb +29 -5
  362. data/lib/new_relic/latest_changes.rb +7 -6
  363. data/lib/new_relic/local_environment.rb +24 -18
  364. data/lib/new_relic/metric_data.rb +31 -26
  365. data/lib/new_relic/metric_spec.rb +8 -6
  366. data/lib/new_relic/noticed_error.rb +22 -30
  367. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  368. data/lib/new_relic/rack/agent_middleware.rb +5 -3
  369. data/lib/new_relic/rack/browser_monitoring.rb +133 -123
  370. data/lib/new_relic/rack.rb +1 -1
  371. data/lib/new_relic/recipes/capistrano3.rb +3 -61
  372. data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
  373. data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
  374. data/lib/new_relic/recipes.rb +1 -1
  375. data/lib/new_relic/supportability_helper.rb +9 -10
  376. data/lib/new_relic/traced_thread.rb +35 -0
  377. data/lib/new_relic/version.rb +6 -17
  378. data/lib/newrelic_rpm.rb +11 -35
  379. data/lib/sequel/extensions/newrelic_instrumentation.rb +12 -15
  380. data/lib/sequel/plugins/newrelic_instrumentation.rb +4 -10
  381. data/lib/tasks/all.rb +3 -3
  382. data/lib/tasks/config.rake +22 -117
  383. data/lib/tasks/coverage_report.rake +28 -0
  384. data/lib/tasks/helpers/config.html.erb +21 -0
  385. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  386. data/lib/tasks/helpers/format.rb +123 -0
  387. data/lib/tasks/helpers/matches.rb +12 -0
  388. data/lib/tasks/helpers/prompt.rb +24 -0
  389. data/lib/tasks/helpers/removers.rb +33 -0
  390. data/lib/tasks/install.rake +4 -0
  391. data/lib/tasks/instrumentation_generator/README.md +63 -0
  392. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  393. data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
  394. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  395. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  396. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  397. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  398. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  399. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  400. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  401. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  402. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  403. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  404. data/lib/tasks/multiverse.rake +4 -0
  405. data/lib/tasks/multiverse.rb +5 -32
  406. data/lib/tasks/newrelic.rb +1 -1
  407. data/lib/tasks/tests.rake +10 -15
  408. data/newrelic.yml +648 -3
  409. data/newrelic_rpm.gemspec +25 -25
  410. data/recipes/newrelic.rb +2 -2
  411. data/test/agent_helper.rb +219 -178
  412. metadata +164 -122
  413. data/ROADMAP.md +0 -24
  414. data/bin/mongrel_rpm +0 -33
  415. data/cert/cacert.pem +0 -1177
  416. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  417. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  418. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  419. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  420. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  421. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  422. data/lib/new_relic/agent/instrumentation/net.rb +0 -70
  423. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  424. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  425. data/lib/new_relic/agent/supported_versions.rb +0 -275
  426. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  427. data/lib/tasks/config.html.erb +0 -32
@@ -1,103 +1,87 @@
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
- # NOTE there are multiple implementations of the MemCache client in Ruby,
6
- # 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.
7
7
  # See:
8
8
  # http://www.deveiate.org/code/Ruby-MemCache/ (Gem: Ruby-MemCache)
9
9
  # http://seattlerb.rubyforge.org/memcache-client/ (Gem: memcache-client)
10
10
  # https://github.com/mperham/dalli (Gem: dalli)
11
11
 
12
- require 'new_relic/agent/datastores/metric_helper'
13
- require 'new_relic/agent/instrumentation/memcache/dalli'
12
+ require_relative 'memcache/helper'
13
+ require_relative 'memcache/instrumentation'
14
+ require_relative 'memcache/dalli'
15
+ require_relative 'memcache/chain'
16
+ require_relative 'memcache/prepend'
14
17
 
15
- module NewRelic
16
- module Agent
17
- module Instrumentation
18
- module Memcache
19
- module_function
20
-
21
- def enabled?
22
- !::NewRelic::Agent.config[:disable_memcache_instrumentation]
23
- end
24
-
25
- METHODS = [:get, :get_multi, :set, :add, :incr, :decr, :delete, :replace, :append,
26
- :prepend, :cas, :single_get, :multi_get, :single_cas, :multi_cas]
27
-
28
- def supported_methods_for(client_class, methods)
29
- methods.select do |method_name|
30
- client_class.method_defined?(method_name) || client_class.private_method_defined?(method_name)
31
- end
32
- end
33
-
34
- def instrument_methods(client_class, requested_methods = METHODS)
35
- supported_methods_for(client_class, requested_methods).each do |method_name|
18
+ DependencyDetection.defer do
19
+ named :memcache_client
36
20
 
37
- visibility = NewRelic::Helper.instance_method_visibility client_class, method_name
38
- method_name_without = :"#{method_name}_without_newrelic_trace"
21
+ depends_on { defined? ::MemCache }
39
22
 
40
- client_class.class_eval do
41
- alias_method method_name_without, method_name
23
+ executes do
24
+ if use_prepend?
25
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(::MemCache)
26
+ prepend_instrument ::MemCache, prepend_module, "MemcacheClient"
27
+ else
28
+ chain_instrument_target ::MemCache, ::NewRelic::Agent::Instrumentation::Memcache::Chain, "MemcacheClient"
29
+ end
30
+ end
31
+ end
42
32
 
43
- define_method method_name do |*args, &block|
44
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
45
- product: "Memcached",
46
- operation: method_name
47
- )
48
- begin
49
- NewRelic::Agent::Tracer.capture_segment_error segment do
50
- send method_name_without, *args, &block
51
- end
52
- ensure
53
- if NewRelic::Agent.config[:capture_memcache_keys]
54
- segment.notice_nosql_statement "#{method_name} #{args.first.inspect}"
55
- end
56
- segment.finish if segment
57
- end
58
- end
33
+ DependencyDetection.defer do
34
+ named :memcached
59
35
 
60
- send visibility, method_name
61
- send visibility, method_name_without
62
- end
63
- end
64
- end
36
+ depends_on { defined? ::Memcached }
65
37
 
66
- end
38
+ executes do
39
+ if use_prepend?
40
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(::Memcached)
41
+ prepend_instrument ::Memcached, prepend_module, "Memcached"
42
+ else
43
+ chain_instrument_target ::Memcached, ::NewRelic::Agent::Instrumentation::Memcache::Chain, "Memcached"
67
44
  end
68
45
  end
69
46
  end
70
47
 
71
48
  DependencyDetection.defer do
72
- named :memcache_client
49
+ named :dalli
50
+ configure_with :memcache
73
51
 
74
- depends_on do
75
- NewRelic::Agent::Instrumentation::Memcache.enabled?
76
- end
77
-
78
- depends_on do
79
- defined?(::MemCache)
80
- end
52
+ depends_on { defined? ::Dalli::Client }
81
53
 
82
54
  executes do
83
- ::NewRelic::Agent.logger.info 'Installing Memcached instrumentation for memcache-client gem'
84
- NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::MemCache)
55
+ if use_prepend?
56
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
57
+ prepend_module.dalli_prependers do |client_class, instrumenting_module|
58
+ prepend_instrument client_class, instrumenting_module, "MemcachedDalli"
59
+ end
60
+ else
61
+ chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::Dalli
62
+ end
85
63
  end
86
64
  end
87
65
 
66
+ # These CAS client methods are only optionally defined if users require
67
+ # dalli/cas/client. Use a separate dependency block so it can potentially
68
+ # re-evaluate after they've done that require.
88
69
  DependencyDetection.defer do
89
- named :memcached
90
-
91
- depends_on do
92
- NewRelic::Agent::Instrumentation::Memcache.enabled?
93
- end
70
+ named :dalli_cas_client
71
+ configure_with :memcache
94
72
 
95
- depends_on do
96
- defined?(::Memcached)
97
- end
73
+ depends_on { defined? ::Dalli::Client }
74
+ depends_on { ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
98
75
 
99
76
  executes do
100
- ::NewRelic::Agent.logger.info 'Installing Memcached instrumentation for memcached gem'
101
- ::NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Memcached)
77
+ ::NewRelic::Agent.logger.info('Installing Dalli CAS Client Memcache instrumentation')
78
+ if use_prepend?
79
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
80
+ prepend_module.dalli_cas_prependers do |client_class, instrumenting_module|
81
+ prepend_instrument client_class, instrumenting_module, "MemcachedDalliCAS"
82
+ end
83
+ else
84
+ chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS
85
+ end
102
86
  end
103
87
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/method_tracer'
6
6
  require 'new_relic/agent/transaction'
@@ -15,7 +15,7 @@ module NewRelic
15
15
  class MiddlewareProxy
16
16
  include MiddlewareTracing
17
17
 
18
- ANONYMOUS_CLASS = "AnonymousClass".freeze
18
+ ANONYMOUS_CLASS = "AnonymousClass".freeze
19
19
  OBJECT_CLASS_NAME = "Object".freeze
20
20
 
21
21
  # This class is used to wrap classes that are passed to
@@ -31,6 +31,8 @@ module NewRelic
31
31
  middleware_instance = @middleware_class.new(*args, &blk)
32
32
  MiddlewareProxy.wrap(middleware_instance)
33
33
  end
34
+
35
+ ruby2_keywords(:new) if respond_to?(:ruby2_keywords, true)
34
36
  end
35
37
 
36
38
  def self.is_sinatra_app?(target)
@@ -48,7 +50,7 @@ module NewRelic
48
50
  )
49
51
  end
50
52
 
51
- def self.wrap(target, is_app=false)
53
+ def self.wrap(target, is_app = false)
52
54
  if needs_wrapping?(target)
53
55
  self.new(target, is_app)
54
56
  else
@@ -58,13 +60,13 @@ module NewRelic
58
60
 
59
61
  attr_reader :target, :category, :transaction_options
60
62
 
61
- def initialize(target, is_app=false)
62
- @target = target
63
- @is_app = is_app
64
- @category = determine_category
63
+ def initialize(target, is_app = false)
64
+ @target = target
65
+ @is_app = is_app
66
+ @category = determine_category
65
67
  @target_class_name = determine_class_name
66
- @transaction_name = "#{determine_prefix}#{@target_class_name}/call"
67
- @transaction_options = {
68
+ @transaction_name = "#{determine_prefix}#{@target_class_name}/call"
69
+ @transaction_options = {
68
70
  :transaction_name => @transaction_name
69
71
  }
70
72
  end
@@ -84,14 +86,14 @@ module NewRelic
84
86
  # In 'normal' usage, the target will be an application instance that
85
87
  # responds to #call. With Rails, however, the target may be a subclass
86
88
  # of Rails::Application that defines a method_missing that proxies #call
87
- # 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
88
90
  # capture the correct name in both cases.
89
91
  def determine_class_name
90
92
  clazz = class_for_target
91
93
 
92
94
  name = clazz.name
93
95
  name = clazz.superclass.name if name.nil? || name == ""
94
- name = ANONYMOUS_CLASS if name.nil? || name == OBJECT_CLASS_NAME
96
+ name = ANONYMOUS_CLASS if name.nil? || name == OBJECT_CLASS_NAME
95
97
  name
96
98
  end
97
99
 
@@ -102,7 +104,6 @@ module NewRelic
102
104
  @target.class
103
105
  end
104
106
  end
105
-
106
107
  end
107
108
  end
108
109
  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
@@ -27,10 +26,9 @@ module NewRelic
27
26
  module Agent
28
27
  module Instrumentation
29
28
  module MiddlewareTracing
30
-
31
29
  TXN_STARTED_KEY = 'newrelic.transaction_started'
32
- CONTENT_TYPE = 'Content-Type'
33
- CONTENT_LENGTH = 'Content-Length'
30
+ CONTENT_TYPE = 'Content-Type'
31
+ CONTENT_LENGTH = 'Content-Length'
34
32
 
35
33
  def _nr_has_middleware_tracing
36
34
  true
@@ -46,7 +44,7 @@ module NewRelic
46
44
  opts[:apdex_start_time] = QueueTime.parse_frontend_timestamp(env)
47
45
  # this case is for the rare occasion that an app is using Puma::Rack
48
46
  # without having ::Rack as a dependency
49
- opts[:request] = ::Rack::Request.new(env) if defined? ::Rack
47
+ opts[:request] = ::Rack::Request.new(env.dup) if defined? ::Rack
50
48
  opts
51
49
  end
52
50
 
@@ -71,7 +69,7 @@ module NewRelic
71
69
  if result.is_a?(Array) && state.current_transaction
72
70
  _, headers, _ = result
73
71
  length = headers[CONTENT_LENGTH]
74
- length = length.reduce(0){|sum, h| sum + h.to_i} if length.is_a?(Array)
72
+ length = length.reduce(0) { |sum, h| sum + h.to_i } if length.is_a?(Array)
75
73
  state.current_transaction.response_content_length = length
76
74
  end
77
75
  end
@@ -98,7 +96,7 @@ module NewRelic
98
96
 
99
97
  events.notify(:before_call, env) if first_middleware
100
98
 
101
- result = (target == self) ? traced_call(env) : target.call(env)
99
+ result = target == self ? traced_call(env) : target.call(env)
102
100
 
103
101
  if first_middleware
104
102
  capture_response_attributes(state, result)
@@ -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
@@ -11,19 +11,15 @@ DependencyDetection.defer do
11
11
 
12
12
  depends_on do
13
13
  require 'new_relic/agent/datastores/mongo'
14
- if NewRelic::Agent::Datastores::Mongo.is_unsupported_2x?
15
- NewRelic::Agent.logger.log_once(:info, :mongo2, 'Detected unsupported Mongo 2, upgrade your Mongo Driver to 2.1 or newer for instrumentation')
14
+ unless NewRelic::Agent::Datastores::Mongo.is_supported_version?
15
+ NewRelic::Agent.logger.log_once(:warn, :mongo2, 'Detected unsupported Mongo 2, upgrade your Mongo Driver to 2.1 or newer for instrumentation')
16
16
  end
17
17
  NewRelic::Agent::Datastores::Mongo.is_supported_version?
18
18
  end
19
19
 
20
20
  executes do
21
- NewRelic::Agent.logger.info 'Installing Mongo instrumentation'
22
- if NewRelic::Agent::Datastores::Mongo.is_monitoring_enabled?
23
- install_mongo_command_subscriber
24
- else
25
- install_mongo_instrumentation
26
- end
21
+ NewRelic::Agent.logger.info('Installing Mongo instrumentation')
22
+ install_mongo_command_subscriber
27
23
  end
28
24
 
29
25
  def install_mongo_command_subscriber
@@ -33,131 +29,4 @@ DependencyDetection.defer do
33
29
  NewRelic::Agent::Instrumentation::MongodbCommandSubscriber.new
34
30
  )
35
31
  end
36
-
37
- def install_mongo_instrumentation
38
- require 'new_relic/agent/datastores/mongo/metric_translator'
39
- require 'new_relic/agent/datastores/mongo/statement_formatter'
40
-
41
- hook_instrument_methods
42
- instrument_save
43
- instrument_ensure_index
44
- end
45
-
46
- def hook_instrument_methods
47
- hook_instrument_method(::Mongo::Collection)
48
- hook_instrument_method(::Mongo::Connection)
49
- hook_instrument_method(::Mongo::Cursor)
50
- hook_instrument_method(::Mongo::CollectionWriter) if defined?(::Mongo::CollectionWriter)
51
- end
52
-
53
- def hook_instrument_method(target_class)
54
- target_class.class_eval do
55
- include NewRelic::Agent::MethodTracer
56
-
57
- # It's key that this method eats all exceptions, as it rests between the
58
- # Mongo operation the user called and us returning them the data. Be safe!
59
- def new_relic_notice_statement(segment, payload, name)
60
- statement = NewRelic::Agent::Datastores::Mongo::StatementFormatter.format(payload, name)
61
- if statement
62
- segment.notice_nosql_statement statement
63
- end
64
- rescue => e
65
- NewRelic::Agent.logger.debug("Exception during Mongo statement gathering", e)
66
- end
67
-
68
- def new_relic_default_payload
69
- { :collection => self.name, :database => self.db.name }
70
- end
71
-
72
- def new_relic_start_segment name, payload
73
- product = NewRelic::Agent::Datastores::Mongo::MetricTranslator::MONGO_PRODUCT_NAME
74
- op_and_col = NewRelic::Agent::Datastores::Mongo::MetricTranslator.operation_and_collection_for name, payload
75
- if op_and_col
76
- operation, collection = op_and_col
77
- NewRelic::Agent::Tracer.start_datastore_segment(
78
- product: product,
79
- operation: operation,
80
- collection: collection
81
- )
82
- end
83
- end
84
-
85
- def instrument_with_new_relic_trace(name, payload = {}, &block)
86
- segment = new_relic_start_segment name, payload
87
-
88
- begin
89
- result = NewRelic::Agent.disable_all_tracing do
90
- NewRelic::Agent::Tracer.capture_segment_error segment do
91
- instrument_without_new_relic_trace(name, payload, &block)
92
- end
93
- end
94
-
95
- new_relic_notice_statement(segment, payload, name) if segment
96
- result
97
- ensure
98
- segment.finish if segment
99
- end
100
- end
101
-
102
- alias_method :instrument_without_new_relic_trace, :instrument
103
- alias_method :instrument, :instrument_with_new_relic_trace
104
- end
105
- end
106
-
107
- def instrument_save
108
- ::Mongo::Collection.class_eval do
109
- def save_with_new_relic_trace(doc, opts = {}, &block)
110
- segment = new_relic_start_segment :save, new_relic_default_payload
111
-
112
- begin
113
- result = NewRelic::Agent.disable_all_tracing do
114
- NewRelic::Agent::Tracer.capture_segment_error segment do
115
- save_without_new_relic_trace(doc, opts, &block)
116
- end
117
- end
118
-
119
- new_relic_notice_statement(segment, doc, :save) if segment
120
- result
121
- ensure
122
- segment.finish if segment
123
- end
124
- end
125
-
126
- alias_method :save_without_new_relic_trace, :save
127
- alias_method :save, :save_with_new_relic_trace
128
- end
129
- end
130
-
131
- def instrument_ensure_index
132
- ::Mongo::Collection.class_eval do
133
- def ensure_index_with_new_relic_trace(spec, opts = {}, &block)
134
- segment = new_relic_start_segment :ensureIndex, new_relic_default_payload
135
-
136
- begin
137
- result = NewRelic::Agent.disable_all_tracing do
138
- NewRelic::Agent::Tracer.capture_segment_error segment do
139
- ensure_index_without_new_relic_trace(spec, opts, &block)
140
- end
141
- end
142
-
143
- spec = case spec
144
- when Array
145
- Hash[spec]
146
- when String, Symbol
147
- { spec => 1 }
148
- else
149
- spec.dup
150
- end
151
-
152
- new_relic_notice_statement(segment, spec, :ensureIndex) if segment
153
- result
154
- ensure
155
- segment.finish if segment
156
- end
157
- end
158
-
159
- alias_method :ensure_index_without_new_relic_trace, :ensure_index
160
- alias_method :ensure_index, :ensure_index_with_new_relic_trace
161
- end
162
- end
163
32
  end
@@ -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,17 +14,18 @@ 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
+
18
+ segments[event.operation_id] = start_segment(event)
17
19
  rescue Exception => e
18
20
  log_notification_error('started', e)
19
21
  end
20
22
  end
21
23
 
22
- ERROR_KEYS = %w{ writeErrors writeConcernError writeConcernErrors }.freeze
24
+ ERROR_KEYS = %w[ writeErrors writeConcernError writeConcernErrors ].freeze
23
25
 
24
26
  def error_key_present?(event)
25
27
  if reply = event.reply
26
- ERROR_KEYS.detect{ |key| reply[key] }
28
+ ERROR_KEYS.detect { |key| reply[key] }
27
29
  end
28
30
  rescue
29
31
  false
@@ -32,20 +34,21 @@ module NewRelic
32
34
  def completed(event)
33
35
  begin
34
36
  return unless NewRelic::Agent::Tracer.tracing_enabled?
37
+
35
38
  segment = segments.delete(event.operation_id)
36
39
  return unless segment
37
40
 
38
- # operations that succeed but have errors return CommandSucceeded
39
- # with an error_key that is populated with error specfics
41
+ # operations that succeed but have errors return CommandSucceeded
42
+ # with an error_key that is populated with error specifics
40
43
  if error_key = error_key_present?(event)
41
44
  # taking the last error as there can potentially be many
42
45
  attributes = event.reply[error_key][-1]
43
- segment.notice_error Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]])
46
+ segment.notice_error(Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]]))
44
47
 
45
48
  # failing commands return a CommandFailed event with an error message
46
49
  # 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)
50
+ elsif event.is_a?(Mongo::Monitoring::Event::CommandFailed)
51
+ segment.notice_error(Mongo::Error.new(event.message))
49
52
  end
50
53
  segment.finish
51
54
  rescue Exception => e
@@ -58,9 +61,9 @@ module NewRelic
58
61
 
59
62
  private
60
63
 
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
64
+ def start_segment(event)
65
+ host = host_from_address(event.address)
66
+ port_path_or_id = port_path_or_id_from_address(event.address)
64
67
  segment = NewRelic::Agent::Tracer.start_datastore_segment(
65
68
  product: MONGODB,
66
69
  operation: operation(event.command_name),
@@ -76,7 +79,7 @@ module NewRelic
76
79
  def operation(command_name)
77
80
  # from 2.0 to 2.5, :findandmodify was the command_name
78
81
  if command_name == :findandmodify
79
- :findAndModify
82
+ :findAndModify
80
83
  else
81
84
  command_name
82
85
  end
@@ -107,31 +110,31 @@ module NewRelic
107
110
  LOCALHOST = "localhost".freeze
108
111
 
109
112
  def host_from_address(address)
110
- if unix_domain_socket? address.host
113
+ if unix_domain_socket?(address.host)
111
114
  LOCALHOST
112
115
  else
113
116
  address.host
114
117
  end
115
118
  rescue => e
116
- NewRelic::Agent.logger.debug "Failed to retrieve Mongo host: #{e}"
119
+ NewRelic::Agent.logger.debug("Failed to retrieve Mongo host: #{e}")
117
120
  UNKNOWN
118
121
  end
119
122
 
120
123
  def port_path_or_id_from_address(address)
121
- if unix_domain_socket? address.host
124
+ if unix_domain_socket?(address.host)
122
125
  address.host
123
126
  else
124
127
  address.port
125
128
  end
126
129
  rescue => e
127
- NewRelic::Agent.logger.debug "Failed to retrieve Mongo port_path_or_id: #{e}"
130
+ NewRelic::Agent.logger.debug("Failed to retrieve Mongo port_path_or_id: #{e}")
128
131
  UNKNOWN
129
132
  end
130
133
 
131
134
  SLASH = "/".freeze
132
135
 
133
136
  def unix_domain_socket?(host)
134
- host.start_with? SLASH
137
+ host.start_with?(SLASH)
135
138
  end
136
139
  end
137
140
  end
@@ -0,0 +1,24 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'instrumentation'
6
+
7
+ module NewRelic::Agent::Instrumentation
8
+ module NetHTTP
9
+ module Chain
10
+ def self.instrument!
11
+ Net::HTTP.class_eval do
12
+ include NewRelic::Agent::Instrumentation::NetHTTP
13
+
14
+ def request_with_newrelic_trace(request, *args, &block)
15
+ request_with_tracing(request) { request_without_newrelic_trace(request, *args, &block) }
16
+ end
17
+
18
+ alias request_without_newrelic_trace request
19
+ alias request request_with_newrelic_trace
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
@@ -1,12 +1,12 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
- module NewRelic
6
- module Agent
5
+ module NewRelic
6
+ module Agent
7
7
  module Instrumentation
8
- module NetPrepend
9
- def request(request, *args, &block)
8
+ module NetHTTP
9
+ def request_with_tracing(request)
10
10
  wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
11
11
 
12
12
  segment = NewRelic::Agent::Tracer.start_external_request_segment(
@@ -14,21 +14,21 @@ module NewRelic
14
14
  uri: wrapped_request.uri,
15
15
  procedure: wrapped_request.method
16
16
  )
17
-
17
+
18
18
  begin
19
19
  response = nil
20
- segment.add_request_headers wrapped_request
21
-
20
+ segment.add_request_headers(wrapped_request)
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
26
- super
25
+ response = NewRelic::Agent::Tracer.capture_segment_error(segment) do
26
+ yield
27
27
  end
28
28
  end
29
-
30
- wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
31
- segment.process_response_headers wrapped_response
29
+
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
@@ -0,0 +1,21 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'instrumentation'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ module NetHTTP
11
+ module Prepend
12
+ include NewRelic::Agent::Instrumentation::NetHTTP
13
+
14
+ def request(request, *args, &block)
15
+ request_with_tracing(request) { super }
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
21
+ end