newrelic_rpm 6.10.0.364 → 8.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (440) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +13 -1
  3. data/.rubocop.yml +1946 -0
  4. data/.rubocop_todo.yml +62 -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 +3737 -2592
  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 +9 -8
  15. data/LICENSE +202 -38
  16. data/README.md +85 -87
  17. data/Rakefile +27 -27
  18. data/THIRD_PARTY_NOTICES.md +28 -0
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +77 -54
  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 +97 -919
  30. data/lib/new_relic/agent/agent_helpers/connect.rb +227 -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 +75 -0
  34. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -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 +24 -20
  38. data/lib/new_relic/agent/attribute_filter.rb +67 -48
  39. data/lib/new_relic/agent/attribute_processing.rb +8 -8
  40. data/lib/new_relic/agent/attributes.rb +8 -5
  41. data/lib/new_relic/agent/audit_logger.rb +19 -4
  42. data/lib/new_relic/agent/autostart.rb +21 -20
  43. data/lib/new_relic/agent/chained_call.rb +2 -2
  44. data/lib/new_relic/agent/commands/agent_command.rb +4 -4
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +13 -12
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +10 -8
  47. data/lib/new_relic/agent/configuration/default_source.rb +1783 -1158
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
  49. data/lib/new_relic/agent/configuration/environment_source.rb +12 -10
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +10 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +83 -70
  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 +91 -78
  56. data/lib/new_relic/agent/configuration/server_source.rb +22 -20
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +32 -8
  58. data/lib/new_relic/agent/configuration.rb +2 -2
  59. data/lib/new_relic/agent/connect/request_builder.rb +19 -19
  60. data/lib/new_relic/agent/connect/response_handler.rb +6 -9
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +15 -15
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
  64. data/lib/new_relic/agent/database/obfuscator.rb +3 -3
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
  66. data/lib/new_relic/agent/database.rb +54 -48
  67. data/lib/new_relic/agent/database_adapter.rb +35 -0
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +18 -19
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +7 -11
  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 +6 -12
  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/distributed_tracing/cross_app_payload.rb +13 -12
  77. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -33
  78. data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +28 -24
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +20 -20
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +53 -56
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -7
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +77 -78
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +40 -39
  84. data/lib/new_relic/agent/distributed_tracing.rb +33 -101
  85. data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
  86. data/lib/new_relic/agent/error_collector.rb +74 -55
  87. data/lib/new_relic/agent/error_event_aggregator.rb +5 -6
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
  90. data/lib/new_relic/agent/event_aggregator.rb +23 -22
  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 +27 -25
  94. data/lib/new_relic/agent/external.rb +12 -45
  95. data/lib/new_relic/agent/guid_generator.rb +14 -12
  96. data/lib/new_relic/agent/harvester.rb +5 -6
  97. data/lib/new_relic/agent/heap.rb +8 -10
  98. data/lib/new_relic/agent/hostname.rb +21 -14
  99. data/lib/new_relic/agent/http_clients/abstract.rb +11 -12
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -12
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +9 -10
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +5 -6
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +3 -5
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +9 -5
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -6
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +10 -12
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -9
  108. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +39 -32
  109. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +16 -18
  110. data/lib/new_relic/agent/instrumentation/active_job.rb +21 -14
  111. data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
  112. data/lib/new_relic/agent/instrumentation/active_record.rb +94 -47
  113. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -61
  114. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +50 -63
  115. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
  116. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +28 -21
  117. data/lib/new_relic/agent/instrumentation/active_storage.rb +4 -4
  118. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +19 -16
  119. data/lib/new_relic/agent/instrumentation/active_support.rb +12 -0
  120. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  121. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  122. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  123. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  124. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +12 -3
  125. data/lib/new_relic/agent/instrumentation/authlogic.rb +11 -3
  126. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  127. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  128. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  129. data/lib/new_relic/agent/instrumentation/bunny.rb +12 -153
  130. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  131. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  132. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  133. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  134. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +70 -60
  135. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  136. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  137. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  138. data/lib/new_relic/agent/instrumentation/curb.rb +14 -240
  139. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
  140. data/lib/new_relic/agent/instrumentation/data_mapper.rb +77 -66
  141. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
  142. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  143. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  144. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -52
  145. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  146. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  147. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  148. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  149. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +7 -7
  150. data/lib/new_relic/agent/instrumentation/excon.rb +28 -30
  151. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  152. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  153. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  154. data/lib/new_relic/agent/instrumentation/grape.rb +15 -116
  155. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  156. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  157. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  158. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  159. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  160. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  161. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  162. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  163. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  164. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  165. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  166. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  167. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  168. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  169. data/lib/new_relic/agent/instrumentation/httpclient.rb +11 -33
  170. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  171. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  172. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  173. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  174. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
  175. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  176. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  177. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  178. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  179. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  180. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +58 -129
  181. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  182. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  183. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
  184. data/lib/new_relic/agent/instrumentation/memcache.rb +57 -73
  185. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +14 -13
  186. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +10 -10
  187. data/lib/new_relic/agent/instrumentation/mongo.rb +7 -138
  188. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +41 -18
  189. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  190. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
  191. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  192. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  193. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +12 -11
  194. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  195. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  196. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  197. data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
  198. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
  199. data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
  200. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  201. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  202. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  203. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  204. data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
  205. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +19 -55
  206. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
  207. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
  208. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +5 -5
  209. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
  210. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  211. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +15 -5
  212. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  213. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
  214. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  215. data/lib/new_relic/agent/instrumentation/rake.rb +17 -157
  216. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  217. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  218. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +93 -0
  219. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  220. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  221. data/lib/new_relic/agent/instrumentation/redis.rb +19 -108
  222. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  223. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  224. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  225. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  226. data/lib/new_relic/agent/instrumentation/resque.rb +33 -44
  227. data/lib/new_relic/agent/instrumentation/sequel.rb +16 -18
  228. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +3 -3
  229. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  230. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  231. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  232. data/lib/new_relic/agent/instrumentation/sidekiq.rb +29 -45
  233. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  234. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
  235. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
  236. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  237. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +3 -3
  238. data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
  239. data/lib/new_relic/agent/instrumentation/sunspot.rb +14 -6
  240. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  241. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +32 -0
  242. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  243. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  244. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  245. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  246. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  247. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  248. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  249. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  250. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  251. data/lib/new_relic/agent/instrumentation/typhoeus.rb +13 -92
  252. data/lib/new_relic/agent/instrumentation.rb +2 -2
  253. data/lib/new_relic/agent/internal_agent_error.rb +3 -3
  254. data/lib/new_relic/agent/javascript_instrumentor.rb +49 -43
  255. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  256. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  257. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  258. data/lib/new_relic/agent/log_once.rb +2 -2
  259. data/lib/new_relic/agent/log_priority.rb +20 -0
  260. data/lib/new_relic/agent/logging.rb +25 -22
  261. data/lib/new_relic/agent/memory_logger.rb +3 -3
  262. data/lib/new_relic/agent/messaging.rb +66 -82
  263. data/lib/new_relic/agent/method_tracer.rb +152 -146
  264. data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
  265. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -18
  266. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +6 -5
  267. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +2 -3
  268. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +7 -10
  269. data/lib/new_relic/agent/monitors.rb +7 -8
  270. data/lib/new_relic/agent/new_relic_service/encoders.rb +7 -7
  271. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
  272. data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
  273. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +6 -5
  274. data/lib/new_relic/agent/new_relic_service.rb +258 -184
  275. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +3 -6
  276. data/lib/new_relic/agent/null_logger.rb +8 -4
  277. data/lib/new_relic/agent/obfuscator.rb +9 -11
  278. data/lib/new_relic/agent/parameter_filtering.rb +25 -11
  279. data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
  280. data/lib/new_relic/agent/pipe_channel_manager.rb +28 -18
  281. data/lib/new_relic/agent/pipe_service.rb +9 -6
  282. data/lib/new_relic/agent/prepend_supportability.rb +3 -3
  283. data/lib/new_relic/agent/priority_sampled_buffer.rb +15 -15
  284. data/lib/new_relic/agent/range_extensions.rb +9 -29
  285. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
  286. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +14 -14
  287. data/lib/new_relic/agent/rules_engine.rb +6 -5
  288. data/lib/new_relic/agent/sampler.rb +4 -5
  289. data/lib/new_relic/agent/sampler_collection.rb +4 -5
  290. data/lib/new_relic/agent/samplers/cpu_sampler.rb +4 -3
  291. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
  292. data/lib/new_relic/agent/samplers/memory_sampler.rb +26 -15
  293. data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
  294. data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
  295. data/lib/new_relic/agent/span_event_aggregator.rb +13 -13
  296. data/lib/new_relic/agent/span_event_primitive.rb +85 -54
  297. data/lib/new_relic/agent/sql_sampler.rb +20 -20
  298. data/lib/new_relic/agent/stats.rb +79 -42
  299. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
  300. data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
  301. data/lib/new_relic/agent/stats_engine.rb +9 -9
  302. data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
  303. data/lib/new_relic/agent/system_info.rb +95 -66
  304. data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
  305. data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
  306. data/lib/new_relic/agent/threading/backtrace_service.rb +15 -15
  307. data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
  308. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
  309. data/lib/new_relic/agent/tracer.rb +81 -86
  310. data/lib/new_relic/agent/transaction/abstract_segment.rb +107 -43
  311. data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
  312. data/lib/new_relic/agent/transaction/distributed_tracer.rb +67 -54
  313. data/lib/new_relic/agent/transaction/distributed_tracing.rb +45 -46
  314. data/lib/new_relic/agent/transaction/external_request_segment.rb +47 -37
  315. data/lib/new_relic/agent/transaction/message_broker_segment.rb +32 -36
  316. data/lib/new_relic/agent/transaction/request_attributes.rb +36 -36
  317. data/lib/new_relic/agent/transaction/segment.rb +41 -11
  318. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
  319. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
  320. data/lib/new_relic/agent/transaction/trace.rb +16 -12
  321. data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
  322. data/lib/new_relic/agent/transaction/trace_context.rb +36 -36
  323. data/lib/new_relic/agent/transaction/trace_node.rb +26 -25
  324. data/lib/new_relic/agent/transaction/tracing.rb +15 -12
  325. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
  326. data/lib/new_relic/agent/transaction.rb +182 -146
  327. data/lib/new_relic/agent/transaction_error_primitive.rb +29 -27
  328. data/lib/new_relic/agent/transaction_event_aggregator.rb +13 -13
  329. data/lib/new_relic/agent/transaction_event_primitive.rb +34 -35
  330. data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
  331. data/lib/new_relic/agent/transaction_metrics.rb +11 -10
  332. data/lib/new_relic/agent/transaction_sampler.rb +6 -7
  333. data/lib/new_relic/agent/transaction_time_aggregator.rb +27 -26
  334. data/lib/new_relic/agent/utilization/aws.rb +34 -4
  335. data/lib/new_relic/agent/utilization/azure.rb +4 -4
  336. data/lib/new_relic/agent/utilization/gcp.rb +8 -8
  337. data/lib/new_relic/agent/utilization/pcf.rb +6 -5
  338. data/lib/new_relic/agent/utilization/vendor.rb +44 -29
  339. data/lib/new_relic/agent/utilization_data.rb +8 -6
  340. data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
  341. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
  342. data/lib/new_relic/agent/vm/mri_vm.rb +46 -19
  343. data/lib/new_relic/agent/vm/snapshot.rb +6 -6
  344. data/lib/new_relic/agent/vm.rb +2 -2
  345. data/lib/new_relic/agent/worker_loop.rb +11 -13
  346. data/lib/new_relic/agent.rb +80 -76
  347. data/lib/new_relic/cli/command.rb +21 -23
  348. data/lib/new_relic/cli/commands/deployments.rb +93 -44
  349. data/lib/new_relic/cli/commands/install.rb +13 -16
  350. data/lib/new_relic/coerce.rb +16 -14
  351. data/lib/new_relic/collection_helper.rb +51 -49
  352. data/lib/new_relic/constants.rb +7 -2
  353. data/lib/new_relic/control/class_methods.rb +4 -4
  354. data/lib/new_relic/control/frameworks/external.rb +3 -3
  355. data/lib/new_relic/control/frameworks/rails.rb +24 -18
  356. data/lib/new_relic/control/frameworks/rails3.rb +4 -5
  357. data/lib/new_relic/control/frameworks/rails4.rb +2 -2
  358. data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
  359. data/lib/new_relic/control/frameworks/ruby.rb +4 -4
  360. data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
  361. data/lib/new_relic/control/frameworks.rb +2 -2
  362. data/lib/new_relic/control/instance_methods.rb +28 -46
  363. data/lib/new_relic/control/instrumentation.rb +40 -12
  364. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  365. data/lib/new_relic/control/server_methods.rb +4 -5
  366. data/lib/new_relic/control.rb +2 -3
  367. data/lib/new_relic/delayed_job_injection.rb +2 -2
  368. data/lib/new_relic/dependency_detection.rb +129 -18
  369. data/lib/new_relic/environment_report.rb +41 -35
  370. data/lib/new_relic/helper.rb +49 -8
  371. data/lib/new_relic/language_support.rb +30 -6
  372. data/lib/new_relic/latest_changes.rb +9 -8
  373. data/lib/new_relic/local_environment.rb +25 -19
  374. data/lib/new_relic/metric_data.rb +32 -27
  375. data/lib/new_relic/metric_spec.rb +9 -7
  376. data/lib/new_relic/noticed_error.rb +23 -31
  377. data/lib/new_relic/rack/agent_hooks.rb +2 -2
  378. data/lib/new_relic/rack/agent_middleware.rb +6 -4
  379. data/lib/new_relic/rack/browser_monitoring.rb +134 -124
  380. data/lib/new_relic/rack.rb +2 -2
  381. data/lib/new_relic/recipes/capistrano3.rb +4 -62
  382. data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
  383. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  384. data/lib/new_relic/recipes.rb +2 -2
  385. data/lib/new_relic/supportability_helper.rb +12 -11
  386. data/lib/new_relic/traced_thread.rb +39 -0
  387. data/lib/new_relic/version.rb +7 -18
  388. data/lib/newrelic_rpm.rb +20 -33
  389. data/lib/sequel/extensions/newrelic_instrumentation.rb +14 -17
  390. data/lib/sequel/plugins/newrelic_instrumentation.rb +6 -12
  391. data/lib/tasks/all.rb +4 -4
  392. data/lib/tasks/config.rake +22 -117
  393. data/lib/tasks/coverage_report.rake +28 -0
  394. data/lib/tasks/helpers/config.html.erb +21 -0
  395. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  396. data/lib/tasks/helpers/format.rb +123 -0
  397. data/lib/tasks/helpers/matches.rb +12 -0
  398. data/lib/tasks/helpers/prompt.rb +24 -0
  399. data/lib/tasks/helpers/removers.rb +33 -0
  400. data/lib/tasks/install.rake +4 -0
  401. data/lib/tasks/instrumentation_generator/README.md +63 -0
  402. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  403. data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
  404. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  405. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  406. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  407. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  408. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  409. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  410. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  411. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  412. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  413. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  414. data/lib/tasks/multiverse.rake +4 -0
  415. data/lib/tasks/multiverse.rb +7 -25
  416. data/lib/tasks/newrelic.rb +2 -2
  417. data/lib/tasks/tests.rake +11 -16
  418. data/newrelic.yml +666 -3
  419. data/newrelic_rpm.gemspec +28 -27
  420. data/recipes/newrelic.rb +3 -3
  421. data/test/agent_helper.rb +245 -189
  422. metadata +182 -130
  423. data/.travis.yml +0 -225
  424. data/bin/mongrel_rpm +0 -33
  425. data/cert/cacert.pem +0 -1177
  426. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  427. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  428. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  429. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  430. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  431. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  432. data/lib/new_relic/agent/instrumentation/net.rb +0 -53
  433. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  434. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  435. data/lib/new_relic/agent/supported_versions.rb +0 -275
  436. data/lib/new_relic/build.rb +0 -2
  437. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  438. data/lib/new_relic/metrics.rb +0 -13
  439. data/lib/tasks/config.html.erb +0 -32
  440. data/true +0 -0
