newrelic_rpm 6.15.0 → 9.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (485) hide show
  1. checksums.yaml +4 -4
  2. data/.build_ignore +26 -0
  3. data/CHANGELOG.md +4176 -2789
  4. data/CONTRIBUTING.md +32 -13
  5. data/Gemfile +1 -2
  6. data/LICENSE +0 -6
  7. data/README.md +29 -22
  8. data/Rakefile +33 -35
  9. data/THIRD_PARTY_NOTICES.md +14 -199
  10. data/Thorfile +5 -0
  11. data/bin/newrelic +4 -9
  12. data/bin/newrelic_rpm +15 -0
  13. data/bin/nrdebug +85 -62
  14. data/init.rb +6 -8
  15. data/install.rb +2 -2
  16. data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
  17. data/lib/new_relic/agent/agent.rb +99 -941
  18. data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
  19. data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
  20. data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
  21. data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
  22. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
  23. data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
  24. data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
  25. data/lib/new_relic/agent/agent_logger.rb +27 -23
  26. data/lib/new_relic/agent/attribute_filter.rb +67 -50
  27. data/lib/new_relic/agent/attribute_pre_filtering.rb +109 -0
  28. data/lib/new_relic/agent/attribute_processing.rb +9 -9
  29. data/lib/new_relic/agent/attributes.rb +5 -4
  30. data/lib/new_relic/agent/audit_logger.rb +13 -8
  31. data/lib/new_relic/agent/autostart.rb +21 -20
  32. data/lib/new_relic/agent/chained_call.rb +1 -1
  33. data/lib/new_relic/agent/commands/agent_command.rb +4 -4
  34. data/lib/new_relic/agent/commands/agent_command_router.rb +15 -13
  35. data/lib/new_relic/agent/commands/thread_profiler_session.rb +16 -14
  36. data/lib/new_relic/agent/configuration/default_source.rb +1608 -1182
  37. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  38. data/lib/new_relic/agent/configuration/environment_source.rb +13 -11
  39. data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
  40. data/lib/new_relic/agent/configuration/high_security_source.rb +11 -12
  41. data/lib/new_relic/agent/configuration/manager.rb +103 -75
  42. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  43. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  44. data/lib/new_relic/agent/configuration/security_policy_source.rb +92 -95
  45. data/lib/new_relic/agent/configuration/server_source.rb +43 -41
  46. data/lib/new_relic/agent/configuration/yaml_source.rb +47 -10
  47. data/lib/new_relic/agent/configuration.rb +1 -1
  48. data/lib/new_relic/agent/connect/request_builder.rb +18 -18
  49. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  50. data/lib/new_relic/agent/custom_event_aggregator.rb +42 -16
  51. data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
  52. data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
  53. data/lib/new_relic/agent/database/obfuscator.rb +4 -4
  54. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  55. data/lib/new_relic/agent/database.rb +45 -53
  56. data/lib/new_relic/agent/database_adapter.rb +3 -1
  57. data/lib/new_relic/agent/datastores/metric_helper.rb +21 -22
  58. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  59. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +17 -21
  60. data/lib/new_relic/agent/datastores/mongo.rb +6 -11
  61. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  62. data/lib/new_relic/agent/datastores/redis.rb +9 -15
  63. data/lib/new_relic/agent/datastores.rb +13 -15
  64. data/lib/new_relic/agent/deprecator.rb +1 -1
  65. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
  66. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +45 -40
  67. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
  68. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +23 -23
  69. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +52 -54
  70. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +10 -11
  71. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +82 -83
  72. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +42 -41
  73. data/lib/new_relic/agent/distributed_tracing.rb +33 -101
  74. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  75. data/lib/new_relic/agent/error_collector.rb +105 -58
  76. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  77. data/lib/new_relic/agent/error_filter.rb +174 -0
  78. data/lib/new_relic/agent/error_trace_aggregator.rb +9 -7
  79. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  80. data/lib/new_relic/agent/event_buffer.rb +7 -8
  81. data/lib/new_relic/agent/event_listener.rb +1 -2
  82. data/lib/new_relic/agent/event_loop.rb +27 -25
  83. data/lib/new_relic/agent/external.rb +11 -44
  84. data/lib/new_relic/agent/guid_generator.rb +13 -11
  85. data/lib/new_relic/agent/harvester.rb +5 -8
  86. data/lib/new_relic/agent/heap.rb +8 -9
  87. data/lib/new_relic/agent/hostname.rb +21 -14
  88. data/lib/new_relic/agent/http_clients/abstract.rb +22 -31
  89. data/lib/new_relic/agent/http_clients/async_http_wrappers.rb +80 -0
  90. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +14 -17
  91. data/lib/new_relic/agent/http_clients/ethon_wrappers.rb +109 -0
  92. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +15 -17
  93. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +7 -6
  94. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +8 -9
  95. data/lib/new_relic/agent/http_clients/httpx_wrappers.rb +91 -0
  96. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +13 -8
  97. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +12 -13
  98. data/lib/new_relic/agent/http_clients/uri_util.rb +3 -5
  99. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
  100. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
  101. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +41 -33
  102. data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
  103. data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
  104. data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
  105. data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
  106. data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
  107. data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
  108. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +20 -21
  109. data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
  110. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  111. data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
  112. data/lib/new_relic/agent/instrumentation/active_record.rb +41 -38
  113. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +87 -75
  114. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +54 -66
  115. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +6 -6
  116. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +30 -22
  117. data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
  118. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
  119. data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
  120. data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/chain.rb +69 -0
  121. data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb +13 -0
  122. data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/prepend.rb +37 -0
  123. data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger.rb +23 -0
  124. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  125. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +24 -0
  126. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  127. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +26 -0
  128. data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
  129. data/lib/new_relic/agent/instrumentation/async_http/chain.rb +23 -0
  130. data/lib/new_relic/agent/instrumentation/async_http/instrumentation.rb +37 -0
  131. data/lib/new_relic/agent/instrumentation/async_http/prepend.rb +15 -0
  132. data/lib/new_relic/agent/instrumentation/async_http.rb +28 -0
  133. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +159 -0
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
  137. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  138. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +20 -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 +74 -63
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +225 -0
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  145. data/lib/new_relic/agent/instrumentation/curb.rb +14 -246
  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 +51 -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 +30 -53
  152. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  153. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +70 -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/ethon/chain.rb +39 -0
  157. data/lib/new_relic/agent/instrumentation/ethon/instrumentation.rb +105 -0
  158. data/lib/new_relic/agent/instrumentation/ethon/prepend.rb +35 -0
  159. data/lib/new_relic/agent/instrumentation/ethon.rb +39 -0
  160. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +11 -7
  161. data/lib/new_relic/agent/instrumentation/excon.rb +27 -29
  162. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +27 -0
  163. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +20 -0
  164. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +25 -0
  165. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  166. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  167. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +104 -0
  168. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  169. data/lib/new_relic/agent/instrumentation/grape.rb +16 -117
  170. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  171. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +94 -0
  172. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  173. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  174. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  175. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  176. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +138 -0
  177. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  178. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  179. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  180. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  181. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  182. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +41 -0
  183. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  184. data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
  185. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  186. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +34 -0
  187. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  188. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  189. data/lib/new_relic/agent/instrumentation/httpx/chain.rb +20 -0
  190. data/lib/new_relic/agent/instrumentation/httpx/instrumentation.rb +51 -0
  191. data/lib/new_relic/agent/instrumentation/httpx/prepend.rb +15 -0
  192. data/lib/new_relic/agent/instrumentation/httpx.rb +27 -0
  193. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
  194. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  195. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +69 -0
  196. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  197. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  198. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  199. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +59 -128
  200. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  201. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +99 -0
  202. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
  203. data/lib/new_relic/agent/instrumentation/memcache.rb +58 -74
  204. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +15 -14
  205. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +6 -8
  206. data/lib/new_relic/agent/instrumentation/mongo.rb +6 -137
  207. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +24 -23
  208. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  209. data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +18 -14
  210. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  211. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  212. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +56 -10
  213. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  214. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +32 -0
  215. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  216. data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
  217. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
  218. data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
  219. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  220. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  221. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +81 -0
  222. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  223. data/lib/new_relic/agent/instrumentation/rack.rb +32 -142
  224. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +25 -56
  225. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
  226. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
  227. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -5
  228. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
  229. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  230. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  231. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +146 -0
  232. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  233. data/lib/new_relic/agent/instrumentation/rake.rb +17 -158
  234. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  235. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  236. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +98 -0
  237. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  238. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  239. data/lib/new_relic/agent/instrumentation/redis.rb +19 -108
  240. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  241. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  242. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +38 -0
  243. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  244. data/lib/new_relic/agent/instrumentation/resque.rb +32 -43
  245. data/lib/new_relic/agent/instrumentation/roda/chain.rb +43 -0
  246. data/lib/new_relic/agent/instrumentation/roda/ignorer.rb +45 -0
  247. data/lib/new_relic/agent/instrumentation/roda/instrumentation.rb +68 -0
  248. data/lib/new_relic/agent/instrumentation/roda/prepend.rb +24 -0
  249. data/lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb +29 -0
  250. data/lib/new_relic/agent/instrumentation/roda.rb +36 -0
  251. data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
  252. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +12 -12
  253. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +24 -0
  254. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  255. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +60 -0
  256. data/lib/new_relic/agent/instrumentation/sidekiq.rb +27 -65
  257. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  258. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
  259. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +130 -0
  260. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  261. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -6
  262. data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
  263. data/lib/new_relic/agent/instrumentation/stripe.rb +28 -0
  264. data/lib/new_relic/agent/instrumentation/stripe_subscriber.rb +77 -0
  265. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  266. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +24 -0
  267. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  268. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  269. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  270. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +46 -0
  271. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  272. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  273. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  274. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +84 -0
  275. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  276. data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
  277. data/lib/new_relic/agent/instrumentation/view_component/chain.rb +21 -0
  278. data/lib/new_relic/agent/instrumentation/view_component/instrumentation.rb +39 -0
  279. data/lib/new_relic/agent/instrumentation/view_component/prepend.rb +13 -0
  280. data/lib/new_relic/agent/instrumentation/view_component.rb +26 -0
  281. data/lib/new_relic/agent/instrumentation.rb +1 -1
  282. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  283. data/lib/new_relic/agent/javascript_instrumentor.rb +58 -48
  284. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  285. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  286. data/lib/new_relic/agent/log_event_aggregator.rb +282 -0
  287. data/lib/new_relic/agent/log_event_attributes.rb +115 -0
  288. data/lib/new_relic/agent/log_once.rb +1 -1
  289. data/lib/new_relic/agent/log_priority.rb +20 -0
  290. data/lib/new_relic/agent/logging.rb +95 -52
  291. data/lib/new_relic/agent/memory_logger.rb +2 -2
  292. data/lib/new_relic/agent/messaging.rb +72 -86
  293. data/lib/new_relic/agent/method_tracer.rb +159 -154
  294. data/lib/new_relic/agent/method_tracer_helpers.rb +109 -11
  295. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -19
  296. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  297. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  298. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +17 -9
  299. data/lib/new_relic/agent/monitors.rb +6 -7
  300. data/lib/new_relic/agent/new_relic_service/encoders.rb +9 -9
  301. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
  302. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  303. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
  304. data/lib/new_relic/agent/new_relic_service.rb +282 -213
  305. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  306. data/lib/new_relic/agent/null_logger.rb +7 -3
  307. data/lib/new_relic/agent/obfuscator.rb +7 -11
  308. data/lib/new_relic/agent/parameter_filtering.rb +29 -15
  309. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  310. data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
  311. data/lib/new_relic/agent/pipe_service.rb +13 -8
  312. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  313. data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -12
  314. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  315. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -14
  316. data/lib/new_relic/agent/rules_engine.rb +6 -5
  317. data/lib/new_relic/agent/sampler.rb +5 -5
  318. data/lib/new_relic/agent/sampler_collection.rb +4 -5
  319. data/lib/new_relic/agent/samplers/cpu_sampler.rb +8 -7
  320. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +20 -17
  321. data/lib/new_relic/agent/samplers/memory_sampler.rb +32 -21
  322. data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
  323. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  324. data/lib/new_relic/agent/span_event_aggregator.rb +15 -15
  325. data/lib/new_relic/agent/span_event_primitive.rb +77 -59
  326. data/lib/new_relic/agent/sql_sampler.rb +20 -21
  327. data/lib/new_relic/agent/stats.rb +79 -42
  328. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  329. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  330. data/lib/new_relic/agent/stats_engine.rb +8 -8
  331. data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
  332. data/lib/new_relic/agent/system_info.rb +113 -67
  333. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  334. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  335. data/lib/new_relic/agent/threading/backtrace_service.rb +17 -21
  336. data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
  337. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
  338. data/lib/new_relic/agent/tracer.rb +101 -96
  339. data/lib/new_relic/agent/transaction/abstract_segment.rb +176 -52
  340. data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
  341. data/lib/new_relic/agent/transaction/distributed_tracer.rb +65 -57
  342. data/lib/new_relic/agent/transaction/distributed_tracing.rb +46 -48
  343. data/lib/new_relic/agent/transaction/external_request_segment.rb +52 -39
  344. data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -37
  345. data/lib/new_relic/agent/transaction/request_attributes.rb +78 -42
  346. data/lib/new_relic/agent/transaction/segment.rb +20 -10
  347. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  348. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
  349. data/lib/new_relic/agent/transaction/trace.rb +16 -12
  350. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  351. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  352. data/lib/new_relic/agent/transaction/trace_node.rb +30 -28
  353. data/lib/new_relic/agent/transaction/tracing.rb +32 -13
  354. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
  355. data/lib/new_relic/agent/transaction.rb +229 -178
  356. data/lib/new_relic/agent/transaction_error_primitive.rb +43 -25
  357. data/lib/new_relic/agent/transaction_event_aggregator.rb +16 -16
  358. data/lib/new_relic/agent/transaction_event_primitive.rb +51 -33
  359. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  360. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  361. data/lib/new_relic/agent/transaction_sampler.rb +7 -8
  362. data/lib/new_relic/agent/transaction_time_aggregator.rb +32 -27
  363. data/lib/new_relic/agent/utilization/aws.rb +34 -4
  364. data/lib/new_relic/agent/utilization/azure.rb +6 -6
  365. data/lib/new_relic/agent/utilization/gcp.rb +11 -13
  366. data/lib/new_relic/agent/utilization/pcf.rb +6 -5
  367. data/lib/new_relic/agent/utilization/vendor.rb +45 -32
  368. data/lib/new_relic/agent/utilization_data.rb +7 -5
  369. data/lib/new_relic/agent/vm/c_ruby_vm.rb +99 -0
  370. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  371. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
  372. data/lib/new_relic/agent/vm/snapshot.rb +5 -5
  373. data/lib/new_relic/agent/vm.rb +3 -3
  374. data/lib/new_relic/agent/worker_loop.rb +10 -12
  375. data/lib/new_relic/agent.rb +204 -111
  376. data/lib/new_relic/base64.rb +25 -0
  377. data/lib/new_relic/cli/command.rb +26 -25
  378. data/lib/new_relic/cli/commands/deployments.rb +100 -49
  379. data/lib/new_relic/cli/commands/install.rb +31 -34
  380. data/lib/new_relic/coerce.rb +15 -13
  381. data/lib/new_relic/collection_helper.rb +50 -48
  382. data/lib/new_relic/constants.rb +13 -12
  383. data/lib/new_relic/control/class_methods.rb +6 -12
  384. data/lib/new_relic/control/frameworks/external.rb +2 -2
  385. data/lib/new_relic/control/frameworks/rails.rb +60 -30
  386. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  387. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  388. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  389. data/lib/new_relic/control/frameworks/roda.rb +20 -0
  390. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  391. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  392. data/lib/new_relic/control/frameworks.rb +1 -1
  393. data/lib/new_relic/control/instance_methods.rb +27 -45
  394. data/lib/new_relic/control/instrumentation.rb +25 -11
  395. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  396. data/lib/new_relic/control/server_methods.rb +3 -4
  397. data/lib/new_relic/control.rb +1 -2
  398. data/lib/new_relic/delayed_job_injection.rb +1 -1
  399. data/lib/new_relic/dependency_detection.rb +141 -32
  400. data/lib/new_relic/environment_report.rb +41 -33
  401. data/lib/new_relic/helper.rb +49 -7
  402. data/lib/new_relic/language_support.rb +39 -6
  403. data/lib/new_relic/latest_changes.rb +10 -9
  404. data/lib/new_relic/local_environment.rb +42 -37
  405. data/lib/new_relic/metric_data.rb +31 -26
  406. data/lib/new_relic/metric_spec.rb +8 -6
  407. data/lib/new_relic/noticed_error.rb +43 -46
  408. data/lib/new_relic/rack/agent_hooks.rb +2 -2
  409. data/lib/new_relic/rack/agent_middleware.rb +3 -17
  410. data/lib/new_relic/rack/browser_monitoring.rb +135 -121
  411. data/lib/new_relic/rack.rb +1 -1
  412. data/lib/new_relic/recipes/capistrano3.rb +4 -62
  413. data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
  414. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  415. data/lib/new_relic/recipes.rb +1 -1
  416. data/lib/new_relic/supportability_helper.rb +14 -12
  417. data/lib/new_relic/traced_thread.rb +38 -0
  418. data/lib/new_relic/version.rb +6 -17
  419. data/lib/newrelic_rpm.rb +20 -33
  420. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
  421. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +9 -15
  422. data/lib/tasks/all.rb +3 -3
  423. data/lib/tasks/bump_version.rake +21 -0
  424. data/lib/tasks/config.rake +25 -119
  425. data/lib/tasks/coverage_report.rake +28 -0
  426. data/lib/tasks/helpers/config.html.erb +114 -0
  427. data/lib/tasks/helpers/format.rb +127 -0
  428. data/lib/tasks/helpers/matches.rb +12 -0
  429. data/lib/tasks/helpers/newrelicyml.rb +144 -0
  430. data/lib/tasks/helpers/prompt.rb +24 -0
  431. data/lib/tasks/helpers/version_bump.rb +62 -0
  432. data/lib/tasks/install.rake +8 -4
  433. data/lib/tasks/instrumentation_generator/README.md +63 -0
  434. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  435. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  436. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  437. data/lib/tasks/instrumentation_generator/templates/chain.tt +21 -0
  438. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
  439. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  440. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  441. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  442. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  443. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  444. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  445. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  446. data/lib/tasks/newrelic.rb +2 -1
  447. data/lib/tasks/newrelicyml.rake +13 -0
  448. data/lib/tasks/tests.rake +83 -17
  449. data/newrelic.yml +790 -4
  450. data/newrelic_rpm.gemspec +52 -43
  451. data/recipes/newrelic.rb +2 -2
  452. data/test/agent_helper.rb +252 -198
  453. metadata +275 -95
  454. data/.gitignore +0 -37
  455. data/.project +0 -23
  456. data/.yardopts +0 -26
  457. data/Guardfile +0 -25
  458. data/ROADMAP.md +0 -24
  459. data/bin/mongrel_rpm +0 -33
  460. data/bin/newrelic_cmd +0 -5
  461. data/cert/cacert.pem +0 -1177
  462. data/config/database.yml +0 -5
  463. data/config.dot +0 -278
  464. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  465. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  466. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
  467. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  468. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
  469. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  470. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  471. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  472. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  473. data/lib/new_relic/agent/instrumentation/net.rb +0 -70
  474. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  475. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  476. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  477. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  478. data/lib/new_relic/agent/range_extensions.rb +0 -47
  479. data/lib/new_relic/agent/supported_versions.rb +0 -275
  480. data/lib/new_relic/agent/vm/mri_vm.rb +0 -81
  481. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  482. data/lib/tasks/config.html.erb +0 -32
  483. data/lib/tasks/multiverse.rake +0 -2
  484. data/lib/tasks/multiverse.rb +0 -104
  485. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/configuration/dotted_hash'
