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
  # This module was introduced and largely extracted from the transaction event aggregator
6
6
  # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -16,25 +16,30 @@ module NewRelic
16
16
  module TransactionErrorPrimitive
17
17
  extend self
18
18
 
19
- SAMPLE_TYPE = 'TransactionError'.freeze
20
- TYPE_KEY = 'type'.freeze
21
- ERROR_CLASS_KEY = 'error.class'.freeze
22
- ERROR_MESSAGE_KEY = 'error.message'.freeze
23
- ERROR_EXPECTED_KEY = 'error.expected'.freeze
24
- TIMESTAMP_KEY = 'timestamp'.freeze
25
- PORT_KEY = 'port'.freeze
26
- NAME_KEY = 'transactionName'.freeze
27
- DURATION_KEY = 'duration'.freeze
28
- SAMPLED_KEY = 'sampled'.freeze
29
- GUID_KEY = 'nr.transactionGuid'.freeze
19
+ SAMPLE_TYPE = 'TransactionError'.freeze
20
+ TYPE_KEY = 'type'.freeze
21
+ ERROR_CLASS_KEY = 'error.class'.freeze
22
+ ERROR_MESSAGE_KEY = 'error.message'.freeze
23
+ ERROR_EXPECTED_KEY = 'error.expected'.freeze
24
+ TIMESTAMP_KEY = 'timestamp'.freeze
25
+ PORT_KEY = 'port'.freeze
26
+ NAME_KEY = 'transactionName'.freeze
27
+ DURATION_KEY = 'duration'.freeze
28
+ SAMPLED_KEY = 'sampled'.freeze
29
+ GUID_KEY = 'nr.transactionGuid'.freeze
30
30
  REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
31
- SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
32
- SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
33
- SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
34
- PRIORITY_KEY = "priority".freeze
35
- SPAN_ID_KEY = "spanId".freeze
31
+ SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'.freeze
32
+ SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'.freeze
33
+ SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'.freeze
34
+ SYNTHETICS_TYPE_KEY = 'nr.syntheticsType'
35
+ SYNTHETICS_INITIATOR_KEY = 'nr.syntheticsInitiator'
36
+ SYNTHETICS_KEY_PREFIX = 'nr.synthetics'
37
+ PRIORITY_KEY = 'priority'.freeze
38
+ SPAN_ID_KEY = 'spanId'.freeze
36
39
 
37
- def create noticed_error, payload, span_id
40
+ SYNTHETICS_PAYLOAD_EXPECTED = [:synthetics_resource_id, :synthetics_job_id, :synthetics_monitor_id, :synthetics_type, :synthetics_initiator]
41
+
42
+ def create(noticed_error, payload, span_id)
38
43
  [
39
44
  intrinsic_attributes_for(noticed_error, payload, span_id),
40
45
  noticed_error.custom_attributes,
@@ -42,7 +47,7 @@ module NewRelic
42
47
  ]
43
48
  end
44
49
 