@@ -1,6 +1,6 @@
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
5
  require 'zlib'
6
6
  require 'timeout'
@@ -15,29 +15,33 @@ module NewRelic
15
15
  class NewRelicService
16
16
  # Specifies the version of the agent's communication protocol with
17
17
  # the NewRelic hosted site.
18
-
19
18
  PROTOCOL_VERSION = 17
20
19
 
21
- # 1f147a42: v10 (tag 3.5.3.17)
22
- # cf0d1ff1: v9 (tag 3.5.0)
23
- # 14105: v8 (tag 2.10.3)
24
- # (no v7)
25
- # 10379: v6 (not tagged)
26
- # 4078: v5 (tag 2.5.4)
27
- # 2292: v4 (tag 2.3.6)
28
- # 1754: v3 (tag 2.3.0)
29
- # 534: v2 (shows up in 2.1.0, our first tag)
30
-
31
20
  # These include Errno connection errors, and all indicate that the
32
21
  # underlying TCP connection may be in a bad state.
33
22
  CONNECTION_ERRORS = [Timeout::Error, EOFError, SystemCallError, SocketError].freeze
34
23
 
24
+ # The maximum number of times to attempt an HTTP request
25
+ MAX_ATTEMPTS = 2
26
+
27
+ # Don't perform compression on the payload unless its uncompressed size is
28
+ # greater than or equal to this number of bytes. In testing with
29
+ # Ruby 2.2 - 3.1, we determined an absolute minimum value for ASCII to be
30
+ # 535 bytes to obtain at least a 10% savings in size. It is recommended
31
+ # that this value be kept above that 535 number. It is also important to
32
+ # consider the CPU cost involved with performing compression and to find
33
+ # a balance between CPU cycles spent and bandwidth saved. A good
34
+ # reasonable default here is 2048 bytes, which is a tried and true Apache
35
+ # Tomcat default (as of v8.5.78)
36
+ MIN_BYTE_SIZE_TO_COMPRESS = 2048
37
+
35
38
  attr_accessor :request_timeout