6
6
 
@@ -26,9 +26,10 @@ module NewRelic
26
26
  def change_setting(policies, option, new_value)
27
27
  current_value = Agent.config[option]
28
28
  unless current_value == new_value
29
- NewRelic::Agent.logger.info \
29
+ NewRelic::Agent.logger.info( \
30
30
  "Setting changed: {#{option}: from #{current_value} " \
31
31
  "to #{new_value}}. Source: SecurityPolicySource"
32
+ )
32
33
  end
33
34
  policies[option] = new_value
34
35
  end
@@ -50,152 +51,145 @@ module NewRelic
50
51
  # permitted by the security policy and is also enabled by the config
51
52
 
52
53
  SECURITY_SETTINGS_MAP = {
53
- "record_sql" => [
54
+ 'record_sql' => [
54
55
  {
55
- option: :'transaction_tracer.record_sql',
56
- supported: true,
57
- enabled_fn: method(:record_sql_enabled?),
56
+ option: :'transaction_tracer.record_sql',
57
+ supported: true,
58
+ enabled_fn: method(:record_sql_enabled?),
58
59
  disabled_value: 'off',
59
- permitted_fn: proc { |policies|
60
+ permitted_fn: proc { |policies|
60
61
  change_setting(policies, :'transaction_tracer.record_sql', 'obfuscated')
61
62
  }
62
63
  },
63
64
  {
64
- option: :'slow_sql.record_sql',
65
- supported: true,
66
- enabled_fn: method(:record_sql_enabled?),
65
+ option: :'slow_sql.record_sql',
66
+ supported: true,
67
+ enabled_fn: method(:record_sql_enabled?),
67
68
  disabled_value: 'off',
68
- permitted_fn: proc { |policies|
69
+ permitted_fn: proc { |policies|
69
70
  change_setting(policies, :'slow_sql.record_sql', 'obfuscated')
70
71
  }
71
72
  },
72
73
  {
73
- option: :'mongo.capture_queries',
74
- supported: true,
75
- enabled_fn: method(:enabled?),
74
+ option: :'mongo.capture_queries',
75
+ supported: true,
76
+ enabled_fn: method(:enabled?),
76
77
  disabled_value: false,
77
- permitted_fn: proc{ |policies|
78
+ permitted_fn: proc { |policies|
78
79
  change_setting(policies, :'mongo.obfuscate_queries', true)
79
80
  }
80
81
  },
81
82
  {
82
- option: :'transaction_tracer.record_redis_arguments',
83
- supported: true,
84
- enabled_fn: method(:enabled?),
83
+ option: :'elasticsearch.capture_queries',
84
+ supported: true,
85
+ enabled_fn: method(:enabled?),
85
86
  disabled_value: false,
86
- permitted_fn: nil
87
+ permitted_fn: proc { |policies|
88
+ change_setting(policies, :'elasticsearch.obfuscate_queries', true)
89
+ }
90
+ },
91
+ {
92
+ option: :'transaction_tracer.record_redis_arguments',
93
+ supported: true,
94
+ enabled_fn: method(:enabled?),
95
+ disabled_value: false,
96
+ permitted_fn: nil
87
97
  }
88
98
  ],
89
- "attributes_include" => [
99
+ 'attributes_include' => [
90
100
  {
91
- option: :'attributes.include',
92
- supported: true,
93
- enabled_fn: method(:not_empty?),
101
+ option: :'attributes.include',
102
+ supported: true,
103
+ enabled_fn: method(:not_empty?),
94
104
  disabled_value: [],
95
- permitted_fn: nil
105
+ permitted_fn: nil
96
106
  },
97
107
  {
98
- option: :'transaction_tracer.attributes.include',
99
- supported: true,
100
- enabled_fn: method(:not_empty?),
108
+ option: :'transaction_tracer.attributes.include',
109
+ supported: true,
110
+ enabled_fn: method(:not_empty?),
101
111
  disabled_value: [],
102
- permitted_fn: nil
112
+ permitted_fn: nil
103
113
  },
104
114
  {
105
- option: :'transaction_events.attributes.include',
106
- supported: true,
107
- enabled_fn: method(:not_empty?),
115
+ option: :'transaction_events.attributes.include',
116
+ supported: true,
117
+ enabled_fn: method(:not_empty?),
108
118
  disabled_value: [],
109
- permitted_fn: nil
119
+ permitted_fn: nil
110
120
  },
111
121
  {
112
- option: :'error_collector.attributes.include',
113
- supported: true,
114
- enabled_fn: method(:not_empty?),
122
+ option: :'error_collector.attributes.include',
123
+ supported: true,
124
+ enabled_fn: method(:not_empty?),
115
125
  disabled_value: [],
116
- permitted_fn: nil
126
+ permitted_fn: nil
117
127
  },
118
128
  {
119
- option: :'browser_monitoring.attributes.include',
120
- supported: true,
121
- enabled_fn: method(:not_empty?),
129
+ option: :'browser_monitoring.attributes.include',
130
+ supported: true,
131
+ enabled_fn: method(:not_empty?),
122
132
  disabled_value: [],
123
- permitted_fn: nil
133
+ permitted_fn: nil
124
134
  },
125
135
  {
126
- option: :'span_events.attributes.include',
127
- supported: true,
128
- enabled_fn: method(:not_empty?),
136
+ option: :'span_events.attributes.include',
137
+ supported: true,
138
+ enabled_fn: method(:not_empty?),
129
139
  disabled_value: [],
130
- permitted_fn: nil
140
+ permitted_fn: nil
131
141
  },
132
142
  {
133
- option: :'transaction_segments.attributes.include',
134
- supported: true,
135
- enabled_fn: method(:not_empty?),
143
+ option: :'transaction_segments.attributes.include',
144
+ supported: true,
145
+ enabled_fn: method(:not_empty?),
136
146
  disabled_value: [],
137
- permitted_fn: nil
147
+ permitted_fn: nil
138
148
  }
139
149
  ],
140
- "allow_raw_exception_messages" => [
150
+ 'allow_raw_exception_messages' => [
141
151
  {
142
- option: :'strip_exception_messages.enabled',
143
- supported: true,
144
- enabled_fn: method(:enabled?),
152
+ option: :'strip_exception_messages.enabled',
153
+ supported: true,
154
+ enabled_fn: method(:enabled?),
145
155
  disabled_value: false,
146
- permitted_fn: nil
156
+ permitted_fn: nil
147
157
  }
148
158
  ],
149
- "custom_events" => [
159
+ 'custom_events' => [
150
160
  {
151
- option: :'custom_insights_events.enabled',
152
- supported: true,
153
- enabled_fn: method(:enabled?),
161
+ option: :'custom_insights_events.enabled',
162
+ supported: true,
163
+ enabled_fn: method(:enabled?),
154
164
  disabled_value: false,
155
- permitted_fn: nil
165
+ permitted_fn: nil
156
166
  }
157
167
  ],
158
- "custom_parameters" => [
168
+ 'custom_parameters' => [
159
169
  {
160
- option: :'custom_attributes.enabled',
161
- supported: true,
162
- enabled_fn: method(:enabled?),
170
+ option: :'custom_attributes.enabled',
171
+ supported: true,
172
+ enabled_fn: method(:enabled?),
163
173
  disabled_value: false,
164
- permitted_fn: nil
174
+ permitted_fn: nil
165
175
  }
166
176
  ],
167
- "custom_instrumentation_editor" => [
177
+ 'custom_instrumentation_editor' => [
168
178
  {
169
- option: nil,
170
- supported: false,
171
- enabled_fn: nil,
179
+ option: nil,
180
+ supported: false,
181
+ enabled_fn: nil,
172
182
  disabled_value: nil,
173
- permitted_fn: nil
174
- }
175
- ],
176
- "message_parameters" => [
177
- {
178
- option: :'message_tracer.segment_parameters.enabled',
179
- supported: true,
180
- enabled_fn: method(:enabled?),
181
- disabled_value: false,
182
- permitted_fn: nil
183
+ permitted_fn: nil
183
184
  }
184
185
  ],
185
- "job_arguments" => [
186
- {
187
- option: :'resque.capture_params',
188
- supported: true,
189
- enabled_fn: method(:enabled?),
190
- disabled_value: false,
191
- permitted_fn: nil
192
- },
186
+ 'message_parameters' => [
193
187
  {
194
- option: :'sidekiq.capture_params',
195
- supported: true,
196
- enabled_fn: method(:enabled?),
188
+ option: :'message_tracer.segment_parameters.enabled',
189
+ supported: true,
190
+ enabled_fn: method(:enabled?),
197
191
  disabled_value: false,
198
- permitted_fn: nil
192
+ permitted_fn: nil
199
193
  }
200
194
  ]
201
195
  }
@@ -204,13 +198,14 @@ module NewRelic
204
198
  super(build_overrides(security_policies))
205
199
  end
206
200
 
207
- ENABLED = "enabled".freeze
208
- COLON_COLON = "::".freeze
201
+ ENABLED = 'enabled'.freeze
202
+ COLON_COLON = '::'.freeze
209
203
 
210
204
  def build_overrides(security_policies)
211
205
  security_policies.inject({}) do |settings, (policy_name, policy_settings)|
212
206
  SECURITY_SETTINGS_MAP[policy_name].each do |policy|
213
207
  next unless policy[:supported]
208
+
214
209
  if policy_settings[ENABLED]
215
210
  if policy[:enabled_fn].call(policy[:option])
216
211
  if permitted_fn = policy[:permitted_fn]
@@ -218,15 +213,17 @@ module NewRelic
218
213
  end
219
214
  else
220
215
  config_source = Agent.config.source(policy[:option]).class.name.split(COLON_COLON).last
221
- NewRelic::Agent.logger.info \
216
+ NewRelic::Agent.logger.info( \
222
217
  "Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
223
218
  "Source: #{config_source}"
219
+ )
224
220
  end
225
221
  else
226
- settings[policy[:option]] = policy[:disabled_value]
227
- NewRelic::Agent.logger.info \
222
+ settings[policy[:option]] = policy[:disabled_value]
223
+ NewRelic::Agent.logger.info( \
228
224
  "Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
229
- "Source: SecurityPolicySource"
225
+ 'Source: SecurityPolicySource'
226
+ )
230
227
  end
231
228
  end
232
229
  settings
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -10,30 +10,30 @@ module NewRelic
10
10
  # response, but should still be merged in as config settings to the
11
11
  # main agent configuration.
12
12
  TOP_LEVEL_KEYS = [
13
- "account_id",
14
- "apdex_t",
15
- "application_id",
16
- "beacon",
17
- "browser_key",
18
- "browser_monitoring.debug",
19
- "browser_monitoring.loader",
20
- "browser_monitoring.loader_version",
21
- "cross_process_id",
22
- "data_report_period",
23
- "encoding_key",
24
- "entity_guid",
25
- "error_beacon",
26
- "js_agent_file",
27
- "js_agent_loader",
28
- "max_payload_size_in_bytes",
29
- "primary_application_id",
30
- "sampling_target",
31
- "sampling_target_period_in_seconds",
32
- "trusted_account_ids",
33
- "trusted_account_key"
13
+ 'account_id',
14
+ 'apdex_t',
15
+ 'application_id',
16
+ 'beacon',
17
+ 'browser_key',
18
+ 'browser_monitoring.debug',
19
+ 'browser_monitoring.loader',
20
+ 'browser_monitoring.loader_version',
21
+ 'cross_process_id',
22
+ 'data_report_period',
23
+ 'encoding_key',
24
+ 'entity_guid',
25
+ 'error_beacon',
26
+ 'js_agent_file',
27
+ 'js_agent_loader',
28
+ 'max_payload_size_in_bytes',
29
+ 'primary_application_id',
30
+ 'sampling_target',
31
+ 'sampling_target_period_in_seconds',
32
+ 'trusted_account_ids',
33
+ 'trusted_account_key'
34
34
  ]
35
35
 
36
- def initialize(connect_reply, existing_config={})
36
+ def initialize(connect_reply, existing_config = {})
37
37
  merged_settings = {}
38
38
 
39
39
  merge_top_level_keys(merged_settings, connect_reply)
@@ -70,38 +70,40 @@ module NewRelic
70
70
 
71
71
  def fix_transaction_threshold(merged_settings)
72
72
  # when value is "apdex_f" remove the config and defer to default
73
- if merged_settings['transaction_tracer.transaction_threshold'].to_s =~ /apdex_f/i
73
+ if /apdex_f/i.match?(merged_settings['transaction_tracer.transaction_threshold'].to_s)
74
74
  merged_settings.delete('transaction_tracer.transaction_threshold')
75
75
  end
76
76
  end
77
77
 
78
78
  EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES = {
79
- :'analytics_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
79
+ :'transaction_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
80
80
  :'custom_insights_events.max_samples_stored' => 'Supportability/EventHarvest/CustomEventData/HarvestLimit',
81
- :'error_collector.max_event_samples_stored'=> 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
82
- :'span_events.max_samples_stored'=> 'Supportability/EventHarvest/SpanEventData/HarvestLimit',
83
- :event_report_period => 'Supportability/EventHarvest/ReportPeriod'
81
+ :'error_collector.max_event_samples_stored' => 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
82
+ :'application_logging.forwarding.max_samples_stored' => 'Supportability/EventHarvest/LogEventData/HarvestLimit',
83
+ :'span_events.max_samples_stored' => 'Supportability/SpanEvent/Limit',
84
+ :event_report_period => 'Supportability/EventHarvest/ReportPeriod',
85
+ :'event_report_period.span_event_data' => 'Supportability/SpanEvent/ReportPeriod'
84
86
  }
85
87
 
86
88
  def add_event_harvest_config(merged_settings, connect_reply)
87
- return unless event_harvest_config_is_valid connect_reply
89
+ return unless event_harvest_config_is_valid(connect_reply)
88
90
 
89
91
  event_harvest_config = EventHarvestConfig.to_config_hash(connect_reply)
90
92
  EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES.each do |config_key, metric_name|
91
- NewRelic::Agent.record_metric metric_name, event_harvest_config[config_key]
93
+ NewRelic::Agent.record_metric(metric_name, event_harvest_config[config_key])
92
94
  end
93
95
 
94
- merged_settings.merge! event_harvest_config
96
+ merged_settings.merge!(event_harvest_config)
95
97
  end
96
98
 
97
- def event_harvest_config_is_valid connect_reply
99
+ def event_harvest_config_is_valid(connect_reply)
98
100
  event_harvest_config = connect_reply['event_harvest_config']
99
101
 
100
102
  if event_harvest_config.nil? \
101
103
  || event_harvest_config['harvest_limits'].values.min < 0 \
102
104
  || (event_harvest_config['report_period_ms'] / 1000) <= 0
103
- NewRelic::Agent.logger.warn "Invalid event harvest config found " \
104
- "in connect response; using default event report period."
105
+ NewRelic::Agent.logger.warn('Invalid event harvest config found ' \
106
+ 'in connect response; using default event report period.')
105
107
  false
106
108
  else
107
109
  true
@@ -132,19 +134,19 @@ module NewRelic
132
134
  # do the real enforcement there.
133
135
  def apply_feature_gates(merged_settings, connect_reply, existing_config)
134
136
  gated_features = {
135
- 'transaction_tracer.enabled' => 'collect_traces',
136
- 'slow_sql.enabled' => 'collect_traces',
137
- 'error_collector.enabled' => 'collect_errors',
138
- 'analytics_events.enabled' => 'collect_analytics_events',
137
+ 'transaction_tracer.enabled' => 'collect_traces',
138
+ 'slow_sql.enabled' => 'collect_traces',
139
+ 'error_collector.enabled' => 'collect_errors',
140
+ 'transaction_events.enabled' => 'collect_analytics_events',
139
141
  'custom_insights_events.enabled' => 'collect_custom_events',
140
142
  'error_collector.capture_events' => 'collect_error_events',
141
- 'span_events.enabled' => 'collect_span_events'
143
+ 'span_events.enabled' => 'collect_span_events'
142
144
  }
143
145
  gated_features.each do |config_key, gate_key|
144
146
  if connect_reply.has_key?(gate_key)
145
147
  allowed_by_server = connect_reply[gate_key]
146
- requested_value = ungated_value(config_key, merged_settings, existing_config)
147
- effective_value = (allowed_by_server && requested_value)
148
+ requested_value = ungated_value(config_key, merged_settings, existing_config)
149
+ effective_value = (allowed_by_server && requested_value)
148
150
  merged_settings[config_key] = effective_value
149
151
  end
150
152
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/configuration/dotted_hash'
6
6
 
@@ -11,9 +11,13 @@ module NewRelic
11
11
  attr_accessor :file_path, :failures
12
12
  attr_reader :generated_for_user, :license_key
13
13
 
14
+ # These are configuration options that have a value of a Hash
15
+ # This is used in YamlSource#dot_flattened prevent flattening these values
16
+ CONFIG_WITH_HASH_VALUE = %w[expected_messages ignore_messages]
17
+
14
18
  def initialize(path, env)
15
19
  @path = path
16
- config = {}
20
+ config = {}
17
21
  @failures = []
18
22
 
19
23
  # These are needed in process_erb for populating the newrelic.yml via
@@ -30,13 +34,14 @@ module NewRelic
30
34
  ::NewRelic::Agent.logger.info("Reading configuration from #{path} (#{Dir.pwd})")
31
35
  raw_file = File.read(@file_path)
32
36
  erb_file = process_erb(raw_file)
33
- config = process_yaml(erb_file, env, config, @file_path)
37
+ config = process_yaml(erb_file, env, config, @file_path)
34
38
  rescue ScriptError, StandardError => e
35
39
  log_failure("Failed to read or parse configuration file at #{path}", e)
36
40
  end
37
41
 
38
42
  substitute_transaction_threshold(config)
39
43
  booleanify_values(config, 'agent_enabled', 'enabled')
44
+ apply_aliases(config)
40
45
 
41
46
  super(config, true)
42
47
  end
@@ -59,8 +64,8 @@ module NewRelic
59
64
  end
60
65
 
61
66
  def warn_missing_config_file(path)
62
- based_on = 'unknown'
63
- source = ::NewRelic::Agent.config.source(:config_path)
67
+ based_on = 'unknown'
68
+ source = ::NewRelic::Agent.config.source(:config_path)
64
69
  candidate_paths = [path]
65
70
 
66
71
  case source
@@ -80,7 +85,7 @@ module NewRelic
80
85
  # so warn about it since it's very likely to be unintended.
81
86
  NewRelic::Agent.logger.warn(
82
87
  "No configuration file found. Working directory = #{Dir.pwd}",
83
- "Looked in these locations (based on #{based_on}): #{candidate_paths.join(", ")}"
88
+ "Looked in these locations (based on #{based_on}): #{candidate_paths.join(', ')}"
84
89
  )
85
90
  end
86
91
 
@@ -92,14 +97,19 @@ module NewRelic
92
97
  file.gsub!(/^\s*#.*$/, '#')
93
98
  ERB.new(file).result(binding)
94
99
  rescue ScriptError, StandardError => e
95
- log_failure("Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.", e)
100
+ log_failure('Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.', e)
96
101
  nil
97
102
  end
98
103
  end
99
104
 
100
105
  def process_yaml(file, env, config, path)
101
106
  if file
102
- confighash = YAML.load(file)
107
+ confighash = if YAML.respond_to?(:unsafe_load)
108
+ YAML.unsafe_load(file)
109
+ else
110
+ YAML.load(file)
111
+ end
112
+
103
113
  unless confighash.key?(env)
104
114
  log_failure("Config file at #{path} doesn't include a '#{env}' section!")
105
115
  end
@@ -115,6 +125,8 @@ module NewRelic
115
125
  config['transaction_tracer']['transaction_threshold'].to_s =~ /apdex_f/i
116
126
  # when value is "apdex_f" remove the config and defer to default
117
127
  config['transaction_tracer'].delete('transaction_threshold')
128
+ elsif /apdex_f/i.match?(config['transaction_tracer.transaction_threshold'].to_s)
129
+ config.delete('transaction_tracer.transaction_threshold')
118
130
  end
119
131
  end
120
132
 
@@ -124,9 +136,9 @@ module NewRelic
124
136
  if 'auto' == config[option]
125
137
  config.delete(option)
126
138
  elsif !config[option].nil? && !is_boolean?(config[option])
127
- coerced_value = !!(config[option].to_s =~ /yes|on|true/i)
139
+ coerced_value = config[option].to_s.match?(/yes|on|true/i)
128
140
  if !coerced_value
129
- log_failure "Unexpected value (#{config[option]}) for '#{option}' in #{@path}"
141
+ log_failure("Unexpected value (#{config[option]}) for '#{option}' in #{@path}")
130
142
  end
131
143
  config[option] = coerced_value
132
144
  end
@@ -141,6 +153,31 @@ module NewRelic
141
153
  ::NewRelic::Agent.logger.error(*messages)
142
154
  messages.each { |message| @failures << message }
143
155
  end
156
+
157
+ def dot_flattened(nested_hash, names = [], result = {})
158
+ nested_hash.each do |key, val|
159
+ next if val.nil?
160
+
161
+ if val.respond_to?(:has_key?) && !CONFIG_WITH_HASH_VALUE.include?(key)
162
+ dot_flattened(val, names + [key], result)
163
+ else
164
+ result[(names + [key]).join('.')] = val
165
+ end
166
+ end
167
+ result
168
+ end
169
+
170
+ def apply_aliases(config)
171
+ DEFAULTS.each do |config_setting, value|
172
+ next unless value[:aliases]
173
+
174
+ value[:aliases].each do |config_alias|
175
+ next unless config[config_setting].nil? && !config[config_alias.to_s].nil?
176
+
177
+ config[config_setting] = config[config_alias.to_s]
178
+ end
179
+ end
180
+ end
144
181
  end
145
182
  end
146
183
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/configuration/manager'
6
6
  require 'new_relic/agent/configuration/dotted_hash'
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/environment_report'
6
6
  require 'new_relic/agent/configuration/event_harvest_config'
@@ -8,9 +8,7 @@ require 'new_relic/agent/configuration/event_harvest_config'
8
8
  module NewRelic
9
9
  module Agent
10
10
  module Connect
11
-
12
11
  class RequestBuilder
13
-
14
12
  def initialize(new_relic_service, config, event_harvest_config, environment_report)
15
13
  @service = new_relic_service
16
14
  @config = config
@@ -18,38 +16,40 @@ module NewRelic
18
16
  @environment_report = sanitize_environment_report(environment_report)
19
17
  end
20
18
 
21
-
22
19
  # Initializes the hash of settings that we send to the
23
20
  # server. Returns a literal hash containing the options
24
21
  def connect_payload
25
22
  {
26
- :pid => $$,
27
- :host => local_host,
28
- :display_host => Agent.config[:'process_host.display_name'],
29
- :app_name => Agent.config[:app_name],
30
- :language => 'ruby',
31
- :labels => Agent.config.parsed_labels,
23
+ :pid => $$,
24
+ :host => local_host,
25
+ :display_host => Agent.config[:'process_host.display_name'],
26
+ :app_name => Agent.config[:app_name],
27
+ :language => 'ruby',
28
+ :labels => Agent.config.parsed_labels,
32
29
  :agent_version => NewRelic::VERSION::STRING,
33
- :environment => @environment_report,
34
- :metadata => environment_metadata,
35
- :settings => Agent.config.to_collector_hash,
30
+ :environment => @environment_report,
31
+ :metadata => environment_metadata,
32
+ :settings => Agent.config.to_collector_hash,
36
33
  :high_security => Agent.config[:high_security],
37
- :utilization => UtilizationData.new.to_collector_hash,
38
- :identifier => "ruby:#{local_host}:#{Agent.config[:app_name].sort.join(',')}",
34
+ :utilization => UtilizationData.new.to_collector_hash,
35
+ :identifier => "ruby:#{local_host}:#{Agent.config[:app_name].sort.join(',')}",
39
36
  :event_harvest_config => @event_harvest_config
40
37
  }
41
38
  end
42
39
 
43
40
  # We've seen objects in the environment report (Rails.env in
44
- # particular) that can't seralize to JSON. Cope with that here and
41
+ # particular) that can't serialize to JSON. Cope with that here and
45
42
  # clear out so downstream code doesn't have to check again.
46
43
  def sanitize_environment_report(environment_report)
47
- return [] unless @service.valid_to_marshal?(environment_report)
44
+ return NewRelic::EMPTY_ARRAY unless @service.valid_to_marshal?(environment_report)
45
+
48
46
  environment_report
49
47
  end
50
48
 
51
49
  def environment_metadata
52
- ENV.select {|k, v| k =~ /^NEW_RELIC_METADATA_/}
50
+ env_copy = {}
51
+ ENV.keys.each { |k| env_copy[k] = ENV[k] if /^NEW_RELIC_METADATA_/.match?(k) }
52
+ env_copy
53
53
  end
54
54
 
55
55
  def local_host