45
- def intrinsic_attributes_for noticed_error, payload, span_id
50
+ def intrinsic_attributes_for(noticed_error, payload, span_id)
46
51
  attrs = {
47
52
  TYPE_KEY => SAMPLE_TYPE,
48
53
  ERROR_CLASS_KEY => noticed_error.exception_class_name,
@@ -59,22 +64,35 @@ module NewRelic
59
64
  attrs[DURATION_KEY] = payload[:duration]
60
65
  attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
61
66
  attrs[PRIORITY_KEY] = payload[:priority]
62
- append_synthetics payload, attrs
63
- append_cat payload, attrs
64
- DistributedTraceAttributes.copy_to_hash payload, attrs
65
- PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
67
+ append_synthetics(payload, attrs)
68
+ append_cat(payload, attrs)
69
+ DistributedTraceAttributes.copy_to_hash(payload, attrs)
70
+ PayloadMetricMapping.append_mapped_metrics(payload[:metrics], attrs)
71
+ else
72
+ attrs[PRIORITY_KEY] = rand.round(NewRelic::PRIORITY_PRECISION)
66
73
  end
67
74
 
68
75
  attrs
69
76
  end
70
77
 
71
- def append_synthetics payload, sample
78
+ def append_synthetics(payload, sample)
79
+ return unless payload[:synthetics_job_id]
80
+
72
81
  sample[SYNTHETICS_RESOURCE_ID_KEY] = payload[:synthetics_resource_id] if payload[:synthetics_resource_id]
73
82
  sample[SYNTHETICS_JOB_ID_KEY] = payload[:synthetics_job_id] if payload[:synthetics_job_id]
74
83
  sample[SYNTHETICS_MONITOR_ID_KEY] = payload[:synthetics_monitor_id] if payload[:synthetics_monitor_id]
84
+ sample[SYNTHETICS_TYPE_KEY] = payload[:synthetics_type] if payload[:synthetics_type]
85
+ sample[SYNTHETICS_INITIATOR_KEY] = payload[:synthetics_initiator] if payload[:synthetics_initiator]
86
+
87
+ payload.each do |k, v|
88
+ next unless k.to_s.start_with?('synthetics_') && !SYNTHETICS_PAYLOAD_EXPECTED.include?(k)
89
+
90
+ new_key = SYNTHETICS_KEY_PREFIX + NewRelic::LanguageSupport.camelize(k.to_s.gsub('synthetics_', ''))
91
+ sample[new_key] = v
92
+ end
75
93
  end
76
94
 
77
- def append_cat payload, sample
95
+ def append_cat(payload, sample)
78
96
  sample[GUID_KEY] = payload[:guid] if payload[:guid]
79
97
  sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
80
98
  end
@@ -1,44 +1,44 @@
1
1
  # -*- ruby -*-
2
- # encoding: utf-8
3
2
  # This file is distributed under New Relic's license terms.
4
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
5
5
 
6
- require 'newrelic_rpm' unless defined?( NewRelic )
7
- require 'new_relic/agent' unless defined?( NewRelic::Agent )
6
+ require 'newrelic_rpm' unless defined?(NewRelic)
7
+ require 'new_relic/agent' unless defined?(NewRelic::Agent)
8
8
  require 'new_relic/agent/event_aggregator'
9
9
  require 'new_relic/agent/priority_sampled_buffer'
10
10
 
11
11
  module NewRelic
12
12
  module Agent
13
13
  class TransactionEventAggregator < EventAggregator
14
-
15
14
  named :TransactionEventAggregator
16
- capacity_key :'analytics_events.max_samples_stored'
17
- enabled_key :'analytics_events.enabled'
15
+ capacity_key :'transaction_events.max_samples_stored'
16
+ enabled_key :'transaction_events.enabled'
18
17
  buffer_class PrioritySampledBuffer
19
18
 
20
- def record priority: nil, event:nil, &blk
21
- unless(event || priority && blk)
22
- raise ArgumentError, "Expected priority and block, or event"
19
+ def record(priority: nil, event: nil, &blk)
20
+ unless event || priority && blk
21
+ raise ArgumentError, 'Expected priority and block, or event'
23
22
  end
24
23
 
25
24
  return unless enabled?
26
25
 
27
26
  @lock.synchronize do
28
- @buffer.append priority: priority, event: event, &blk
27
+ @buffer.append(priority: priority, event: event, &blk)
29
28
  notify_if_full
30
29
  end
31
30
  end
32
31
 
33
32
  private
34
33
 
35
- def after_harvest metadata
34
+ def after_harvest(metadata)
36
35
  return unless enabled?
37
- record_sampling_rate metadata
36
+
37
+ record_sampling_rate(metadata)
38
38
  end
39
39
 
40
- def record_sampling_rate(metadata) #THREAD_LOCAL_ACCESS
41
- NewRelic::Agent.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
40
+ def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
41
+ NewRelic::Agent.logger.debug('Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup' % [
42
42
  metadata[:captured],
43
43
  metadata[:seen],
44
44
  (metadata[:captured].to_f / metadata[:seen] * 100.0),
@@ -48,8 +48,8 @@ module NewRelic
48
48
  ])
49
49
 
50
50
  engine = NewRelic::Agent.instance.stats_engine
51
- engine.tl_record_supportability_metric_count("TransactionEventAggregator/requests", metadata[:seen])
52
- engine.tl_record_supportability_metric_count("TransactionEventAggregator/samples", metadata[:captured])
51
+ engine.tl_record_supportability_metric_count('TransactionEventAggregator/requests', metadata[:seen])
52
+ engine.tl_record_supportability_metric_count('TransactionEventAggregator/samples', metadata[:captured])
53
53
  end
54
54
  end
55
55
  end
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -20,41 +19,46 @@ module NewRelic
20
19
  COMMA = ','
21
20
 
22
21
  # The type field of the sample
23
- SAMPLE_TYPE = 'Transaction'
22
+ SAMPLE_TYPE = 'Transaction'
24
23
 
25
24
  # Strings for static keys of the sample structure
26
- TYPE_KEY = 'type'
27
- TIMESTAMP_KEY = 'timestamp'
28
- NAME_KEY = 'name'
29
- DURATION_KEY = 'duration'
30
- ERROR_KEY = 'error'
31
- SAMPLED_KEY = 'sampled'
32
- PRIORITY_KEY = 'priority'
33
- GUID_KEY = 'nr.guid'
25
+ TYPE_KEY = 'type'
26
+ TIMESTAMP_KEY = 'timestamp'
27
+ NAME_KEY = 'name'
28
+ DURATION_KEY = 'duration'
29
+ ERROR_KEY = 'error'
30
+ SAMPLED_KEY = 'sampled'
31
+ PRIORITY_KEY = 'priority'
32
+ GUID_KEY = 'nr.guid'
34
33
  REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
35
- CAT_PATH_HASH_KEY = 'nr.pathHash'
36
- CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
37
- CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
38
- APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
39
- SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
40
- SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
41
- SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
34
+ CAT_PATH_HASH_KEY = 'nr.pathHash'
35
+ CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
36
+ CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
37
+ APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
38
+ SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
39
+ SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
40
+ SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'
41
+ SYNTHETICS_TYPE_KEY = 'nr.syntheticsType'
42
+ SYNTHETICS_INITIATOR_KEY = 'nr.syntheticsInitiator'
43
+ SYNTHETICS_KEY_PREFIX = 'nr.synthetics'
44
+
45
+ SYNTHETICS_PAYLOAD_EXPECTED = [:synthetics_resource_id, :synthetics_job_id, :synthetics_monitor_id, :synthetics_type, :synthetics_initiator]
42
46
 
43
47
  def create(payload)
44
48
  intrinsics = {
45
- TIMESTAMP_KEY => float(payload[:start_timestamp]),
46
- NAME_KEY => string(payload[:name]),
47
- DURATION_KEY => float(payload[:duration]),
48
- TYPE_KEY => SAMPLE_TYPE,
49
- ERROR_KEY => payload[:error],
50
- PRIORITY_KEY => payload[:priority]
49
+ TIMESTAMP_KEY => float(payload[:start_timestamp]),
50
+ NAME_KEY => string(payload[:name]),
51
+ DURATION_KEY => float(payload[:duration]),
52
+ TYPE_KEY => SAMPLE_TYPE,
53
+ ERROR_KEY => payload[:error],
54
+ PRIORITY_KEY => payload[:priority]
51
55
  }
52
56
 
53
57
  intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
54
58
 
55
59
  PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
56
60
  append_optional_attributes(intrinsics, payload)
57
- DistributedTraceAttributes.copy_to_hash payload, intrinsics
61
+ DistributedTraceAttributes.copy_to_hash(payload, intrinsics)
58
62
 
59
63
  attributes = payload[:attributes]
60
64
 
@@ -64,17 +68,31 @@ module NewRelic
64
68
  private
65
69
 
66
70
  def append_optional_attributes(sample, payload)
67
- optionally_append(GUID_KEY, :guid, sample, payload)
71
+ optionally_append(GUID_KEY, :guid, sample, payload)
68
72
  optionally_append(REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
69
- optionally_append(CAT_PATH_HASH_KEY, :cat_path_hash, sample, payload)
70
- optionally_append(CAT_REFERRING_PATH_HASH_KEY, :cat_referring_path_hash, sample, payload)
71
- optionally_append(APDEX_PERF_ZONE_KEY, :apdex_perf_zone, sample, payload)
72
- optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
73
- optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
74
- optionally_append(SYNTHETICS_MONITOR_ID_KEY, :synthetics_monitor_id, sample, payload)
73
+ optionally_append(CAT_PATH_HASH_KEY, :cat_path_hash, sample, payload)
74
+ optionally_append(CAT_REFERRING_PATH_HASH_KEY, :cat_referring_path_hash, sample, payload)
75
+ optionally_append(APDEX_PERF_ZONE_KEY, :apdex_perf_zone, sample, payload)
76
+ optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
77
+ optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
78
+ optionally_append(SYNTHETICS_MONITOR_ID_KEY, :synthetics_monitor_id, sample, payload)
79
+ optionally_append(SYNTHETICS_TYPE_KEY, :synthetics_type, sample, payload)
80
+ optionally_append(SYNTHETICS_INITIATOR_KEY, :synthetics_initiator, sample, payload)
81
+ append_synthetics_info_attributes(sample, payload)
75
82
  append_cat_alternate_path_hashes(sample, payload)
76
83
  end
77
84
 
85
+ def append_synthetics_info_attributes(sample, payload)
86
+ return unless payload.include?(:synthetics_job_id)
87
+
88
+ payload.each do |k, v|
89
+ next unless k.to_s.start_with?('synthetics_') && !SYNTHETICS_PAYLOAD_EXPECTED.include?(k)
90
+
91
+ new_key = SYNTHETICS_KEY_PREFIX + NewRelic::LanguageSupport.camelize(k.to_s.gsub('synthetics_', ''))
92
+ sample[new_key] = v.to_s
93
+ end
94
+ end
95
+
78
96
  def append_cat_alternate_path_hashes(sample, payload)
79
97
  if payload.include?(:cat_alternate_path_hashes)
80
98
  sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
@@ -87,7 +105,7 @@ module NewRelic
87
105
  end
88
106
  end
89
107
 
90
- def custom_attributes attributes
108
+ def custom_attributes(attributes)
91
109
  if attributes
92
110
  result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
93
111
  result.freeze
@@ -96,7 +114,7 @@ module NewRelic
96
114
  end
97
115
  end
98
116
 
99
- def agent_attributes attributes
117
+ def agent_attributes(attributes)
100
118
  if attributes
101
119
  result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
102
120
  result.freeze
@@ -1,42 +1,43 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
4
5
  require 'new_relic/agent/transaction_event_aggregator'
5
6
  require 'new_relic/agent/synthetics_event_aggregator'
6
7
  require 'new_relic/agent/transaction_event_primitive'
7
8
 
8
9
  module NewRelic
9
10
  module Agent
10
- # This is responsibile for recording transaction events and managing
11
+ # This is responsible for recording transaction events and managing
11
12
  # the relationship between events generated from synthetics requests
12
13
  # vs normal requests.
13
14
  class TransactionEventRecorder
14
15
  attr_reader :transaction_event_aggregator
15
16
  attr_reader :synthetics_event_aggregator
16
17
 
17
- def initialize events
18
- @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new events
19
- @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new events
18
+ def initialize(events)
19
+ @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new(events)
20
+ @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new(events)
20
21
  end
21
22
 
22
- def record payload
23
- return unless NewRelic::Agent.config[:'analytics_events.enabled']
23
+ def record(payload)
24
+ return unless NewRelic::Agent.config[:'transaction_events.enabled']
24
25
 
25
- if synthetics_event? payload
26
- event = create_event payload
27
- result = synthetics_event_aggregator.record event
28
- transaction_event_aggregator.record event: event if result.nil?
26
+ if synthetics_event?(payload)
27
+ event = create_event(payload)
28
+ result = synthetics_event_aggregator.record(event)
29
+ transaction_event_aggregator.record(event: event) if result.nil?
29
30
  else
30
31
  transaction_event_aggregator.record(priority: payload[:priority]) { create_event(payload) }
31
32
  end
32
33
  end
33
34
 
34
- def create_event payload
35
- TransactionEventPrimitive.create payload
35
+ def create_event(payload)
36
+ TransactionEventPrimitive.create(payload)
36
37
  end
37
38
 
38
- def synthetics_event? payload
39
- payload.key? :synthetics_resource_id
39
+ def synthetics_event?(payload)
40
+ payload.key?(:synthetics_resource_id)
40
41
  end
41
42
 
42
43
  def drop_buffered_data
@@ -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
  # This class represents a set of metrics that were recorded during a single
6
6
  # transaction. Since the name of the transaction is not known until its end, we
@@ -10,11 +10,12 @@
10
10
  module NewRelic
11
11
  module Agent
12
12
  class TransactionMetrics
13
- DEFAULT_PROC = Proc.new { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
13
+ DEFAULT_PROC = proc { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
14
14
 
15
15
  def initialize
16
+ @lock = Mutex.new
16
17
  @unscoped = Hash.new(&DEFAULT_PROC)
17
- @scoped = Hash.new(&DEFAULT_PROC)
18
+ @scoped = Hash.new(&DEFAULT_PROC)
18
19
  end
19
20
 
20
21
  # As a general rule, when recording a scoped metric, the corresponding
@@ -25,11 +26,11 @@ module NewRelic
25
26
  # propagate them into unscoped metrics as well when instances of this
26
27
  # class are merged into the global metric store.
27
28
  #
28
- def record_scoped_and_unscoped(names, value=nil, aux=nil, &blk)
29
+ def record_scoped_and_unscoped(names, value = nil, aux = nil, &blk)
29
30
  _record_metrics(names, value, aux, @scoped, &blk)
30
31
  end
31
32
 
32
- def record_unscoped(names, value=nil, aux=nil, &blk)
33
+ def record_unscoped(names, value = nil, aux = nil, &blk)
33
34
  _record_metrics(names, value, aux, @unscoped, &blk)
34
35
  end
35
36
 
@@ -42,11 +43,11 @@ module NewRelic
42
43
  end
43
44
 
44
45
  def each_unscoped
45
- @unscoped.each { |name, stats| yield name, stats }
46
+ @lock.synchronize { @unscoped.each { |name, stats| yield(name, stats) } }
46
47
  end
47
48
 
48
49
  def each_scoped
49
- @scoped.each { |name, stats| yield name, stats }
50
+ @lock.synchronize { @scoped.each { |name, stats| yield(name, stats) } }
50
51
  end
51
52
 
52
53
  def _record_metrics(names, value, aux, target, &blk)
@@ -54,10 +55,10 @@ module NewRelic
54
55
  case names
55
56
  when Array
56
57
  names.each do |name|
57
- target[name].record(value, aux, &blk)
58
+ @lock.synchronize { target[name].record(value, aux, &blk) }
58
59
  end
59
60
  else
60
- target[names].record(value, aux, &blk)
61
+ @lock.synchronize { target[names].record(value, aux, &blk) }
61
62
  end
62
63
  end
63
64
  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/transaction/slowest_sample_buffer'
6
6
  require 'new_relic/agent/transaction/synthetics_sample_buffer'
@@ -8,7 +8,6 @@ require 'new_relic/agent/transaction/trace_builder'
8
8
 
9
9
  module NewRelic
10
10
  module Agent
11
-
12
11
  # This class contains the logic for recording and storing transaction
13
12
  # traces (sometimes referred to as 'transaction samples').
14
13
  #
@@ -33,15 +32,15 @@ module NewRelic
33
32
  Agent.config.register_callback(:'transaction_tracer.enabled') do |enabled|
34
33
  if enabled
35
34
  threshold = Agent.config[:'transaction_tracer.transaction_threshold']
36
- ::NewRelic::Agent.logger.debug "Transaction tracing threshold is #{threshold} seconds."
35
+ ::NewRelic::Agent.logger.debug("Transaction tracing threshold is #{threshold} seconds.")
37
36
  else
38
- ::NewRelic::Agent.logger.debug "Transaction traces will not be sent to the New Relic service."
37
+ ::NewRelic::Agent.logger.debug('Transaction traces will not be sent to the New Relic service.')
39
38
  end
40
39
  end
41
40
 
42
41
  Agent.config.register_callback(:'transaction_tracer.record_sql') do |config|
43
42
  if config == 'raw'
44
- ::NewRelic::Agent.logger.warn("Agent is configured to send raw SQL to the service")
43
+ ::NewRelic::Agent.logger.warn('Agent is configured to send raw SQL to the service')
45
44
  end
46
45
  end
47
46
  end
@@ -68,7 +67,7 @@ module NewRelic
68
67
 
69
68
  # Gather transaction traces that we'd like to transmit to the server.
70
69
  def harvest!
71
- return [] unless enabled?
70
+ return NewRelic::EMPTY_ARRAY unless enabled?
72
71
 
73
72
  samples = @samples_lock.synchronize do
74
73
  @last_sample = nil
@@ -82,7 +81,7 @@ module NewRelic
82
81
  begin
83
82
  sample.prepare_to_send!
84
83
  rescue => e
85
- NewRelic::Agent.logger.error("Failed to prepare transaction trace. Error: ", e)
84
+ NewRelic::Agent.logger.error('Failed to prepare transaction trace. Error: ', e)
86
85
  false
87
86
  else
88
87
  true
@@ -114,7 +113,7 @@ module NewRelic
114
113
  result.uniq!
115
114
  result.map! do |sample|
116
115
  if Transaction === sample
117
- Transaction::TraceBuilder.build_trace sample
116
+ Transaction::TraceBuilder.build_trace(sample)
118
117
  else
119
118
  sample
120
119
  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
  # This module powers the Busy calculation for the Capacity report in
6
6
  # APM (https://rpm.newrelic.com/accounts/.../applications/.../optimize/capacity_analysis).
@@ -12,36 +12,36 @@
12
12
  module NewRelic
13
13
  module Agent
14
14
  module TransactionTimeAggregator
15
- TransactionStats = Struct.new :transaction_started_at, :elapsed_transaction_time
15
+ TransactionStats = Struct.new(:transaction_started_at, :elapsed_transaction_time)
16
16
 
17
- @lock = Mutex.new
18
- @harvest_cycle_started_at = Time.now
17
+ @lock = Mutex.new
18
+ @harvest_cycle_started_at = Process.clock_gettime(Process::CLOCK_REALTIME)
19
19
 
20
20
  @stats = Hash.new do |h, k|
21
- h[k] = TransactionStats.new nil, 0.0
21
+ h[k] = TransactionStats.new(nil, 0.0)
22
22
  end
23
23
 
24
- def reset!(timestamp = Time.now)
24
+ def reset!(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME))
25
25
  @harvest_cycle_started_at = timestamp
26
26
  @stats.clear
27
27
  end
28
28
 
29
- def transaction_start(timestamp = Time.now)
29
+ def transaction_start(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME))
30
30
  @lock.synchronize do
31
- set_transaction_start_time timestamp
31
+ set_transaction_start_time(timestamp)
32
32
  end
33
33
  end
34
34
 
35
- def transaction_stop(timestamp = Time.now, starting_thread_id = current_thread)
35
+ def transaction_stop(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME), starting_thread_id = current_thread)
36
36
  @lock.synchronize do
37
- record_elapsed_transaction_time_until timestamp, starting_thread_id
38
- set_transaction_start_time nil, starting_thread_id
37
+ record_elapsed_transaction_time_until(timestamp, starting_thread_id)
38
+ set_transaction_start_time(nil, starting_thread_id)
39
39
  end
40
40
  end
41
41
 
42
42
  INSTANCE_BUSY_METRIC = 'Instance/Busy'.freeze
43
43
 
44
- def harvest!(timestamp = Time.now)
44
+ def harvest!(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME))
45
45
  active_threads = 0
