newrelic_rpm 6.3.0.355 → 9.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (468) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +15 -1
  3. data/.rubocop.yml +1845 -0
  4. data/.rubocop_todo.yml +61 -0
  5. data/.simplecov +16 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +1 -0
  8. data/Brewfile +13 -0
  9. data/CHANGELOG.md +4102 -2416
  10. data/CONTRIBUTING.md +132 -19
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +5 -2
  14. data/Guardfile +25 -6
  15. data/LICENSE +202 -38
  16. data/README.md +86 -87
  17. data/Rakefile +32 -32
  18. data/THIRD_PARTY_NOTICES.md +28 -0
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +4 -2
  21. data/bin/newrelic_cmd +2 -0
  22. data/bin/nrdebug +86 -63
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +5 -7
  26. data/install.rb +3 -3
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
  29. data/lib/new_relic/agent/agent.rb +115 -882
  30. data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
  31. data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
  32. data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
  33. data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
  34. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
  35. data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
  36. data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
  37. data/lib/new_relic/agent/agent_logger.rb +30 -22
  38. data/lib/new_relic/agent/attribute_filter.rb +70 -53
  39. data/lib/new_relic/agent/attribute_processing.rb +10 -10
  40. data/lib/new_relic/agent/attributes.rb +153 -0
  41. data/lib/new_relic/agent/audit_logger.rb +22 -7
  42. data/lib/new_relic/agent/autostart.rb +34 -28
  43. data/lib/new_relic/agent/chained_call.rb +2 -2
  44. data/lib/new_relic/agent/commands/agent_command.rb +5 -5
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +18 -35
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
  47. data/lib/new_relic/agent/configuration/default_source.rb +1456 -1100
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
  49. data/lib/new_relic/agent/configuration/environment_source.rb +17 -13
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +68 -0
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +12 -12
  52. data/lib/new_relic/agent/configuration/manager.rb +97 -80
  53. data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
  54. data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
  55. data/lib/new_relic/agent/configuration/security_policy_source.rb +93 -96
  56. data/lib/new_relic/agent/configuration/server_source.rb +66 -40
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +44 -15
  58. data/lib/new_relic/agent/configuration.rb +2 -2
  59. data/lib/new_relic/agent/connect/request_builder.rb +25 -27
  60. data/lib/new_relic/agent/connect/response_handler.rb +7 -10
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +16 -16
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +6 -7
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +18 -17
  64. data/lib/new_relic/agent/database/obfuscator.rb +5 -5
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
  66. data/lib/new_relic/agent/database.rb +47 -56
  67. data/lib/new_relic/agent/database_adapter.rb +35 -0
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +22 -23
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +9 -8
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +18 -22
  71. data/lib/new_relic/agent/datastores/mongo.rb +7 -12
  72. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  73. data/lib/new_relic/agent/datastores/redis.rb +10 -16
  74. data/lib/new_relic/agent/datastores.rb +14 -16
  75. data/lib/new_relic/agent/deprecator.rb +2 -2
  76. data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
  77. data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +90 -70
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
  84. data/lib/new_relic/agent/distributed_tracing.rb +113 -32
  85. data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
  86. data/lib/new_relic/agent/error_collector.rb +129 -65
  87. data/lib/new_relic/agent/error_event_aggregator.rb +10 -8
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +11 -8
  90. data/lib/new_relic/agent/event_aggregator.rb +43 -48
  91. data/lib/new_relic/agent/event_buffer.rb +8 -9
  92. data/lib/new_relic/agent/event_listener.rb +2 -3
  93. data/lib/new_relic/agent/event_loop.rb +28 -26
  94. data/lib/new_relic/agent/external.rb +19 -52
  95. data/lib/new_relic/agent/guid_generator.rb +30 -0
  96. data/lib/new_relic/agent/harvester.rb +6 -9
  97. data/lib/new_relic/agent/heap.rb +9 -10
  98. data/lib/new_relic/agent/hostname.rb +22 -9
  99. data/lib/new_relic/agent/http_clients/abstract.rb +69 -0
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +30 -26
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +37 -21
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +22 -23
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +18 -17
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +28 -8
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +17 -17
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +13 -14
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +22 -55
  108. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
  109. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +60 -72
  110. data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
  111. data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
  112. data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
  113. data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
  114. data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
  115. data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
  116. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +86 -62
  117. data/lib/new_relic/agent/instrumentation/active_job.rb +34 -14
  118. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +97 -47
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +97 -73
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +70 -76
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +65 -66
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +11 -32
  127. data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
  128. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  129. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  130. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  131. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  132. data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
  133. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +14 -138
  137. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  138. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  139. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  140. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  141. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +75 -63
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  145. data/lib/new_relic/agent/instrumentation/curb.rb +16 -201
  146. data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
  147. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
  148. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
  149. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  150. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  151. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +31 -52
  152. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  153. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +67 -0
  154. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  155. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  156. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +10 -8
  157. data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
  158. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
  159. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
  160. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
  161. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  162. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  163. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  164. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  165. data/lib/new_relic/agent/instrumentation/grape.rb +17 -124
  166. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  167. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
  168. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  169. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  170. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  171. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  172. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  173. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  174. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  175. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  176. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  177. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  178. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  179. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  180. data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
  181. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  182. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  183. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  184. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  185. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +6 -7
  186. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  189. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +60 -125
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
  195. data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
  196. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +16 -15
  197. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +11 -11
  198. data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
  199. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +53 -17
  200. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  201. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
  202. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  203. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +142 -0
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  212. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  213. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  214. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  215. data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +22 -57
  217. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
  218. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +10 -10
  219. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -6
  220. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
  221. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  222. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  223. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
  224. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  225. data/lib/new_relic/agent/instrumentation/rake.rb +18 -158
  226. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  227. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  228. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +94 -0
  229. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  230. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  231. data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  236. data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
  237. data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
  238. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +13 -13
  239. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  240. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  241. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  242. data/lib/new_relic/agent/instrumentation/sidekiq.rb +30 -46
  243. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  244. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
  245. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +126 -0
  246. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  247. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -4
  248. data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
  249. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  250. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  251. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  252. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  253. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +42 -0
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  257. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  258. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  259. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  260. data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
  261. data/lib/new_relic/agent/instrumentation.rb +2 -2
  262. data/lib/new_relic/agent/internal_agent_error.rb +3 -3
  263. data/lib/new_relic/agent/javascript_instrumentor.rb +60 -49
  264. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  265. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  266. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  267. data/lib/new_relic/agent/log_once.rb +2 -2
  268. data/lib/new_relic/agent/log_priority.rb +20 -0
  269. data/lib/new_relic/agent/logging.rb +182 -0
  270. data/lib/new_relic/agent/memory_logger.rb +3 -3
  271. data/lib/new_relic/agent/messaging.rb +74 -156
  272. data/lib/new_relic/agent/method_tracer.rb +157 -150
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
  275. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
  276. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +5 -6
  277. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
  278. data/lib/new_relic/agent/monitors.rb +26 -0
  279. data/lib/new_relic/agent/new_relic_service/encoders.rb +8 -8
  280. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +7 -7
  281. data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
  282. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
  283. data/lib/new_relic/agent/new_relic_service.rb +273 -202
  284. data/lib/new_relic/agent/noticeable_error.rb +19 -0
  285. data/lib/new_relic/agent/null_logger.rb +8 -4
  286. data/lib/new_relic/agent/obfuscator.rb +9 -11
  287. data/lib/new_relic/agent/parameter_filtering.rb +30 -16
  288. data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
  289. data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
  290. data/lib/new_relic/agent/pipe_service.rb +14 -9
  291. data/lib/new_relic/agent/prepend_supportability.rb +3 -3
  292. data/lib/new_relic/agent/priority_sampled_buffer.rb +17 -15
  293. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
  294. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
  295. data/lib/new_relic/agent/rules_engine.rb +6 -5
  296. data/lib/new_relic/agent/sampler.rb +6 -6
  297. data/lib/new_relic/agent/sampler_collection.rb +5 -6
  298. data/lib/new_relic/agent/samplers/cpu_sampler.rb +9 -8
  299. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +21 -18
  300. data/lib/new_relic/agent/samplers/memory_sampler.rb +33 -22
  301. data/lib/new_relic/agent/samplers/object_sampler.rb +3 -3
  302. data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
  303. data/lib/new_relic/agent/span_event_aggregator.rb +17 -19
  304. data/lib/new_relic/agent/span_event_primitive.rb +118 -58
  305. data/lib/new_relic/agent/sql_sampler.rb +23 -23
  306. data/lib/new_relic/agent/stats.rb +80 -43
  307. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
  308. data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
  309. data/lib/new_relic/agent/stats_engine.rb +9 -9
  310. data/lib/new_relic/agent/synthetics_event_aggregator.rb +9 -10
  311. data/lib/new_relic/agent/system_info.rb +97 -68
  312. data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
  313. data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
  314. data/lib/new_relic/agent/threading/backtrace_service.rb +21 -25
  315. data/lib/new_relic/agent/threading/thread_profile.rb +32 -46
  316. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
  317. data/lib/new_relic/agent/tracer.rb +159 -107
  318. data/lib/new_relic/agent/transaction/abstract_segment.rb +147 -51
  319. data/lib/new_relic/agent/transaction/datastore_segment.rb +23 -19
  320. data/lib/new_relic/agent/transaction/distributed_tracer.rb +185 -0
  321. data/lib/new_relic/agent/transaction/distributed_tracing.rb +73 -164
  322. data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -64
  323. data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
  324. data/lib/new_relic/agent/transaction/request_attributes.rb +40 -40
  325. data/lib/new_relic/agent/transaction/segment.rb +46 -10
  326. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
  327. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +3 -3
  328. data/lib/new_relic/agent/transaction/trace.rb +22 -25
  329. data/lib/new_relic/agent/transaction/trace_builder.rb +11 -12
  330. data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
  331. data/lib/new_relic/agent/transaction/trace_node.rb +36 -32
  332. data/lib/new_relic/agent/transaction/tracing.rb +16 -13
  333. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
  334. data/lib/new_relic/agent/transaction.rb +248 -205
  335. data/lib/new_relic/agent/transaction_error_primitive.rb +34 -37
  336. data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
  337. data/lib/new_relic/agent/transaction_event_primitive.rb +44 -56
  338. data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
  339. data/lib/new_relic/agent/transaction_metrics.rb +11 -10
  340. data/lib/new_relic/agent/transaction_sampler.rb +9 -14
  341. data/lib/new_relic/agent/transaction_time_aggregator.rb +33 -28
  342. data/lib/new_relic/agent/utilization/aws.rb +35 -5
  343. data/lib/new_relic/agent/utilization/azure.rb +7 -7
  344. data/lib/new_relic/agent/utilization/gcp.rb +11 -11
  345. data/lib/new_relic/agent/utilization/pcf.rb +7 -6
  346. data/lib/new_relic/agent/utilization/vendor.rb +45 -30
  347. data/lib/new_relic/agent/utilization_data.rb +8 -6
  348. data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
  349. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +4 -4
  350. data/lib/new_relic/agent/vm/mri_vm.rb +54 -26
  351. data/lib/new_relic/agent/vm/snapshot.rb +6 -6
  352. data/lib/new_relic/agent/vm.rb +2 -2
  353. data/lib/new_relic/agent/worker_loop.rb +11 -13
  354. data/lib/new_relic/agent.rb +219 -89
  355. data/lib/new_relic/cli/command.rb +22 -24
  356. data/lib/new_relic/cli/commands/deployments.rb +102 -52
  357. data/lib/new_relic/cli/commands/install.rb +33 -35
  358. data/lib/new_relic/coerce.rb +42 -15
  359. data/lib/new_relic/collection_helper.rb +51 -49
  360. data/lib/new_relic/constants.rb +38 -0
  361. data/lib/new_relic/control/class_methods.rb +6 -6
  362. data/lib/new_relic/control/frameworks/external.rb +3 -3
  363. data/lib/new_relic/control/frameworks/rails.rb +50 -32
  364. data/lib/new_relic/control/frameworks/rails3.rb +4 -5
  365. data/lib/new_relic/control/frameworks/rails4.rb +2 -2
  366. data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
  367. data/lib/new_relic/control/frameworks/ruby.rb +4 -4
  368. data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
  369. data/lib/new_relic/control/frameworks.rb +2 -2
  370. data/lib/new_relic/control/instance_methods.rb +33 -42
  371. data/lib/new_relic/control/instrumentation.rb +40 -12
  372. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  373. data/lib/new_relic/control/server_methods.rb +4 -5
  374. data/lib/new_relic/control.rb +2 -3
  375. data/lib/new_relic/delayed_job_injection.rb +2 -2
  376. data/lib/new_relic/dependency_detection.rb +129 -31
  377. data/lib/new_relic/environment_report.rb +42 -36
  378. data/lib/new_relic/helper.rb +50 -8
  379. data/lib/new_relic/language_support.rb +31 -7
  380. data/lib/new_relic/latest_changes.rb +11 -10
  381. data/lib/new_relic/local_environment.rb +23 -27
  382. data/lib/new_relic/metric_data.rb +32 -27
  383. data/lib/new_relic/metric_spec.rb +9 -7
  384. data/lib/new_relic/noticed_error.rb +60 -45
  385. data/lib/new_relic/rack/agent_hooks.rb +2 -2
  386. data/lib/new_relic/rack/agent_middleware.rb +6 -4
  387. data/lib/new_relic/rack/browser_monitoring.rb +136 -115
  388. data/lib/new_relic/rack.rb +2 -2
  389. data/lib/new_relic/recipes/capistrano3.rb +5 -63
  390. data/lib/new_relic/recipes/capistrano_legacy.rb +25 -28
  391. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  392. data/lib/new_relic/recipes.rb +2 -2
  393. data/lib/new_relic/supportability_helper.rb +23 -7
  394. data/lib/new_relic/traced_thread.rb +39 -0
  395. data/lib/new_relic/version.rb +7 -18
  396. data/lib/newrelic_rpm.rb +21 -34
  397. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
  398. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +10 -16
  399. data/lib/tasks/all.rb +4 -4
  400. data/lib/tasks/config.rake +24 -120
  401. data/lib/tasks/coverage_report.rake +28 -0
  402. data/lib/tasks/helpers/config.html.erb +21 -0
  403. data/lib/tasks/helpers/format.rb +123 -0
  404. data/lib/tasks/helpers/matches.rb +12 -0
  405. data/lib/tasks/helpers/prompt.rb +24 -0
  406. data/lib/tasks/helpers/removers.rb +33 -0
  407. data/lib/tasks/install.rake +8 -4
  408. data/lib/tasks/instrumentation_generator/README.md +63 -0
  409. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  410. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  411. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  412. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  414. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  415. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  417. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  418. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  420. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  421. data/lib/tasks/multiverse.rake +4 -0
  422. data/lib/tasks/multiverse.rb +23 -9
  423. data/lib/tasks/newrelic.rb +3 -2
  424. data/lib/tasks/tests.rake +17 -17
  425. data/newrelic.yml +672 -3
  426. data/newrelic_rpm.gemspec +50 -34
  427. data/recipes/newrelic.rb +3 -3
  428. data/test/agent_helper.rb +414 -98
  429. metadata +302 -93
  430. data/.travis.yml +0 -170
  431. data/bin/mongrel_rpm +0 -33
  432. data/cert/cacert.pem +0 -1177
  433. data/lib/new_relic/agent/commands/xray_session.rb +0 -55
  434. data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
  435. data/lib/new_relic/agent/configuration/event_data.rb +0 -39
  436. data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
  437. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  438. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  439. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
  440. data/lib/new_relic/agent/distributed_trace_payload.rb +0 -242
  441. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  442. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
  443. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  444. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
  445. data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -135
  446. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
  447. data/lib/new_relic/agent/instrumentation/http.rb +0 -46
  448. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  449. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  450. data/lib/new_relic/agent/instrumentation/net.rb +0 -50
  451. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  452. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  453. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  454. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  455. data/lib/new_relic/agent/range_extensions.rb +0 -47
  456. data/lib/new_relic/agent/supported_versions.rb +0 -275
  457. data/lib/new_relic/agent/transaction/attributes.rb +0 -154
  458. data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
  459. data/lib/new_relic/build.rb +0 -2
  460. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  461. data/lib/new_relic/metrics.rb +0 -13
  462. data/lib/tasks/config.html.erb +0 -32
  463. data/lib/tasks/versions.html.erb +0 -28
  464. data/lib/tasks/versions.postface.html +0 -8
  465. data/lib/tasks/versions.preface.html +0 -9
  466. data/lib/tasks/versions.rake +0 -65
  467. data/lib/tasks/versions.txt.erb +0 -14
  468. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,7 +1,9 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