36
39
  attr_reader :collector, :marshaller, :agent_id
37
40
 
38
- def initialize(license_key=nil, collector=control.server)
41
+ def initialize(license_key = nil, collector = control.server)
39
42
  @license_key = license_key
40
43
  @collector = collector
44
+ @configured_collector = collector
41
45
  @request_timeout = Agent.config[:timeout]
42
46
  @ssl_cert_store = nil
43
47
  @in_session = nil
@@ -46,14 +50,22 @@ module NewRelic
46
50
  @request_headers_map = nil
47
51
  reset_remote_method_uris
48
52
 
53
+ prep_audit_logger
54
+ prep_marshaller
55
+ end
56
+
57
+ def prep_audit_logger
49
58
  @audit_logger = ::NewRelic::Agent::AuditLogger.new
50
59
  Agent.config.register_callback(:'audit_log.enabled') do |enabled|
51
60
  @audit_logger.enabled = enabled
52
61
  end
62
+ end
53
63
 
64
+ def prep_marshaller
54
65
  Agent.config.register_callback(:marshaller) do |marshaller|
55
66
  if marshaller != 'json'
56
- ::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
67
+ ::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using " \
68
+ "JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
57
69
  end
58
70
 
59
71
  @marshaller = JsonMarshaller.new
@@ -65,11 +77,10 @@ module NewRelic
65
77
  # clear out our cached values whenever the run ID changes.