46
46
  result = @lock.synchronize do
47
47
  # Sum up the transaction times spent in each thread
@@ -50,7 +50,7 @@ module NewRelic
50
50
  end
51
51
 
52
52
  active_threads = @stats.size
53
- elapsed_harvest_time = (timestamp - @harvest_cycle_started_at) * active_threads
53
+ elapsed_harvest_time = (timestamp - @harvest_cycle_started_at) * active_threads
54
54
  @harvest_cycle_started_at = timestamp
55
55
 
56
56
  # Clear out the stats for all threads, _except_ the live ones
@@ -75,9 +75,9 @@ module NewRelic
75
75
  end
76
76
 
77
77
  module_function :reset!,
78
- :transaction_start,
79
- :transaction_stop,
80
- :harvest!
78
+ :transaction_start,
79
+ :transaction_stop,
80
+ :harvest!
81
81
 
82
82
  class << self
83
83
  private
@@ -100,23 +100,24 @@ module NewRelic
100
100
  end
101
101
 
102
102
  def thread_is_alive?(thread_id)
103
- thread = thread_by_id thread_id
104
- thread && thread.alive?
103
+ thread = thread_by_id(thread_id)
104
+ # needs else branch coverage
105
+ thread && thread.alive? # rubocop:disable Style/SafeNavigation
105
106
  rescue StandardError
