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
@@ -0,0 +1,91 @@
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 Curb
9
+ module Chain
10
+ def self.instrument!
11
+ Curl::Easy.class_eval do
12
+ include NewRelic::Agent::Instrumentation::Curb::Easy
13
+
14
+ def http_head_with_newrelic(*args, &blk)
15
+ http_head_with_tracing { http_head_without_newrelic(*args, &blk) }
16
+ end
17
+
18
+ alias_method(:http_head_without_newrelic, :http_head)
19
+ alias_method(:http_head, :http_head_with_newrelic)
20
+
21
+ def http_post_with_newrelic(*args, &blk)
22
+ http_post_with_tracing { http_post_without_newrelic(*args, &blk) }
23
+ end
24
+
25
+ alias_method(:http_post_without_newrelic, :http_post)
26
+ alias_method(:http_post, :http_post_with_newrelic)
27
+
28
+ def http_put_with_newrelic(*args, &blk)
29
+ http_put_with_tracing { http_put_without_newrelic(*args, &blk) }
30
+ end
31
+
32
+ alias_method(:http_put_without_newrelic, :http_put)
33
+ alias_method(:http_put, :http_put_with_newrelic)
34
+
35
+ # Hook the #http method to set the verb.
36
+ def http_with_newrelic(verb)
37
+ http_with_tracing(verb) { http_without_newrelic(verb) }
38
+ end
39
+
40
+ alias_method(:http_without_newrelic, :http)
41
+ alias_method(:http, :http_with_newrelic)
42
+
43
+ # Hook the #perform method to mark the request as non-parallel.
44
+ def perform_with_newrelic
45
+ perform_with_tracing { perform_without_newrelic }
46
+ end
47
+
48
+ alias_method(:perform_without_newrelic, :perform)
49
+ alias_method(:perform, :perform_with_newrelic)
50
+
51
+ # Record the HTTP verb for future #perform calls
52
+ def method_with_newrelic(verb)
53
+ method_with_tracing(verb) { method_without_newrelic(verb) }
54
+ end
55
+
56
+ alias_method(:method_without_newrelic, :method)
57
+ alias_method(:method, :method_with_newrelic)
58
+
59
+ # We override this method in order to ensure access to header_str even
60
+ # though we use an on_header callback
61
+ def header_str_with_newrelic
62
+ header_str_with_tracing { header_str_without_newrelic }
63
+ end
64
+
65
+ alias_method(:header_str_without_newrelic, :header_str)
66
+ alias_method(:header_str, :header_str_with_newrelic)
67
+ end
68
+
69
+ Curl::Multi.class_eval do
70
+ include NewRelic::Agent::Instrumentation::Curb::Multi
71
+
72
+ # Add CAT with callbacks if the request is serial
73
+ def add_with_newrelic(curl)
74
+ add_with_tracing(curl) { add_without_newrelic(curl) }
75
+ end
76
+
77
+ alias_method(:add_without_newrelic, :add)
78
+ alias_method(:add, :add_with_newrelic)
79
+
80
+ # Trace as an External/Multiple call if the first request isn't serial.
81
+ def perform_with_newrelic(&blk)
82
+ perform_with_tracing { perform_without_newrelic(&blk) }
83
+ end
84
+
85
+ alias_method(:perform_without_newrelic, :perform)
86
+ alias_method(:perform, :perform_with_newrelic)
87
+ end
88
+ end
89
+ end
90
+ end
91
+ end
@@ -0,0 +1,221 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic
6
+ module Agent
7
+ module Instrumentation
8
+ module Curb
9
+ module Easy
10
+ attr_accessor :_nr_instrumented,
11
+ :_nr_http_verb,
12
+ :_nr_header_str,
13
+ :_nr_original_on_header,
14
+ :_nr_original_on_complete,
15
+ :_nr_original_on_failure,
16
+ :_nr_serial
17
+
18
+ # We have to hook these three methods separately, as they don't use
19
+ # Curl::Easy#http
20
+ def http_head_with_tracing
21
+ self._nr_http_verb = :HEAD
22
+ yield
23
+ end
24
+
25
+ def http_post_with_tracing
26
+ self._nr_http_verb = :POST
27
+ yield
28
+ end
29
+
30
+ def http_put_with_tracing
31
+ self._nr_http_verb = :PUT
32
+ yield
33
+ end
34
+
35
+ # Hook the #http method to set the verb.
36
+ def http_with_tracing(verb)
37
+ self._nr_http_verb = verb.to_s.upcase
38
+ yield
39
+ end
40
+
41
+ # Hook the #perform method to mark the request as non-parallel.
42
+ def perform_with_tracing
43
+ self._nr_http_verb ||= :GET
44
+ self._nr_serial = true
45
+ yield
46
+ end
47
+
48
+ # Record the HTTP verb for future #perform calls
49
+ def method_with_tracing(verb)
50
+ self._nr_http_verb = verb.upcase
51
+ yield
52
+ end
53
+
54
+ # We override this method in order to ensure access to header_str even
55
+ # though we use an on_header callback
56
+ def header_str_with_tracing
57
+ if self._nr_serial
58
+ self._nr_header_str
59
+ else
60
+ # Since we didn't install a header callback for a non-serial request,
61
+ # just fall back to the original implementation.
62
+ yield
63
+ end
64
+ end
65
+ end
66
+ ####################################################
67
+
68
+ module Multi
69
+ include NewRelic::Agent::MethodTracer
70
+
71
+ # Add CAT with callbacks if the request is serial
72
+ def add_with_tracing(curl)
73
+ if curl.respond_to?(:_nr_serial) && curl._nr_serial
74
+ hook_pending_request(curl) if NewRelic::Agent::Tracer.tracing_enabled?
75
+ end
76
+
77
+ return yield
78
+ end
79
+
80
+ # Trace as an External/Multiple call if the first request isn't serial.
81
+ def perform_with_tracing
82
+ return yield if first_request_is_serial?
83
+
84
+ trace_execution_scoped("External/Multiple/Curb::Multi/perform") do
85
+ yield
86
+ end
87
+ end
88
+
89
+ # Instrument the specified +request+ (a Curl::Easy object)
90
+ # and set up cross-application tracing if it's enabled.
91
+ def hook_pending_request(request)
92
+ wrapped_request, wrapped_response = wrap_request(request)
93
+
94
+ segment = NewRelic::Agent::Tracer.start_external_request_segment(
95
+ library: wrapped_request.type,
96
+ uri: wrapped_request.uri,
97
+ procedure: wrapped_request.method
98
+ )
99
+
100
+ segment.add_request_headers(wrapped_request)
101
+
102
+ # install all callbacks
103
+ unless request._nr_instrumented
104
+ install_header_callback(request, wrapped_response)
105
+ install_completion_callback(request, wrapped_response, segment)
106
+ install_failure_callback(request, wrapped_response, segment)
107
+ request._nr_instrumented = true
108
+ end
109
+ rescue => err
110
+ NewRelic::Agent.logger.error("Untrapped exception", err)
111
+ end
112
+
113
+ # Create request and response adapter objects for the specified +request+
114
+ # NOTE: Although strange to wrap request and response at once, it works
115
+ # because curb's callback mechanism updates the instantiated wrappers
116
+ # during the life-cycle of external request
117
+ def wrap_request(request)
118
+ return NewRelic::Agent::HTTPClients::CurbRequest.new(request),
119
+ NewRelic::Agent::HTTPClients::CurbResponse.new(request)
120
+ end
121
+
122
+ # Install a callback that will record the response headers
123
+ # to enable CAT linking
124
+ def install_header_callback(request, wrapped_response)
125
+ original_callback = request.on_header
126
+ request._nr_original_on_header = original_callback
127
+ request._nr_header_str = nil
128
+ request.on_header do |header_data|
129
+ if original_callback
130
+ original_callback.call(header_data)
131
+ else
132
+ wrapped_response.append_header_data(header_data)
133
+ header_data.length
134
+ end
135
+ end
136
+ end
137
+
138
+ # Install a callback that will finish the trace.
139
+ def install_completion_callback(request, wrapped_response, segment)
140
+ original_callback = request.on_complete
141
+ request._nr_original_on_complete = original_callback
142
+ request.on_complete do |finished_request|
143
+ begin
144
+ segment.process_response_headers(wrapped_response) if segment
145
+ ensure
146
+ segment.finish if segment
147
+ # Make sure the existing completion callback is run, and restore the
148
+ # on_complete callback to how it was before.
149
+ original_callback.call(finished_request) if original_callback
150
+ remove_instrumentation_callbacks(request)
151
+ end
152
+ end
153
+ end
154
+
155
+ # Install a callback that will fire on failures
156
+ # NOTE: on_failure is not always called, so we're not always
157
+ # unhooking the callback. No harm/no foul in production, but
158
+ # definitely something to beware of if debugging callback issues
159
+ # @__newrelic_original_callback exists to prevent infinitely chaining
160
+ # our on_failure callback hook.
161
+ def install_failure_callback(request, _wrapped_response, segment)
162
+ original_callback = request.on_failure
163
+
164
+ nr_original_callback = original_callback.instance_variable_get(:@__newrelic_original_callback)
165
+ original_callback = nr_original_callback || original_callback
166
+
167
+ request._nr_original_on_failure = original_callback
168
+
169
+ newrelic_callback = proc do |failed_request, error|
170
+ begin
171
+ if segment
172
+ noticeable_error = NewRelic::Agent::NoticeableError.new(error[0].name, error[-1])
173
+ segment.notice_error(noticeable_error)
174
+ end
175
+ ensure
176
+ original_callback.call(failed_request, error) if original_callback
177
+ remove_failure_callback(failed_request)
178
+ end
179
+ end
180
+ newrelic_callback.instance_variable_set(:@__newrelic_original_callback, original_callback)
181
+
182
+ request.on_failure(&newrelic_callback)
183
+ end
184
+
185
+ # on_failure callbacks cannot be removed in the on_complete
186
+ # callback where this method is invoked because on_complete
187
+ # fires before the on_failure!
188
+ def remove_instrumentation_callbacks(request)
189
+ request.on_complete(&request._nr_original_on_complete)
190
+ request.on_header(&request._nr_original_on_header)
191
+ request._nr_instrumented = false
192
+ end
193
+
194
+ # We execute customer's on_failure callback (if any) and
195
+ # uninstall our hook here since the on_complete callback
196
+ # fires before the on_failure callback.
197
+ def remove_failure_callback(request)
198
+ request.on_failure(&request._nr_original_on_failure)
199
+ end
200
+
201
+ private
202
+
203
+ def first_request_is_serial?
204
+ return false unless (first = self.requests.first)
205
+
206
+ # Before curb 0.9.8, requests was an array of Curl::Easy
207
+ # instances. Starting with 0.9.8, it's a Hash where the
208
+ # values are Curl::Easy instances.
209
+ #
210
+ # So, requests.first will either be an_obj or [a_key, an_obj].
211
+ # We need to handle either case.
212
+ #
213
+ first = first[-1] if first.is_a?(Array)
214
+
215
+ first.respond_to?(:_nr_serial) && first._nr_serial
216
+ end
217
+ end
218
+ end
219
+ end
220
+ end
221
+ end
@@ -0,0 +1,61 @@
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 Curb
11
+ module Easy
12
+ module Prepend
13
+ include NewRelic::Agent::Instrumentation::Curb::Easy
14
+
15
+ def http_head(*args, &blk)
16
+ http_head_with_tracing { super }
17
+ end
18
+
19
+ def http_post(*args, &blk)
20
+ http_post_with_tracing { super }
21
+ end
22
+
23
+ def http_put(*args, &blk)
24
+ http_put_with_tracing { super }
25
+ end
26
+
27
+ def http(verb)
28
+ http_with_tracing(verb) { super }
29
+ end
30
+
31
+ def perform
32
+ perform_with_tracing { super }
33
+ end
34
+
35
+ def method(verb)
36
+ method_with_tracing(verb) { super }
37
+ end
38
+
39
+ def header_str
40
+ header_str_with_tracing { super }
41
+ end
42
+ end
43
+ end
44
+
45
+ module Multi
46
+ module Prepend
47
+ include NewRelic::Agent::Instrumentation::Curb::Multi
48
+
49
+ def add(curl)
50
+ add_with_tracing(curl) { super }
51
+ end
52
+
53
+ def perform(&blk)
54
+ perform_with_tracing { super }
55
+ end
56
+ end
57
+ end
58
+ end
59
+ end
60
+ end
61
+ end
@@ -1,6 +1,9 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'curb/chain'
6
+ require_relative 'curb/prepend'
4
7
 