66
78
  #
67
79
  reset_remote_method_uris
68
-
69
80
  @agent_id = id
70
81
  end
71
82
 
72
- def connect(settings={})
83
+ def connect(settings = {})
73
84
  @request_headers_map = nil
74
85
  security_policies = nil
75
86
  if response = preconnect
@@ -128,14 +139,13 @@ module NewRelic
128
139
 
129
140
  def metric_data(stats_hash)
130
141
  timeslice_start = stats_hash.started_at
131
- timeslice_end = stats_hash.harvested_at || Time.now
142
+ timeslice_end = stats_hash.harvested_at || Process.clock_gettime(Process::CLOCK_REALTIME)
132
143
  metric_data_array = build_metric_data_array(stats_hash)
133
- result = invoke_remote(
144
+ invoke_remote(
134
145
  :metric_data,
135
- [@agent_id, timeslice_start.to_f, timeslice_end.to_f, metric_data_array],
146
+ [@agent_id, timeslice_start, timeslice_end, metric_data_array],
136
147
  :item_count => metric_data_array.size
137
148
  )
138
- result
139
149
  end
140
150
 
141
151
  def error_data(unsent_errors)
@@ -177,26 +187,30 @@ module NewRelic
177
187
  :item_count => items.size)
178
188
  end
179
189
 
190
+ def log_event_data(data)
191
+ payload, size = LogEventAggregator.payload_to_melt_format(data)
192
+ invoke_remote(:log_event_data, payload, :item_count => size)
193
+ end
194
+
180
195
  def error_event_data(data)
181
196
  metadata, items = data
182
- invoke_remote(:error_event_data, [@agent_id, *data], :item_count => items.size)
197
+ response = invoke_remote(:error_event_data, [@agent_id, *data], :item_count => items.size)
183
198
  NewRelic::Agent.record_metric("Supportability/Events/TransactionError/Sent", :count => items.size)
184
199
  NewRelic::Agent.record_metric("Supportability/Events/TransactionError/Seen", :count => metadata[:events_seen])
200
+ response
185
201
  end
186
202
 
187
203
  def span_event_data(data)
188
204
  metadata, items = data
189
- invoke_remote(:span_event_data, [@agent_id, *data], :item_count => items.size)
205
+ response = invoke_remote(:span_event_data, [@agent_id, *data], :item_count => items.size)
190
206
  NewRelic::Agent.record_metric("Supportability/Events/SpanEvents/Sent", :count => items.size)
191
207
  NewRelic::Agent.record_metric("Supportability/Events/SpanEvents/Seen", :count => metadata[:events_seen])
208
+ response
192
209
  end
193
210
 
194
- # We do not compress if content is smaller than 64kb. There are
195
- # problems with bugs in Ruby in some versions that expose us
196
- # to a risk of segfaults if we compress aggressively.
197
211
  def compress_request_if_needed(data, endpoint)
198
212
  encoding = 'identity'
199
- if data.size > 64 * 1024
213
+ if data.size >= MIN_BYTE_SIZE_TO_COMPRESS
200
214
  encoding = Agent.config[:compressed_content_encoding]
201
215
  data = if encoding == 'deflate'
202
216
  Encoders::Compressed::Deflate.encode(data)