4
5
  require 'socket'
6
+ require 'new_relic/helper'
5
7
 
6
8
  module NewRelic
7
9
  module Agent
@@ -17,16 +19,27 @@ module NewRelic
17
19
  end
18
20
  end
19
21
 
22
+ # Pass '-f' to the external executable 'hostname' to request the fully
23
+ # qualified domain name (fqdn). For implementations of 'hostname' that
24
+ # do not support '-f' (such as the one OpenBSD ships with), fall back
25
+ # to calling 'hostname' without the '-f'. If both ways of calling
26
+ # 'hostname' fail, or in a context where 'hostname' is not even
27
+ # available (within an AWS Lambda function, for example), call the
28
+ # 'get' method which uses Socket instead of an external executable.
20
29
  def self.get_fqdn
21
- %x[hostname -f].chomp!
22
- rescue => e
23
- NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"
24
- nil
30
+ begin
31
+ NewRelic::Helper.run_command('hostname -f')
32
+ rescue NewRelic::CommandRunFailedError
33
+ NewRelic::Helper.run_command('hostname')
34
+ end
35
+ rescue NewRelic::CommandExecutableNotFoundError, NewRelic::CommandRunFailedError => e
36
+ NewRelic::Agent.logger.debug("#{e.class} - #{e.message}")
37
+ get
25
38
  end