106
107
  false
107
108
  end
108
109
 
109
110
  # ObjectSpace is faster on MRI, but disabled by default on JRuby for
110
- # perfomance reasons. We have two implmentations of `thread_by_id`
111
+ # performance reasons. We have two implementations of `thread_by_id`
111
112
  # based on ruby implementation.
112
113
  if RUBY_ENGINE == 'jruby'
113
- def thread_by_id thread_id
114
+ def thread_by_id(thread_id)
114
115
  Thread.list.detect { |t| t.object_id == thread_id }
115
116
  end
116
117
  else
117
118
  require 'objspace'
118
119
 
119
- def thread_by_id thread_id
120
+ def thread_by_id(thread_id)
120
121
  ObjectSpace._id2ref(thread_id)
121
122
  end
122
123
  end
@@ -127,26 +128,30 @@ module NewRelic
127
128
 
128
129
  def split_transaction_at_harvest(timestamp, thread_id = nil)
129
130
  raise ArgumentError, 'thread_id required' unless thread_id
131
+
130
132
  @stats[thread_id].transaction_started_at = timestamp
131
133
  @stats[thread_id].elapsed_transaction_time = 0.0
132
134
  end
133
135
 
134
- def transaction_time_in_thread timestamp, thread_id, entry
135
- return entry.elapsed_transaction_time unless in_transaction? thread_id
136
+ def transaction_time_in_thread(timestamp, thread_id, entry)
137
+ return entry.elapsed_transaction_time unless in_transaction?(thread_id)
136
138
 
137
139
  # Count the portion of the transaction that's elapsed so far,...
138
- elapsed = record_elapsed_transaction_time_until timestamp, thread_id
140
+ elapsed = record_elapsed_transaction_time_until(timestamp, thread_id)
139
141
 
140
142
  # ...then readjust the transaction start time to the next harvest
141
- split_transaction_at_harvest timestamp, thread_id
143
+ split_transaction_at_harvest(timestamp, thread_id)
142
144
 
143
145
  elapsed
144
146
  end
145
147
 
148
+ # this method has no test coverage
146
149
  def log_missing_elapsed_transaction_time
147
- transaction_name = Tracer.current_transaction &&
150
+ # rubocop:disable Style/SafeNavigation
151
+ transaction_name = transaction_name = Tracer.current_transaction &&
148
152
  Tracer.current_transaction.best_name ||
149
- "unknown"
153
+ 'unknown'
154
+ # rubocop:enable Style/SafeNavigation
150
155
  NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
151
156
  end
152
157
  end