@@ -212,10 +226,10 @@ module NewRelic
212
226
  # represents 1 tcp connection which may transmit multiple HTTP requests
213
227
  # via keep-alive.
214
228
  def session(&block)
215
- raise ArgumentError, "#{self.class}#shared_connection must be passed a block" unless block_given?
229
+ raise ArgumentError, "#{self.class}#shared_connection must be passed a block" unless block
216
230
 
217
231
  begin
218
- t0 = Time.now
232
+ t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
219
233
  @in_session = true
220
234
  if NewRelic::Agent.config[:aggressive_keepalive]
221
235
  session_with_keepalive(&block)
@@ -223,7 +237,7 @@ module NewRelic
223
237
  session_without_keepalive(&block)
224
238
  end
225
239
  rescue *CONNECTION_ERRORS => e
226
- elapsed = Time.now - t0
240
+ elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0
227
241
  raise NewRelic::Agent::ServerConnectionException, "Recoverable error connecting to #{@collector} after #{elapsed} seconds: #{e}"
228
242
  ensure
229
243
  @in_session = false
@@ -232,22 +246,20 @@ module NewRelic
232
246
 
233
247
  def session_with_keepalive(&block)
234
248
  establish_shared_connection
235
- block.call
249
+ yield
236
250
  end
237
251
 
238
252
  def session_without_keepalive(&block)
239
253
  begin
240
254
  establish_shared_connection
241
- block.call
255
+ yield
242
256
  ensure
243
257
  close_shared_connection
244
258
  end
245
259
  end
246
260
 
247
261
  def establish_shared_connection
248
- unless @shared_tcp_connection
249
- @shared_tcp_connection = create_and_start_http_connection
250
- end
262
+ @shared_tcp_connection ||= create_and_start_http_connection
251
263
  @shared_tcp_connection
252
264
  end
253
265
 
@@ -289,14 +301,22 @@ module NewRelic
289
301
  # Jruby 1.6.8 requires a gem for full ssl support and will throw
290
302
  # an error when use_ssl=(true) is called and jruby-openssl isn't
291
303
  # installed
292
- conn.use_ssl = true
304
+ conn.use_ssl = true
293
305
  conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
294
- conn.cert_store = ssl_cert_store
306
+ set_cert_store(conn)
295
307
  rescue StandardError, LoadError
296
308
  msg = "SSL is not available in the environment; please install SSL support."
297
309
  raise UnrecoverableAgentException.new(msg)
298
310
  end
299
311
 
312
+ def set_cert_store(conn)
313
+ if NewRelic::Agent.config[:ca_bundle_path]
314
+ conn.cert_store = ssl_cert_store
315
+ else
316
+ ::NewRelic::Agent.logger.debug("Using default security certificates")
317
+ end
318
+ end
319
+
300
320
  def start_connection(conn)
301
321
  NewRelic::Agent.logger.debug("Opening TCP connection to #{conn.address}:#{conn.port}")
302
322
  Timeout.timeout(@request_timeout) { conn.start }
@@ -313,20 +333,7 @@ module NewRelic
313
333
  end
314
334
 
315
335
  def create_http_connection
316
- if Agent.config[:proxy_host]
317
- ::NewRelic::Agent.logger.debug("Using proxy server #{Agent.config[:proxy_host]}:#{Agent.config[:proxy_port]}")
318
-
319
- proxy = Net::HTTP::Proxy(
320
- Agent.config[:proxy_host],
321
- Agent.config[:proxy_port],
322
- Agent.config[:proxy_user],
323
- Agent.config[:proxy_pass]
324
- )
325
- conn = proxy.new(@collector.name, @collector.port)
326
- else
327
- conn = Net::HTTP.new(@collector.name, @collector.port)
328
- end
329
-
336
+ conn = prep_connection
330
337
  setup_connection_for_ssl(conn)
331
338
  setup_connection_timeouts(conn)
332
339
 
@@ -334,20 +341,38 @@ module NewRelic
334
341
  conn
335
342
  end
336
343
 
344
+ def prep_connection
345
+ return Net::HTTP.new(@collector.name, @collector.port) unless Agent.config[:proxy_host]
346
+
347
+ ::NewRelic::Agent.logger.debug("Using proxy server #{Agent.config[:proxy_host]}:#{Agent.config[:proxy_port]}")
348
+ prep_proxy_connection
349
+ end
350
+
351
+ def prep_proxy_connection
352
+ proxy = Net::HTTP::Proxy(
353
+ Agent.config[:proxy_host],
354
+ Agent.config[:proxy_port],
355
+ Agent.config[:proxy_user],
356
+ Agent.config[:proxy_pass]
357
+ )
358
+ proxy.new(@collector.name, @collector.port)
359
+ end
360
+
337
361
  def create_and_start_http_connection
338
362
  conn = create_http_connection
339
363
  start_connection(conn)
340
364
  conn
365
+ rescue Timeout::Error
366
+ ::NewRelic::Agent.logger.info("Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.")
367
+ raise
341
368
  end
342
369
 
343
370
  # The path to the certificate file used to verify the SSL
344
371
  # connection if verify_peer is enabled
345
372
  def cert_file_path
346
373
  if path_override = NewRelic::Agent.config[:ca_bundle_path]
347
- NewRelic::Agent.logger.warn("Couldn't find CA bundle from configured ca_bundle_path: #{path_override}") unless File.exist? path_override
374
+ NewRelic::Agent.logger.warn("Couldn't find CA bundle from configured ca_bundle_path: #{path_override}") unless File.exist?(path_override)
348
375
  path_override
349
- else
350
- File.expand_path(File.join(control.newrelic_root, 'cert', 'cacert.pem'))
351
376
  end
352
377
  end
353
378
 
@@ -366,6 +391,116 @@ module NewRelic
366
391
  NewRelic::Control.instance