26
39
 
27
40
  def self.heroku_dyno_name_prefix(dyno_name)
28
41
  get_dyno_prefixes.find do |dyno_prefix|
29
- dyno_name.start_with?(dyno_prefix + ".")
42
+ dyno_name.start_with?(dyno_prefix + '.')
30
43
  end
31
44
  end
32
45
 
@@ -44,11 +57,11 @@ module NewRelic
44
57
  ::
45
58
  ].freeze
46
59
 
47
- def self.local? host_or_ip
60
+ def self.local?(host_or_ip)
48
61
  LOCALHOST.include?(host_or_ip)
49
62
  end
50
63
 
51
- def self.get_external host_or_ip
64
+ def self.get_external(host_or_ip)
52
65
  local?(host_or_ip) ? get : host_or_ip
53
66
  end
54
67
  end
@@ -0,0 +1,69 @@
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 HTTPClients
8
+ MUST_IMPLEMENT_ERROR = 'Subclasses of %s must implement a :%s method'
9
+ WHINY_NIL_ERROR = '%s cannot initialize with a nil wrapped_response object.'
10
+
11
+ # This class provides a public interface for wrapping HTTP requests. This
12
+ # may be used to create wrappers that are compatible with New Relic's
13
+ # external request API.
14
+ #
15
+ # @api public
16
+ class AbstractRequest
17
+ %i[[] []= type host_from_header host method headers uri].each do |name|
18
+ define_method(name) do
19
+ not_implemented(name)
20
+ end
21
+ end
22
+
23
+ private
24
+
25
+ def not_implemented(method_name)
26
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, method_name]
27
+ end
28
+ end
29
+
30
+ # This class implements the adaptor pattern and is used internally provide
31
+ # uniform access to the underlying HTTP Client's response object
32
+ # NOTE: response_object should be non-nil!
33
+ class AbstractResponse # :nodoc:
34
+ def initialize(wrapped_response)
35
+ if wrapped_response.nil?
36
+ raise ArgumentError, WHINY_NIL_ERROR % self.class
37
+ end
38
+
39
+ @wrapped_response = wrapped_response
40
+ end
41
+
42
+ def has_status_code?
43
+ !!status_code
44
+ end
45
+
46
+ # most HTTP client libraries report the HTTP status code as an integer, so
47
+ # we expect status_code to be set only if a non-zero value is present
48
+ def status_code
49
+ @status_code ||= get_status_code
50
+ end
51
+
52
+ private
53
+
54
+ def get_status_code_using(method_name)
55
+ return unless @wrapped_response.respond_to?(method_name)
56
+
57
+ code = @wrapped_response.send(method_name).to_i
58
+ code == 0 ? nil : code
59
+ end
60
+
61
+ # Override this method to memoize a non-zero Integer representation
62
+ # of HTTP status code from the response object
63
+ def get_status_code
64
+ get_status_code_using(:code)
65
+ end
66
+ end
67
+ end
68
+ end
69
+ end
@@ -1,19 +1,18 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
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/http_clients/abstract_request'
5
+ require_relative 'abstract'
6
6
 