5
8
  DependencyDetection.defer do
6
9
  named :curb
@@ -13,252 +16,17 @@ DependencyDetection.defer do
13
16
  end
14
17
 
15
18
  executes do
16
- ::NewRelic::Agent.logger.info 'Installing Curb instrumentation'
19
+ ::NewRelic::Agent.logger.info('Installing Curb instrumentation')
17
20
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
18
21
  require 'new_relic/agent/http_clients/curb_wrappers'
19
22
  end
20
23
 
21
24
  executes do
22
- class Curl::Easy
23
-
24
- attr_accessor :_nr_instrumented,
25
- :_nr_failure_instrumented,
26
- :_nr_http_verb,
27
- :_nr_header_str,
28
- :_nr_original_on_header,
29
- :_nr_original_on_complete,
30
- :_nr_original_on_failure,
31
- :_nr_serial
32
-
33
- # We have to hook these three methods separately, as they don't use
34
- # Curl::Easy#http
35
- def http_head_with_newrelic(*args, &blk)
36
- self._nr_http_verb = :HEAD
37
- http_head_without_newrelic(*args, &blk)
38
- end
39
-
40
-
41
- alias_method :http_head_without_newrelic, :http_head
42
- alias_method :http_head, :http_head_with_newrelic
43
-
44
- def http_post_with_newrelic(*args, &blk)
45
- self._nr_http_verb = :POST
46
- http_post_without_newrelic(*args, &blk)
47
- end
48
-
49
-
50
- alias_method :http_post_without_newrelic, :http_post
51
- alias_method :http_post, :http_post_with_newrelic
52
-
53
- def http_put_with_newrelic(*args, &blk)
54
- self._nr_http_verb = :PUT
55
- http_put_without_newrelic(*args, &blk)
56
- end
57
-
58
-
59
- alias_method :http_put_without_newrelic, :http_put
60
- alias_method :http_put, :http_put_with_newrelic
61
-
62
-
63
- # Hook the #http method to set the verb.
64
- def http_with_newrelic verb
65
- self._nr_http_verb = verb.to_s.upcase
66
- http_without_newrelic( verb )
67
- end
68
-
69
- alias_method :http_without_newrelic, :http
70
- alias_method :http, :http_with_newrelic
71
-
72
- # Hook the #perform method to mark the request as non-parallel.
73
- def perform_with_newrelic
74
- self._nr_http_verb ||= :GET
75
- self._nr_serial = true
76
- perform_without_newrelic
77
- end
78
-
79
- alias_method :perform_without_newrelic, :perform
80
- alias_method :perform, :perform_with_newrelic
81
-
82
- # Record the HTTP verb for future #perform calls
83
- def method_with_newrelic verb
84
- self._nr_http_verb = verb.upcase
85
- method_without_newrelic(verb)
86
- end
87
-
88
- alias_method :method_without_newrelic, :method
89
- alias_method :method, :method_with_newrelic
90
-
91
- # We override this method in order to ensure access to header_str even
92
- # though we use an on_header callback
93
- def header_str_with_newrelic
94
- if self._nr_serial
95
- self._nr_header_str
96
- else
97
- # Since we didn't install a header callback for a non-serial request,
98
- # just fall back to the original implementation.
99
- header_str_without_newrelic
100
- end
101
- end
102
-
103
- alias_method :header_str_without_newrelic, :header_str
104
- alias_method :header_str, :header_str_with_newrelic
105
- end # class Curl::Easy
106
-
107
-
108
- class Curl::Multi
109
- include NewRelic::Agent::MethodTracer
110
-
111
- # Add CAT with callbacks if the request is serial
112
- def add_with_newrelic(curl)
113
- if curl.respond_to?(:_nr_serial) && curl._nr_serial
114
- hook_pending_request(curl) if NewRelic::Agent::Tracer.tracing_enabled?
115
- end
116
-
117
- return add_without_newrelic curl
118
- end
119
-
120
- alias_method :add_without_newrelic, :add
121
- alias_method :add, :add_with_newrelic
122
-
123
- # Trace as an External/Multiple call if the first request isn't serial.
124
- def perform_with_newrelic(&blk)
125
- return perform_without_newrelic if first_request_is_serial?
126
-
127
- trace_execution_scoped("External/Multiple/Curb::Multi/perform") do
128
- perform_without_newrelic(&blk)
129
- end
130
- end
131
-
132
- alias_method :perform_without_newrelic, :perform
133
- alias_method :perform, :perform_with_newrelic
134
-
135
-
136
- # Instrument the specified +request+ (a Curl::Easy object)
137
- # and set up cross-application tracing if it's enabled.
138
- def hook_pending_request(request)
139
- wrapped_request, wrapped_response = wrap_request(request)
140
-
141
- segment = NewRelic::Agent::Tracer.start_external_request_segment(
142
- library: wrapped_request.type,
143
- uri: wrapped_request.uri,
144
- procedure: wrapped_request.method
145
- )
146
-
147
- segment.add_request_headers wrapped_request
148
-
149
- # install all callbacks
150
- unless request._nr_instrumented
151
- install_header_callback(request, wrapped_response)
152
- install_completion_callback(request, wrapped_response, segment)
153
- install_failure_callback(request, wrapped_response, segment)
154
- request._nr_instrumented = true
155
- end
156
- rescue => err
157
- NewRelic::Agent.logger.error("Untrapped exception", err)
158
- end
159
-
160
-
161
- # Create request and response adapter objects for the specified +request+
162
- # NOTE: Although strange to wrap request and response at once, it works
163
- # because curb's callback mechanism updates the instantiated wrappers
164
- # during the life-cycle of external request
165
- def wrap_request(request)
166
- return NewRelic::Agent::HTTPClients::CurbRequest.new(request),
167
- NewRelic::Agent::HTTPClients::CurbResponse.new(request)
168
- end
169
-
170
- # Install a callback that will record the response headers
171
- # to enable CAT linking
172
- def install_header_callback(request, wrapped_response)
173
- original_callback = request.on_header
174
- request._nr_original_on_header = original_callback
175
- request._nr_header_str = nil
176
- request.on_header do |header_data|
177
- if original_callback
178
- original_callback.call header_data
179
- else
180
- wrapped_response.append_header_data header_data
181
- header_data.length
182
- end
183
- end
184
- end
185
-
186
- # Install a callback that will finish the trace.
187
- def install_completion_callback(request, wrapped_response, segment)
188
- original_callback = request.on_complete
189
- request._nr_original_on_complete = original_callback
190
- request.on_complete do |finished_request|
191
- begin
192
- segment.process_response_headers wrapped_response
193
- ensure
194
- segment.finish if segment
195
- # Make sure the existing completion callback is run, and restore the
196
- # on_complete callback to how it was before.
197
- original_callback.call(finished_request) if original_callback
198
- remove_instrumentation_callbacks(request)
199
- end
200
- end
201
- end
202
-
203
- # Install a callback that will fire on failures
204
- # NOTE: on_failure is not always called, so we're not always
205
- # unhooking the callback. No harm/no foul in production, but
206
- # definitely something to beware of if debugging callback issues
207
- # _nr_failure_instrumented exists to prevent infinitely chaining
208
- # our on_failure callback hook.
209
- def install_failure_callback(request, wrapped_response, segment)
210
- return if request._nr_failure_instrumented
211
- original_callback = request.on_failure
212
- request._nr_original_on_failure = original_callback
213
- request.on_failure do |failed_request, error|
214
- begin
215
- if segment
216
- noticible_error = NewRelic::Agent::NoticibleError.new error[0].name, error[-1]
217
- segment.notice_error noticible_error
218
- end
219
- ensure
220
- original_callback.call(failed_request, error) if original_callback
221
- remove_failure_callback(failed_request)
222
- end
223
- request._nr_failure_instrumented = true
224
- end
225
- end
226
-
227
- # on_failure callbacks cannot be removed in the on_complete
228
- # callback where this method is invoked because on_complete
229
- # fires before the on_failure!
230
- def remove_instrumentation_callbacks(request)
231
- request.on_complete(&request._nr_original_on_complete)
232
- request.on_header(&request._nr_original_on_header)
233
- request._nr_instrumented = false
234
- end
235
-
236
- # We execute customer's on_failure callback (if any) and
237
- # uninstall our hook here since the on_complete callback
238
- # fires before the on_failure callback.
239
- def remove_failure_callback(request)
240
- request.on_failure(&request._nr_original_on_failure)
241
- request._nr_failure_instrumented = false
242
- end
243
-
244
- private
245
-
246
- def first_request_is_serial?
247
- return false unless (first = self.requests.first)
248
-
249
- # Before curb 0.9.8, requests was an array of Curl::Easy
250
- # instances. Starting with 0.9.8, it's a Hash where the
251
- # values are Curl::Easy instances.
252
- #
253
- # So, requests.first will either be an_obj or [a_key, an_obj].
254
- # We need to handle either case.
255
- #
256
- first = first[-1] if first.is_a?(Array)
257
-
258
- first.respond_to?(:_nr_serial) && first._nr_serial
259
- end
260
-
261
- end # class Curl::Multi
262
-
25
+ if use_prepend?
26
+ prepend_instrument ::Curl::Easy, NewRelic::Agent::Instrumentation::Curb::Easy::Prepend
27
+ prepend_instrument ::Curl::Multi, NewRelic::Agent::Instrumentation::Curb::Multi::Prepend
28
+ else
29
+ chain_instrument ::NewRelic::Agent::Instrumentation::Curb::Chain
30
+ end
263
31
  end
264
32
  end