367
392
  end
368
393
 
394
+ def prep_headers(opts)
395
+ headers = {
396
+ 'Content-Encoding' => opts[:encoding],
397
+ 'Host' => opts[:collector].name
398
+ }
399
+ headers.merge!(@request_headers_map) if @request_headers_map
400
+ headers
401
+ end
402
+
403
+ def prep_request(opts)
404
+ headers = prep_headers(opts)
405
+ if Agent.config[:put_for_data_send]
406
+ request = Net::HTTP::Put.new(opts[:uri], headers)
407
+ else
408
+ request = Net::HTTP::Post.new(opts[:uri], headers)
409
+ end
410
+ @audit_logger.log_request_headers(opts[:uri], headers)
411
+ request['user-agent'] = user_agent
412
+ request.content_type = "application/octet-stream"
413
+ request.body = opts[:data]
414
+ request
415
+ end
416
+
417
+ def relay_request(request, opts)
418
+ response = nil
419
+ attempts = 0
420
+
421
+ begin
422
+ attempts += 1
423
+ response = attempt_request(request, opts)
424
+ rescue *CONNECTION_ERRORS => e
425
+ close_shared_connection
426
+ if attempts < MAX_ATTEMPTS
427
+ ::NewRelic::Agent.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
428
+ retry
429
+ else
430
+ raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
431
+ end
432
+ end
433
+
434
+ log_response(response)
435
+ response
436
+ end
437
+
438
+ def attempt_request(request, opts)
439
+ response = nil
440
+ conn = http_connection
441
+ ::NewRelic::Agent.logger.debug("Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}")
442
+ Timeout.timeout(@request_timeout) do
443
+ response = conn.request(request)
444
+ end
445
+ response
446
+ end
447
+
448
+ def handle_error_response(response, endpoint)
449
+ case response
450
+ when Net::HTTPRequestTimeOut,
451
+ Net::HTTPTooManyRequests,
452
+ Net::HTTPInternalServerError,
453
+ Net::HTTPServiceUnavailable
454
+ handle_server_connection_exception(response, endpoint)
455
+ when Net::HTTPBadRequest,
456
+ Net::HTTPForbidden,
457
+ Net::HTTPNotFound,
458
+ Net::HTTPMethodNotAllowed,
459
+ Net::HTTPProxyAuthenticationRequired,
460
+ Net::HTTPLengthRequired,
461
+ Net::HTTPRequestEntityTooLarge,
462
+ Net::HTTPRequestURITooLong,
463
+ Net::HTTPUnsupportedMediaType,
464
+ Net::HTTPExpectationFailed,
465
+ Net::HTTPUnsupportedMediaType,
466
+ Net::HTTPRequestHeaderFieldsTooLarge
467
+ handle_unrecoverable_server_exception(response, endpoint)
468
+ when Net::HTTPConflict,
469
+ Net::HTTPUnauthorized
470
+ handle_unauthorized_error_response(response, endpoint)
471
+ raise ForceRestartException, "#{response.code}: #{response.message}"
472
+ when Net::HTTPGone
473
+ handle_gone_response(response, endpoint)
474
+ else
475
+ record_endpoint_attempts_supportability_metrics(endpoint)
476
+ record_error_response_supportability_metrics(response.code)
477
+ raise UnrecoverableServerException, "#{response.code}: #{response.message}"
478
+ end
479
+ response
480
+ end
481
+
482
+ def handle_server_connection_exception(response, endpoint)
483
+ record_endpoint_attempts_supportability_metrics(endpoint)
484
+ raise ServerConnectionException, "#{response.code}: #{response.message}"
485
+ end
486
+
487
+ def handle_unrecoverable_server_exception(response, endpoint)
488
+ record_endpoint_attempts_supportability_metrics(endpoint)
489
+ record_error_response_supportability_metrics(response.code)
490
+ raise UnrecoverableServerException, "#{response.code}: #{response.message}"
491
+ end
492
+
493
+ def handle_unauthorized_error_response(response, endpoint)
494
+ record_endpoint_attempts_supportability_metrics(endpoint)
495
+ record_error_response_supportability_metrics(response.code)
496
+ end
497
+
498
+ def handle_gone_response(response, endpoint)
499
+ record_endpoint_attempts_supportability_metrics(endpoint)
500
+ record_error_response_supportability_metrics(response.code)
501
+ raise ForceDisconnectException, "#{response.code}: #{response.message}"
502
+ end
503
+
369
504
  def remote_method_uri(method)
370
505
  @remote_method_uris[method]
371
506
  end
@@ -379,16 +514,17 @@ module NewRelic
379
514
  def generate_remote_method_uri(method)
380
515
  params = {
381
516
  'protocol_version' => PROTOCOL_VERSION,
382
- 'license_key' => license_key,
383
- 'run_id' => @agent_id,
384
- 'method' => method,
385
- 'marshal_format' => 'json', # Other formats are explicitly
386
- # ruled out; see the initializer
517
+ 'license_key' => license_key,
518
+ 'run_id' => @agent_id,
519
+ 'method' => method,
520
+ 'marshal_format' => 'json' # Other formats are explicitly
521
+ # ruled out; see the initializer
387
522
  }
388
523
 
389
- uri = "/agent_listener/invoke_raw_method?"
390
- uri << params.map do |k,v|
524
+ uri = String.new('/agent_listener/invoke_raw_method?')
525
+ uri << params.map do |k, v|
391
526
  next unless v
527
+
392
528
  "#{k}=#{v}"
393
529
  end.compact.join('&')
394
530
  uri
@@ -403,42 +539,21 @@ module NewRelic
403
539
  # enough to be worth compressing, and handles any errors the
404
540
  # server may return
405
541
  def invoke_remote(method, payload = [], options = {})