7
7
  module NewRelic
8
8
  module Agent
9
9
  module HTTPClients
10
-
11
10
  class CurbRequest
12
- CURB = 'Curb'.freeze
13
- LHOST = 'host'.freeze
14
- UHOST = 'Host'.freeze
11
+ CURB = 'Curb'
12
+ LHOST = 'host'
13
+ UHOST = 'Host'
15
14
 
16
- def initialize( curlobj )
15
+ def initialize(curlobj)
17
16
  @curlobj = curlobj
18
17
  end
19
18
 
@@ -33,45 +32,50 @@ module NewRelic
33
32
  @curlobj._nr_http_verb
34
33
  end
35
34
 
36
- def []( key )
37
- @curlobj.headers[ key ]
35
+ def [](key)
36
+ headers[key]
38
37
  end
39
38
 
40
- def []=( key, value )
41
- @curlobj.headers[ key ] = value
39
+ def []=(key, value)
40
+ headers[key] = value
42
41
  end
43
42
 
44
43
  def uri
45
- @uri ||= NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@curlobj.url)
44
+ @uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
46
45
  end
47
- end
48
46
 
47
+ def headers
48
+ @curlobj.headers
49
+ end
50
+ end
49
51
 
50
- class CurbResponse < AbstractRequest
51
-
52
- def initialize(curlobj)
52
+ class CurbResponse < AbstractResponse
53
+ def initialize(wrapped_response)
54
+ super(wrapped_response)
53
55
  @headers = {}