406
- start_ts = Time.now
407
-
408
- data, size, serialize_finish_ts, request_send_ts, response_check_ts = nil
409
- begin
410
- data = @marshaller.dump(payload, options)
411
- rescue StandardError, SystemStackError => e
412
- handle_serialization_error(method, e)
413
- end
414
- serialize_finish_ts = Time.now
415
-
416
- data, encoding = compress_request_if_needed(data, method)
417
- size = data.size
418
-
419
- uri = remote_method_uri(method)
420
- full_uri = "#{@collector}#{uri}"
421
-
422
- @audit_logger.log_request(full_uri, payload, @marshaller)
423
- request_send_ts = Time.now
424
- response = send_request(:data => data,
425
- :uri => uri,
426
- :encoding => encoding,
427
- :collector => @collector,
428
- :endpoint => method)
429
- response_check_ts = Time.now
542
+ start_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
543
+ request_send_ts, response_check_ts = nil
544
+ data, encoding, size, serialize_finish_ts = marshal_payload(method, payload, options)
545
+ prep_collector(method)
546
+ response, request_send_ts, response_check_ts = invoke_remote_send_request(method, payload, data, encoding)
430
547
  @marshaller.load(decompress_response(response))
431
548
  ensure
432
549
  record_timing_supportability_metrics(method, start_ts, serialize_finish_ts, request_send_ts, response_check_ts)
433
- if size
434
- record_size_supportability_metrics(method, size, options[:item_count])
435
- end
550
+ record_size_supportability_metrics(method, size, options[:item_count]) if size
436
551
  end
437
552
 
438
553
  def handle_serialization_error(method, e)
439
554
  NewRelic::Agent.increment_metric("Supportability/serialization_failure")
440
555
  NewRelic::Agent.increment_metric("Supportability/serialization_failure/#{method}")
441
- msg = "Failed to serialize #{method} data using #{@marshaller.class.to_s}: #{e.inspect}"
556
+ msg = "Failed to serialize #{method} data using #{@marshaller.class}: #{e.inspect}"
442
557
  error = SerializationError.new(msg)
443
558
  error.set_backtrace(e.backtrace)
444
559
  raise error
@@ -446,13 +561,13 @@ module NewRelic
446
561
 
447
562
  def record_timing_supportability_metrics(method, start_ts, serialize_finish_ts, request_send_ts, response_check_ts)
448
563
  serialize_time = serialize_finish_ts && (serialize_finish_ts - start_ts)
449
- request_duration = response_check_ts && (response_check_ts - request_send_ts).to_f
564
+ request_duration = response_check_ts && (response_check_ts - request_send_ts)
450
565
  if request_duration
451
- NewRelic::Agent.record_metric("Supportability/Agent/Collector/#{method.to_s}/Duration", request_duration)
566
+ NewRelic::Agent.record_metric("Supportability/Agent/Collector/#{method}/Duration", request_duration)
452
567
  end
453
568
  if serialize_time
454
569
  NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize", serialize_time)
455
- NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize/#{method.to_s}", serialize_time)
570
+ NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize/#{method}", serialize_time)
456
571
  end
457
572
  end
458
573
 
@@ -466,8 +581,8 @@ module NewRelic
466
581
  # of items as arguments.
467
582
  def record_size_supportability_metrics(method, size_bytes, item_count)
468
583
  metrics = [
469
- "Supportability/invoke_remote_size",
470
- "Supportability/invoke_remote_size/#{method.to_s}"
584
+ "Supportability/Ruby/Collector/Output/Bytes",
585
+ "Supportability/Ruby/Collector/#{method}/Output/Bytes"
471
586
  ]
472
587
  # we may not have an item count, in which case, just record 0 for the exclusive time
473
588
  item_count ||= 0
@@ -478,7 +593,8 @@ module NewRelic
478
593
  # than the limit configured in the control object
479
594
  def check_post_size(post_string, endpoint)
480
595
  return if post_string.size < Agent.config[:max_payload_size_in_bytes]
481
- ::NewRelic::Agent.logger.debug "Tried to send too much data: #{post_string.size} bytes"
596
+
597
+ ::NewRelic::Agent.logger.debug("Tried to send too much data: #{post_string.size} bytes")
482
598
  NewRelic::Agent.increment_metric("Supportability/Agent/Collector/#{endpoint}/MaxPayloadSizeLimit")
483
599
  raise UnrecoverableServerException.new('413 Request Entity Too Large')
484
600
  end
@@ -494,89 +610,15 @@ module NewRelic
494
610
  # contact
495
611
  # - :data => the data to send as the body of the request
496
612
  def send_request(opts)
497
- headers = {
498
- 'Content-Encoding' => opts[:encoding],
499
- 'Host' => opts[:collector].name
500
- }
501
- headers.merge!(@request_headers_map) if @request_headers_map
502
-
503
- if Agent.config[:put_for_data_send]
504
- request = Net::HTTP::Put.new(opts[:uri], headers)
505
- else
506
- request = Net::HTTP::Post.new(opts[:uri], headers)
507
- end
508
- request['user-agent'] = user_agent
509
- request.content_type = "application/octet-stream"
510
- request.body = opts[:data]
511
-
512
- response = nil
513
- attempts = 0
514
- max_attempts = 2
515
- endpoint = opts[:endpoint]
613
+ request = prep_request(opts)
614
+ response = relay_request(request, opts)
615
+ return response if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPAccepted)
516
616
 
517
- begin
518
- attempts += 1
519
- conn = http_connection
520
- ::NewRelic::Agent.logger.debug "Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}"
521
- Timeout.timeout(@request_timeout) do
522
- response = conn.request(request)
523
- end
524
- rescue *CONNECTION_ERRORS => e
525
- close_shared_connection
526
- if attempts < max_attempts
527
- ::NewRelic::Agent.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
528
- retry
529
- else
530
- raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
531
- end
532
- end
533
-
534
- log_response(response)
535
-
536
- case response
537
- when Net::HTTPSuccess,
538
- Net::HTTPAccepted
539
- true # do nothing
540
- when Net::HTTPRequestTimeOut,
541
- Net::HTTPTooManyRequests,
542
- Net::HTTPInternalServerError,
543
- Net::HTTPServiceUnavailable
544
- record_endpoint_attempts_supportability_metrics(endpoint)
545
- raise ServerConnectionException, "#{response.code}: #{response.message}"
546
- when Net::HTTPBadRequest,
547
- Net::HTTPForbidden,
548
- Net::HTTPNotFound,
549
- Net::HTTPMethodNotAllowed,
550
- Net::HTTPProxyAuthenticationRequired,
551
- Net::HTTPLengthRequired,
552
- Net::HTTPRequestEntityTooLarge,
553
- Net::HTTPRequestURITooLong,
554
- Net::HTTPUnsupportedMediaType,
555
- Net::HTTPExpectationFailed,
556
- Net::HTTPUnsupportedMediaType,
557
- Net::HTTPRequestHeaderFieldsTooLarge
558
- record_endpoint_attempts_supportability_metrics(endpoint)
559
- record_error_response_supportability_metrics(response.code)
560
- raise UnrecoverableServerException, "#{response.code}: #{response.message}"
561
- when Net::HTTPConflict,
562
- Net::HTTPUnauthorized
563
- record_endpoint_attempts_supportability_metrics(endpoint)
564
- record_error_response_supportability_metrics(response.code)
565
- raise ForceRestartException, "#{response.code}: #{response.message}"
566
- when Net::HTTPGone
567
- record_endpoint_attempts_supportability_metrics(endpoint)
568
- record_error_response_supportability_metrics(response.code)
569
- raise ForceDisconnectException, "#{response.code}: #{response.message}"
570
- else
571
- record_endpoint_attempts_supportability_metrics(endpoint)
572
- record_error_response_supportability_metrics(response.code)
573
- raise UnrecoverableServerException, "#{response.code}: #{response.message}"
574
- end
575
- response
617
+ handle_error_response(response, opts[:endpoint])
576
618
  end
577
619
 
578
620
  def log_response(response)
579
- ::NewRelic::Agent.logger.debug "Received response, status: #{response.code}, encoding: '#{response['content-encoding']}'"
621
+ ::NewRelic::Agent.logger.debug("Received response, status: #{response.code}, encoding: '#{response['content-encoding']}'")
580
622
  end
581
623
 
582
624
  # Per protocol 17, this metric should be recorded for all error response codes
@@ -592,11 +634,9 @@ module NewRelic
592
634
  # Decompresses the response from the server, if it is gzip
593
635
  # encoded, otherwise returns it verbatim
594
636
  def decompress_response(response)
595
- if response['content-encoding'] == 'gzip'
596
- Zlib::GzipReader.new(StringIO.new(response.body)).read
597
- else
598
- response.body
599
- end
637
+ return response.body unless response['content-encoding'] == 'gzip'
638
+
639
+ Zlib::GzipReader.new(StringIO.new(response.body)).read
600
640
  end
601
641
 
602
642
  # Sets the user agent for connections to the server, to
@@ -604,13 +644,47 @@ module NewRelic
604
644
  # the ruby version and also zlib version if available since
605
645
  # that may cause corrupt compression if there is a problem.
606
646
  def user_agent
607
- ruby_description = ''
608
- # note the trailing space!
609
- ruby_description << "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " if defined?(::RUBY_VERSION) && defined?(::RUBY_PLATFORM)
610
- zlib_version = ''
611
- zlib_version << "zlib/#{Zlib.zlib_version}" if defined?(::Zlib) && Zlib.respond_to?(:zlib_version)
647
+ if defined?(::RUBY_VERSION) && defined?(::RUBY_PLATFORM)
648
+ ruby_description = "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " # NOTE: the trailing space!
649
+ end
650
+ zlib_version = "zlib/#{Zlib.zlib_version}" if defined?(::Zlib) && Zlib.respond_to?(:zlib_version)
612
651
  "NewRelic-RubyAgent/#{NewRelic::VERSION::STRING} #{ruby_description}#{zlib_version}"
613
652
  end
653
+
654
+ def marshal_payload(method, payload, options)
655
+ begin
656
+ data = @marshaller.dump(payload, options)
657
+ rescue StandardError, SystemStackError => e
658
+ handle_serialization_error(method, e)
659
+ end
660
+ serialize_finish_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
661
+
662
+ size = data.size # only the uncompressed size is reported
663
+ data, encoding = compress_request_if_needed(data, method)
664
+
665
+ [data, encoding, size, serialize_finish_ts]
666
+ end
667
+
668
+ def prep_collector(method)
669
+ # Preconnect needs to always use the configured collector host, not the redirect host
670
+ # We reset it here so we are always using the configured collector during our creation of the new connection
671
+ # and we also don't want to keep the previous redirect host around anymore
672
+ @collector = @configured_collector if method == :preconnect
673
+ end
674
+
675
+ def invoke_remote_send_request(method, payload, data, encoding)
676
+ uri = remote_method_uri(method)
677
+ full_uri = "#{@collector}#{uri}"
678
+
679
+ @audit_logger.log_request(full_uri, payload, @marshaller)
680
+ request_send_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
681
+ response = send_request(:data => data,
682
+ :uri => uri,
683
+ :encoding => encoding,
684
+ :collector => @collector,
685
+ :endpoint => method)
686
+ [response, request_send_ts, Process.clock_gettime(Process::CLOCK_MONOTONIC)]
687
+ end
614
688
  end
615
689
  end
616
690
  end