54
- @curlobj = curlobj
55
56
  end
56
57
 
57
58
  def [](key)
58
- @headers[ key.downcase ]
59
+ @headers[key.downcase]
59
60
  end
60
61
 
61
62
  def to_hash
62
63
  @headers.dup
63
64
  end
64
65
 
65
- def append_header_data( data )
66
- key, value = data.split( /:\s*/, 2 )
67
- @headers[ key.downcase ] = value
68
- @curlobj._nr_header_str ||= ''
69
- @curlobj._nr_header_str << data
66
+ def append_header_data(data)
67
+ key, value = data.split(/:\s*/, 2)
68
+ @headers[key.downcase] = value
69
+ @wrapped_response._nr_header_str ||= +''
70
+ @wrapped_response._nr_header_str << data
70
71
  end
71
72
 
72
- end
73
+ private
73
74
 
75
+ def get_status_code
76
+ get_status_code_using(:response_code)
77
+ end
78
+ end
74
79
  end
75
-
76
80
  end
77
81
  end
@@ -1,20 +1,20 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
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/http_clients/abstract_request'
5
+ require_relative 'abstract'
6
6
 
7
7
  module NewRelic
8
8
  module Agent
9
9
  module HTTPClients
10
- class ExconHTTPResponse
11
- def initialize(response)
12
- @response = response
10
+ class ExconHTTPResponse < AbstractResponse
11
+ def initialize(wrapped_response)
12
+ super(wrapped_response)
13
+
13
14
  # Since HTTP headers are case-insensitive, we normalize all of them to
14
15
  # upper case here, and then also in our [](key) implementation.
15
16
  @normalized_headers = {}
16
- headers = response.respond_to?(:headers) ? response.headers : response[:headers]
17
- (headers || {}).each do |key, val|
17
+ (get_attribute(:headers) || {}).each do |key, val|
18
18
  @normalized_headers[key.upcase] = val
19
19
  end
20
20
  end
@@ -26,23 +26,38 @@ module NewRelic
26
26
  def to_hash
27
27
  @normalized_headers.dup
28
28
  end
29
+
30
+ private
31
+
32
+ def get_attribute(name)
33
+ if @wrapped_response.respond_to?(name)
34
+ @wrapped_response.send(name)
35
+ else
36
+ @wrapped_response[name]
37
+ end
38
+ end
39
+
40
+ def get_status_code
41
+ code = get_attribute(:status).to_i
42
+ code == 0 ? nil : code
43
+ end
29
44
  end
30
45
 
31
46
  class ExconHTTPRequest < AbstractRequest
32
47
  attr_reader :method
33
48
 
34
- EXCON = "Excon".freeze
35
- LHOST = 'host'.freeze
36
- UHOST = 'Host'.freeze
37
- COLON = ':'.freeze
49
+ EXCON = 'Excon'
50
+ LHOST = 'host'
51
+ UHOST = 'Host'
52
+ COLON = ':'
38
53
 
39
54
  def initialize(datum)
40
55
  @datum = datum
41
56
 
42
57
  @method = @datum[:method].to_s.upcase
43
58
  @scheme = @datum[:scheme]
44
- @port = @datum[:port]
45
- @path = @datum[:path]
59
+ @port = @datum[:port]
60
+ @path = @datum[:path]
46
61
  end
47
62
 
48
63
  def type
@@ -50,7 +65,6 @@ module NewRelic
50
65
  end
51
66
 
52
67
  def host_from_header
53
- headers = @datum[:headers]
54
68
  if hostname = (headers[LHOST] || headers[UHOST])
55
69
  hostname.split(COLON).first
56
70
  end
@@ -61,18 +75,20 @@ module NewRelic
61
75
  end
62
76
 
63
77
  def [](key)
64
- @datum[:headers][key]
78
+ headers[key]
65
79
  end
66
80
 
67
81
  def []=(key, value)
68
- @datum[:headers] ||= {}
69
- @datum[:headers][key] = value
82
+ headers[key] = value
70
83
  end
71
84
 
72
85
  def uri
73
- ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
74
- "#{@scheme}://#{host}:#{@port}#{@path}"
75
- )
86
+ url = "#{@scheme}://#{host}:#{@port}#{@path}"
87
+ URIUtil.parse_and_normalize_url(url)
88
+ end
89
+
90
+ def headers
91
+ @datum[:headers]
76
92
  end
77
93
  end
78
94
  end
@@ -1,39 +1,34 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
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/http_clients/abstract_request'
5
+ require_relative 'abstract'
6
6
 
7
7
  module NewRelic
8
8
  module Agent
9
9
  module HTTPClients
10
- class HTTPResponse
11
- attr_reader :response
12
-
13
- def initialize(response)
14
- @response = response
15
- end
16
-
10
+ class HTTPResponse < AbstractResponse
17
11
  def [](key)
18
- _, value = response.headers.find { |k,_| key.downcase == k.downcase }
12
+ _, value = @wrapped_response.headers.find { |k, _| key.casecmp(k) == 0 }
19
13
  value unless value.nil?
20
14
  end
21
15
 
22
16
  def to_hash
23
- response.headers
17
+ @wrapped_response.headers
24
18
  end
25
19
  end
26
20
 
27
21
  class HTTPRequest < AbstractRequest
28
- HTTP_RB = 'http.rb'.freeze
29
- HOST = 'host'.freeze
30
- COLON = ':'.freeze
22
+ HTTP_RB = 'http.rb'
23
+ HOST = 'host'
24
+ COLON = ':'
31
25
 
32
- attr_reader :request, :uri
26
+ def initialize(wrapped_request)
27
+ @wrapped_request = wrapped_request
28
+ end
33
29
 
34
- def initialize(request)
35
- @request = request
36
- @uri = request.uri
30
+ def uri
31
+ @uri ||= URIUtil.parse_and_normalize_url(@wrapped_request.uri)
37
32
  end
38
33
 
39
34
  def type
@@ -47,19 +42,23 @@ module NewRelic
47
42
  end
48
43
 
49
44
  def host
50
- host_from_header || request.host
45
+ host_from_header || @wrapped_request.host
51
46
  end
52
47
 
53
48
  def method
54
- request.verb.upcase
49
+ @wrapped_request.verb.upcase
55
50
  end
56
51
 
57
52
  def [](key)
58
- request.headers[key]
53
+ @wrapped_request.headers[key]
59
54
  end
60
55
 
61
56
  def []=(key, value)
62
- request.headers[key] = value
57
+ @wrapped_request.headers[key] = value
58
+ end
59
+
60
+ def headers
61
+ @wrapped_request.headers.to_hash
63
62
  end
64
63
  end
65
64
  end
@@ -1,22 +1,16 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
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/http_clients/abstract_request'
5
+ require_relative 'abstract'
6
6
 
7
7
  module NewRelic
8
8
  module Agent
9
9
  module HTTPClients
10
- class HTTPClientResponse
11
- attr_reader :response
12
-
13
- def initialize(response)
14
- @response = response
15
- end
16
-
10
+ class HTTPClientResponse < AbstractResponse
17
11
  def [](key)
18
- response.headers.each do |k,v|
19
- if key.downcase == k.downcase
12
+ @wrapped_response.headers.each do |k, v|
13
+ if key.casecmp(k) == 0
20
14
  return v
21
15
  end
22
16
  end
@@ -24,21 +18,20 @@ module NewRelic
24
18
  end
25
19
 
26
20
  def to_hash
27
- response.headers
21
+ @wrapped_response.headers
28
22
  end
29
23
  end
30
24
 
31
25
  class HTTPClientRequest < AbstractRequest
32
- attr_reader :request, :uri
26
+ attr_reader :request
33
27
 
34
- HTTP_CLIENT = "HTTPClient".freeze
28
+ HTTP_CLIENT = 'HTTPClient'.freeze
35
29
  LHOST = 'host'.freeze
36
30
  UHOST = 'Host'.freeze
37
31
  COLON = ':'.freeze
38
32
 
39
33
  def initialize(request)
40
34
  @request = request
41
- @uri = request.header.request_uri
42
35
  end
43
36
 
44
37
  def type
@@ -59,13 +52,21 @@ module NewRelic
59
52
  host_from_header || uri.host.to_s
60
53
  end
61
54
 
55
+ def uri
56
+ @uri ||= URIUtil.parse_and_normalize_url(request.header.request_uri)
57
+ end
58
+
62
59
  def [](key)
63
- request.headers[key]
60
+ headers[key]
64
61
  end
65
62
 
66
63
  def []=(key, value)
67
64
  request.http_header[key] = value
68
65
  end
66
+
67
+ def headers
68
+ request.headers
69
+ end
69
70
  end
70
71
  end
71
72
  end
@@ -1,26 +1,37 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
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/http_clients/abstract_request'
5
+ require_relative 'abstract'
6
+ require 'resolv'
6
7
 
7
8
  module NewRelic
8
9
  module Agent
9
10
  module HTTPClients
11
+ class NetHTTPResponse < AbstractResponse
12
+ def [](key)
13
+ @wrapped_response[key]
14
+ end
15
+
16
+ def to_hash
17
+ @wrapped_response.to_hash
18
+ end
19
+ end
20
+
10
21
  class NetHTTPRequest < AbstractRequest
11
22
  def initialize(connection, request)
12
23
  @connection = connection
13
24
  @request = request
14
25
  end
15
26
 
16
- NET_HTTP = 'Net::HTTP'.freeze
27
+ NET_HTTP = 'Net::HTTP'
17
28
 
18
29
  def type
19
30
  NET_HTTP
20
31
  end
21
32
 
22
- HOST = 'host'.freeze
23
- COLON = ':'.freeze
33
+ HOST = 'host'
34
+ COLON = ':'
24
35
 
25
36
  def host_from_header
26
37
  if hostname = self[HOST]
@@ -49,12 +60,21 @@ module NewRelic
49
60
  when /^https?:\/\//
50
61
  ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@request.path)
51
62
  else
63
+ connection_address = @connection.address
64
+ if Resolv::IPv6::Regex.match?(connection_address)
65
+ connection_address = "[#{connection_address}]"
66
+ end
67
+
52
68
  scheme = @connection.use_ssl? ? 'https' : 'http'
53
69
  ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
54
- "#{scheme}://#{@connection.address}:#{@connection.port}#{@request.path}"
55
- )
70
+ "#{scheme}://#{connection_address}:#{@connection.port}#{@request.path}"
71
+ )
56
72
  end
57
73
  end
74
+
75
+ def headers
76
+ @request.instance_variable_get(:@header)
77
+ end
58
78
  end
59
79
  end
60
80
  end
@@ -1,30 +1,26 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
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/http_clients/abstract_request'
5
+ require_relative 'abstract'
6
6
 
7
7
  module NewRelic
8
8
  module Agent
9
9
  module HTTPClients
10
- class TyphoeusHTTPResponse
11
- def initialize(response)
12
- @response = response
13
- end
14
-
10
+ class TyphoeusHTTPResponse < AbstractResponse
15
11
  def [](key)
16
12
  unless headers.nil?
17
13
  result = headers[key]
18
14
 
19
15
  # Typhoeus 0.5.3 has a bug where asking the headers hash for a
20
- # non-existent header will return the hash itself, not what we want.
16
+ # nonexistent header will return the hash itself, not what we want.
21
17
  result == headers ? nil : result
22
18
  end
23
19
  end
24
20
 
25
21
  def to_hash
26
22
  hash = {}
27
- headers.each do |(k,v)|
23
+ headers.each do |(k, v)|
28
24
  hash[k] = v
29
25
  end
30
26
  hash
@@ -33,7 +29,7 @@ module NewRelic
33
29
  private
34
30
 
35
31
  def headers
36
- @response.headers
32
+ @wrapped_response.headers
37
33
  end
38
34
  end
39
35
 
@@ -43,10 +39,10 @@ module NewRelic
43
39
  @uri = case request.url
44
40
  when ::URI then request.url
45
41
  else NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(request.url)
46
- end
42
+ end
47
43
  end
48
44
 
49
- TYPHOEUS = "Typhoeus".freeze
45
+ TYPHOEUS = 'Typhoeus'.freeze
50
46
 
51
47
  def type
52
48
  TYPHOEUS
@@ -70,13 +66,17 @@ module NewRelic
70
66
  end
71
67
 
72
68
  def [](key)
73
- return nil unless @request.options && @request.options[:headers]
74
- @request.options[:headers][key]
69
+ return nil unless @request.options && headers
70
+
71
+ headers[key]
75
72
  end
76
73
 
77
74
  def []=(key, value)
78
- @request.options[:headers] ||= {}
79
- @request.options[:headers][key] = value
75
+ headers[key] = value
76
+ end
77
+
78
+ def headers
79
+ @request.options[:headers] || {}
80
80
  end
81
81
 
82
82
  def uri