newrelic_rpm 7.0.0 → 9.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (448) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +7 -2
  3. data/.rubocop.yml +1919 -0
  4. data/.rubocop_todo.yml +100 -0
  5. data/.simplecov +15 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +1 -0
  8. data/Brewfile +12 -0
  9. data/CHANGELOG.md +3754 -2825
  10. data/CONTRIBUTING.md +33 -7
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +0 -1
  14. data/Guardfile +9 -8
  15. data/LICENSE +0 -6
  16. data/README.md +23 -19
  17. data/Rakefile +27 -29
  18. data/THIRD_PARTY_NOTICES.md +14 -199
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +76 -53
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +4 -6
  26. data/install.rb +2 -2
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
  29. data/lib/new_relic/agent/agent.rb +96 -925
  30. data/lib/new_relic/agent/agent_helpers/connect.rb +227 -0
  31. data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
  32. data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
  33. data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
  34. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -0
  35. data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
  36. data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
  37. data/lib/new_relic/agent/agent_logger.rb +23 -19
  38. data/lib/new_relic/agent/attribute_filter.rb +64 -47
  39. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  40. data/lib/new_relic/agent/attributes.rb +5 -4
  41. data/lib/new_relic/agent/audit_logger.rb +8 -3
  42. data/lib/new_relic/agent/autostart.rb +20 -18
  43. data/lib/new_relic/agent/chained_call.rb +1 -1
  44. data/lib/new_relic/agent/commands/agent_command.rb +3 -3
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +12 -10
  47. data/lib/new_relic/agent/configuration/default_source.rb +1366 -1297
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  49. data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +8 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +82 -69
  53. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  54. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  55. data/lib/new_relic/agent/configuration/security_policy_source.rb +82 -85
  56. data/lib/new_relic/agent/configuration/server_source.rb +21 -19
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
  58. data/lib/new_relic/agent/configuration.rb +1 -1
  59. data/lib/new_relic/agent/connect/request_builder.rb +18 -18
  60. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
  64. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  66. data/lib/new_relic/agent/database.rb +42 -50
  67. data/lib/new_relic/agent/database_adapter.rb +3 -1
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
  71. data/lib/new_relic/agent/datastores/mongo.rb +6 -11
  72. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  73. data/lib/new_relic/agent/datastores/redis.rb +5 -7
  74. data/lib/new_relic/agent/datastores.rb +13 -15
  75. data/lib/new_relic/agent/deprecator.rb +1 -1
  76. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
  77. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -34
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
  84. data/lib/new_relic/agent/distributed_tracing.rb +33 -35
  85. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  86. data/lib/new_relic/agent/error_collector.rb +73 -54
  87. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
  90. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  91. data/lib/new_relic/agent/event_buffer.rb +7 -8
  92. data/lib/new_relic/agent/event_listener.rb +1 -2
  93. data/lib/new_relic/agent/event_loop.rb +26 -24
  94. data/lib/new_relic/agent/external.rb +11 -44
  95. data/lib/new_relic/agent/guid_generator.rb +13 -11
  96. data/lib/new_relic/agent/harvester.rb +4 -5
  97. data/lib/new_relic/agent/heap.rb +7 -9
  98. data/lib/new_relic/agent/hostname.rb +20 -13
  99. data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
  108. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +39 -0
  109. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
  110. data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
  111. data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
  112. data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
  113. data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
  114. data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
  115. data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
  116. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +18 -19
  117. data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
  118. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +37 -35
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +49 -46
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
  127. data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
  128. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  129. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  130. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  131. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  132. data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
  133. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +11 -11
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +21 -23
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +4 -5
  137. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  138. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  139. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  140. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  141. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +69 -59
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +41 -43
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +52 -53
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +12 -14
  145. data/lib/new_relic/agent/instrumentation/curb.rb +7 -7
  146. data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
  147. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
  148. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +6 -9
  149. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +7 -12
  150. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
  151. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +28 -10
  152. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  153. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  154. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  155. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  156. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +6 -6
  157. data/lib/new_relic/agent/instrumentation/excon.rb +27 -30
  158. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
  159. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
  160. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
  161. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  162. data/lib/new_relic/agent/instrumentation/grape/chain.rb +7 -8
  163. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +12 -12
  164. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
  165. data/lib/new_relic/agent/instrumentation/grape.rb +12 -13
  166. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  167. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  168. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  169. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  170. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  171. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  172. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  173. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  174. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  175. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  176. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  177. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +3 -4
  178. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +7 -8
  179. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -3
  180. data/lib/new_relic/agent/instrumentation/httpclient.rb +3 -3
  181. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +3 -3
  182. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +11 -11
  183. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +2 -2
  184. data/lib/new_relic/agent/instrumentation/httprb.rb +4 -4
  185. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
  186. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  189. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +31 -19
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +12 -9
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +20 -18
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +28 -15
  195. data/lib/new_relic/agent/instrumentation/memcache.rb +22 -23
  196. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +11 -12
  197. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
  198. data/lib/new_relic/agent/instrumentation/mongo.rb +6 -144
  199. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
  200. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +4 -5
  201. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +10 -10
  202. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +5 -5
  203. data/lib/new_relic/agent/instrumentation/net_http.rb +12 -7
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +51 -9
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +24 -20
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +4 -3
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +3 -3
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +5 -8
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +30 -21
  212. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +3 -2
  213. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +14 -12
  214. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +15 -8
  215. data/lib/new_relic/agent/instrumentation/rack.rb +15 -15
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +18 -54
  217. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
  218. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
  219. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +17 -5
  220. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
  221. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  222. data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -7
  223. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +14 -16
  224. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
  225. data/lib/new_relic/agent/instrumentation/rake.rb +9 -9
  226. data/lib/new_relic/agent/instrumentation/redis/chain.rb +25 -14
  227. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  228. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +53 -25
  229. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  230. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +10 -5
  231. data/lib/new_relic/agent/instrumentation/redis.rb +16 -6
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +4 -5
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +9 -8
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +2 -3
  236. data/lib/new_relic/agent/instrumentation/resque.rb +25 -16
  237. data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
  238. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
  239. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  240. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  241. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  242. data/lib/new_relic/agent/instrumentation/sidekiq.rb +24 -65
  243. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
  244. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -3
  245. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +13 -6
  246. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
  247. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  248. data/lib/new_relic/agent/instrumentation/sinatra.rb +26 -17
  249. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  250. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  251. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  252. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  253. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  257. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +5 -5
  258. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +13 -15
  259. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +2 -2
  260. data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
  261. data/lib/new_relic/agent/instrumentation.rb +1 -1
  262. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  263. data/lib/new_relic/agent/javascript_instrumentor.rb +48 -42
  264. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  265. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  266. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  267. data/lib/new_relic/agent/log_once.rb +1 -1
  268. data/lib/new_relic/agent/log_priority.rb +20 -0
  269. data/lib/new_relic/agent/logging.rb +24 -21
  270. data/lib/new_relic/agent/memory_logger.rb +2 -2
  271. data/lib/new_relic/agent/messaging.rb +65 -81
  272. data/lib/new_relic/agent/method_tracer.rb +154 -149
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +88 -11
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +24 -17
  275. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  276. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  277. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
  278. data/lib/new_relic/agent/monitors.rb +6 -7
  279. data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
  280. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
  281. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  282. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
  283. data/lib/new_relic/agent/new_relic_service.rb +247 -186
  284. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  285. data/lib/new_relic/agent/null_logger.rb +7 -3
  286. data/lib/new_relic/agent/obfuscator.rb +8 -10
  287. data/lib/new_relic/agent/parameter_filtering.rb +24 -10
  288. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  289. data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
  290. data/lib/new_relic/agent/pipe_service.rb +8 -5
  291. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  292. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
  293. data/lib/new_relic/agent/range_extensions.rb +8 -28
  294. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  295. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -13
  296. data/lib/new_relic/agent/rules_engine.rb +5 -4
  297. data/lib/new_relic/agent/sampler.rb +3 -4
  298. data/lib/new_relic/agent/sampler_collection.rb +3 -4
  299. data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
  300. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
  301. data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
  302. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  303. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  304. data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
  305. data/lib/new_relic/agent/span_event_primitive.rb +62 -56
  306. data/lib/new_relic/agent/sql_sampler.rb +17 -17
  307. data/lib/new_relic/agent/stats.rb +78 -41
  308. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  309. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  310. data/lib/new_relic/agent/stats_engine.rb +8 -8
  311. data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
  312. data/lib/new_relic/agent/system_info.rb +85 -65
  313. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  314. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  315. data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
  316. data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
  317. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  318. data/lib/new_relic/agent/tracer.rb +89 -85
  319. data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
  320. data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
  321. data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
  322. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  323. data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
  324. data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
  325. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  326. data/lib/new_relic/agent/transaction/segment.rb +20 -10
  327. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  328. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  329. data/lib/new_relic/agent/transaction/trace.rb +15 -11
  330. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  331. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  332. data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
  333. data/lib/new_relic/agent/transaction/tracing.rb +14 -11
  334. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +5 -5
  335. data/lib/new_relic/agent/transaction.rb +175 -152
  336. data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
  337. data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
  338. data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
  339. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  340. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  341. data/lib/new_relic/agent/transaction_sampler.rb +5 -6
  342. data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
  343. data/lib/new_relic/agent/utilization/aws.rb +33 -3
  344. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  345. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  346. data/lib/new_relic/agent/utilization/pcf.rb +5 -4
  347. data/lib/new_relic/agent/utilization/vendor.rb +43 -28
  348. data/lib/new_relic/agent/utilization_data.rb +7 -5
  349. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  350. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
  351. data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
  352. data/lib/new_relic/agent/vm/snapshot.rb +5 -5
  353. data/lib/new_relic/agent/vm.rb +1 -1
  354. data/lib/new_relic/agent/worker_loop.rb +10 -12
  355. data/lib/new_relic/agent.rb +70 -86
  356. data/lib/new_relic/cli/command.rb +20 -22
  357. data/lib/new_relic/cli/commands/deployments.rb +92 -42
  358. data/lib/new_relic/cli/commands/install.rb +21 -24
  359. data/lib/new_relic/coerce.rb +15 -13
  360. data/lib/new_relic/collection_helper.rb +50 -48
  361. data/lib/new_relic/constants.rb +1 -4
  362. data/lib/new_relic/control/class_methods.rb +3 -3
  363. data/lib/new_relic/control/frameworks/external.rb +2 -2
  364. data/lib/new_relic/control/frameworks/rails.rb +13 -9
  365. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  366. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  367. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  368. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  369. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  370. data/lib/new_relic/control/frameworks.rb +1 -1
  371. data/lib/new_relic/control/instance_methods.rb +26 -45
  372. data/lib/new_relic/control/instrumentation.rb +39 -11
  373. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  374. data/lib/new_relic/control/server_methods.rb +3 -4
  375. data/lib/new_relic/control.rb +1 -2
  376. data/lib/new_relic/delayed_job_injection.rb +1 -1
  377. data/lib/new_relic/dependency_detection.rb +29 -28
  378. data/lib/new_relic/environment_report.rb +40 -32
  379. data/lib/new_relic/helper.rb +48 -7
  380. data/lib/new_relic/language_support.rb +29 -5
  381. data/lib/new_relic/latest_changes.rb +7 -6
  382. data/lib/new_relic/local_environment.rb +22 -26
  383. data/lib/new_relic/metric_data.rb +31 -26
  384. data/lib/new_relic/metric_spec.rb +8 -6
  385. data/lib/new_relic/noticed_error.rb +21 -25
  386. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  387. data/lib/new_relic/rack/agent_middleware.rb +5 -3
  388. data/lib/new_relic/rack/browser_monitoring.rb +133 -123
  389. data/lib/new_relic/rack.rb +1 -1
  390. data/lib/new_relic/recipes/capistrano3.rb +3 -61
  391. data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
  392. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  393. data/lib/new_relic/recipes.rb +1 -1
  394. data/lib/new_relic/supportability_helper.rb +8 -9
  395. data/lib/new_relic/traced_thread.rb +39 -0
  396. data/lib/new_relic/version.rb +5 -16
  397. data/lib/newrelic_rpm.rb +19 -32
  398. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +15 -18
  399. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +8 -14
  400. data/lib/tasks/all.rb +3 -3
  401. data/lib/tasks/config.rake +22 -117
  402. data/lib/tasks/coverage_report.rake +28 -0
  403. data/lib/tasks/helpers/config.html.erb +21 -0
  404. data/lib/tasks/helpers/format.rb +123 -0
  405. data/lib/tasks/helpers/matches.rb +12 -0
  406. data/lib/tasks/helpers/prompt.rb +24 -0
  407. data/lib/tasks/helpers/removers.rb +33 -0
  408. data/lib/tasks/install.rake +4 -0
  409. data/lib/tasks/instrumentation_generator/README.md +63 -0
  410. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  411. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  412. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  414. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  415. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  417. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  418. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  420. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  421. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  422. data/lib/tasks/multiverse.rake +4 -0
  423. data/lib/tasks/multiverse.rb +5 -32
  424. data/lib/tasks/newrelic.rb +1 -1
  425. data/lib/tasks/tests.rake +10 -15
  426. data/newrelic.yml +672 -3
  427. data/newrelic_rpm.gemspec +35 -31
  428. data/recipes/newrelic.rb +2 -2
  429. data/test/agent_helper.rb +221 -180
  430. metadata +141 -111
  431. data/ROADMAP.md +0 -24
  432. data/bin/mongrel_rpm +0 -33
  433. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  434. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  435. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
  436. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  437. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
  438. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  439. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  440. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  441. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  442. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  443. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  444. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  445. data/lib/new_relic/agent/supported_versions.rb +0 -275
  446. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  447. data/lib/tasks/config.html.erb +0 -32
  448. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -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
@@ -24,40 +23,36 @@ module NewRelic
24
23
  include Tracing
25
24
 
26
25
  # for nested transactions
27
- NESTED_TRANSACTION_PREFIX = "Nested/"
28
- CONTROLLER_PREFIX = "Controller/"
29
- MIDDLEWARE_PREFIX = "Middleware/Rack/"
30
- OTHER_TRANSACTION_PREFIX = "OtherTransaction/"
31
- TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
32
- RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
33
- MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
34
- RACK_PREFIX = "#{CONTROLLER_PREFIX}Rack/"
35
- SINATRA_PREFIX = "#{CONTROLLER_PREFIX}Sinatra/"
36
- GRAPE_PREFIX = "#{CONTROLLER_PREFIX}Grape/"
37
- ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
38
-
39
- WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
40
- TRANSACTION_NAMING_SOURCES = [:child, :api].freeze
41
-
42
- MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
43
- WEB_SUMMARY_METRIC = "HttpDispatcher"
44
- OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
45
- QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
46
-
47
- APDEX_S = "S"
48
- APDEX_T = "T"
49
- APDEX_F = "F"
50
- APDEX_ALL_METRIC = "ApdexAll"
51
- APDEX_METRIC = "Apdex"
52
- APDEX_OTHER_METRIC = "ApdexOther"
53
- APDEX_TXN_METRIC_PREFIX = "Apdex/"
26
+ NESTED_TRANSACTION_PREFIX = "Nested/"
27
+ CONTROLLER_PREFIX = "Controller/"
28
+ MIDDLEWARE_PREFIX = "Middleware/Rack/"
29
+ OTHER_TRANSACTION_PREFIX = "OtherTransaction/"
30
+ TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
31
+ RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
32
+ MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
33
+ RACK_PREFIX = "#{CONTROLLER_PREFIX}Rack/"
34
+ SINATRA_PREFIX = "#{CONTROLLER_PREFIX}Sinatra/"
35
+ GRAPE_PREFIX = "#{CONTROLLER_PREFIX}Grape/"
36
+ ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
37
+
38
+ WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
39
+
40
+ MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
41
+ WEB_SUMMARY_METRIC = "HttpDispatcher"
42
+ OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
43
+ QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
44
+
45
+ APDEX_S = "S"
46
+ APDEX_T = "T"
47
+ APDEX_F = "F"
48
+ APDEX_ALL_METRIC = "ApdexAll"
49
+ APDEX_METRIC = "Apdex"
50
+ APDEX_OTHER_METRIC = "ApdexOther"
51
+ APDEX_TXN_METRIC_PREFIX = "Apdex/"
54
52
  APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
55
53
 
56
54
  JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
57
55
 
58
- # reference to the transaction state managing this transaction
59
- attr_accessor :state
60
-
61
56
  # A Time instance for the start time, never nil
62
57
  attr_accessor :start_time
63
58
 
@@ -67,27 +62,28 @@ module NewRelic
67
62
  attr_accessor :apdex_start
68
63
 
69
64
  attr_accessor :exceptions,
70
- :filtered_params,
71
- :jruby_cpu_start,
72
- :process_cpu_start,
73
- :http_response_code,
74
- :response_content_length,
75
- :response_content_type,
76
- :parent_span_id
65
+ :filtered_params,
66
+ :jruby_cpu_start,
67
+ :process_cpu_start,
68
+ :http_response_code,
69
+ :response_content_length,
70
+ :response_content_type,
71
+ :parent_span_id
77
72
 
78
73
  attr_reader :guid,
79
- :metrics,
80
- :gc_start_snapshot,
81
- :category,
82
- :attributes,
83
- :payload,
84
- :nesting_max_depth,
85
- :segments,
86
- :end_time,
87
- :duration
74
+ :metrics,
75
+ :logs,
76
+ :gc_start_snapshot,
77
+ :category,
78
+ :attributes,
79
+ :payload,
80
+ :nesting_max_depth,
81
+ :segments,
82
+ :end_time,
83
+ :duration
88
84
 
89
85
  attr_writer :sampled,
90
- :priority
86
+ :priority
91
87
 
92
88
  # Populated with the trace sample once this transaction is completed.
93
89
  attr_reader :transaction_trace
@@ -100,13 +96,13 @@ module NewRelic
100
96
  Tracer.current_transaction
101
97
  end
102
98
 
103
- def self.set_default_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
104
- txn = tl_current
99
+ def self.set_default_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
100
+ txn = tl_current
105
101
  name = name_from_partial(partial_name, category || txn.category)
106
102
  txn.set_default_transaction_name(name, category)
107
103
  end
108
104
 
109
- def self.set_overriding_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
105
+ def self.set_overriding_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
110
106
  txn = tl_current
111
107
  return unless txn
112
108
 
@@ -119,38 +115,15 @@ module NewRelic
119
115
  "#{namer.prefix_for_category(self, category)}#{partial_name}"
120
116
  end
121
117
 
122
- def self.wrap(state, name, category, options = {})
123
- Deprecator.deprecate 'Transaction.wrap',
124
- 'Tracer#in_transaction'
125
-
126
- finishable = Tracer.start_transaction_or_segment(
127
- name: name,
128
- category: category,
129
- options: options
130
- )
131
-
132
- begin
133
- # We shouldn't raise from Transaction.start, but only wrap the yield
134
- # to be absolutely sure we don't report agent problems as app errors
135
- yield
136
- rescue => e
137
- Transaction.notice_error(e)
138
- raise e
139
- ensure
140
- finishable.finish if finishable
141
- end
142
- end
143
-
144
118
  def self.start_new_transaction(state, category, options)
145
119
  txn = Transaction.new(category, options)
146
120
  state.reset(txn)
147
- txn.state = state
148
- txn.start
121
+ txn.start(options)
149
122
  txn
150
123
  end
151
124
 
152
125
  def self.nested_transaction_name(name)
153
- if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(OTHER_TRANSACTION_PREFIX)
126
+ if name.start_with?(CONTROLLER_PREFIX, OTHER_TRANSACTION_PREFIX)
154
127
  "#{NESTED_TRANSACTION_PREFIX}#{name}"
155
128
  else
156
129
  name
@@ -165,7 +138,7 @@ module NewRelic
165
138
  end
166
139
 
167
140
  # See NewRelic::Agent.notice_error for options and commentary
168
- def self.notice_error(e, options={})
141
+ def self.notice_error(e, options = {})
169
142
  if txn = Tracer.current_transaction
170
143
  txn.notice_error(e, options)
171
144
  elsif NewRelic::Agent.instance
@@ -178,7 +151,7 @@ module NewRelic
178
151
  #
179
152
  # @api public
180
153
  #
181
- def self.recording_web_transaction? #THREAD_LOCAL_ACCESS
154
+ def self.recording_web_transaction? # THREAD_LOCAL_ACCESS
182
155
  NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
183
156
 
184
157
  txn = tl_current
@@ -191,7 +164,7 @@ module NewRelic
191
164
  :apdex_f
192
165
  when duration <= apdex_t
193
166
  :apdex_s
194
- when duration <= 4 * apdex_t
167
+ when duration <= apdex_t * 4
195
168
  :apdex_t
196
169
  else
197
170
  :apdex_f
@@ -202,7 +175,7 @@ module NewRelic
202
175
  if txn = tl_current
203
176
  txn.add_agent_attribute(key, value, default_destinations)
204
177
  else
205
- NewRelic::Agent.logger.debug "Attempted to add agent attribute: #{key} without transaction"
178
+ NewRelic::Agent.logger.debug("Attempted to add agent attribute: #{key} without transaction")
206
179
  end
207
180
  end
208
181
 
@@ -215,7 +188,7 @@ module NewRelic
215
188
  if txn = tl_current
216
189
  txn.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
217
190
  else
218
- NewRelic::Agent.logger.debug "Attempted to merge untrusted attributes without transaction"
191
+ NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without transaction")
219
192
  end
220
193
  end
221
194
 
@@ -229,8 +202,8 @@ module NewRelic
229
202
  if defined? JRuby
230
203
  begin
231
204
  require 'java'
232
- java_import 'java.lang.management.ManagementFactory'
233
- java_import 'com.sun.management.OperatingSystemMXBean'
205
+ java_import('java.lang.management.ManagementFactory')
206
+ java_import('com.sun.management.OperatingSystemMXBean')
234
207
  @@java_classes_loaded = true
235
208
  rescue
236
209
  end
@@ -238,17 +211,19 @@ module NewRelic
238
211
 
239
212
  def initialize(category, options)
240
213
  @nesting_max_depth = 0
241
- @current_segment = nil
214
+ @current_segment_by_thread = {}
215
+ @current_segment_lock = Mutex.new
242
216
  @segments = []
243
217
 
244
218
  self.default_name = options[:transaction_name]
245
- @overridden_name = nil
246
- @frozen_name = nil
219
+ @overridden_name = nil
220
+ @frozen_name = nil
247
221
 
248
222
  @category = category
249
- @start_time = Time.now
223
+ @start_time = Process.clock_gettime(Process::CLOCK_REALTIME)
250
224
  @end_time = nil
251
225
  @duration = nil
226
+
252
227
  @apdex_start = options[:apdex_start_time] || @start_time
253
228
  @jruby_cpu_start = jruby_cpu_time
254
229
  @process_cpu_start = process_cpu
@@ -257,6 +232,7 @@ module NewRelic
257
232
 
258
233
  @exceptions = {}
259
234
  @metrics = TransactionMetrics.new
235
+ @logs = PrioritySampledBuffer.new(NewRelic::Agent.instance.log_event_aggregator.capacity)
260
236
  @guid = NewRelic::Agent::GuidGenerator.generate_guid
261
237
 
262
238
  @ignore_this_transaction = false
@@ -268,24 +244,52 @@ module NewRelic
268
244
  @priority = nil
269
245
 
270
246
  @starting_thread_id = Thread.current.object_id
247
+ @starting_segment_key = current_segment_key
271
248
 
272
249
  @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
273
250
 
274
251
  merge_request_parameters(@filtered_params)
275
252
 
276
253
  if request = options[:request]
277
- @request_attributes = RequestAttributes.new request
254
+ @request_attributes = RequestAttributes.new(request)
278
255
  else
279
256
  @request_attributes = nil
280
257
  end
281
258
  end
282
259
 
260
+ def state
261
+ NewRelic::Agent::Tracer.state
262
+ end
263
+
264
+ def current_segment_key
265
+ Tracer.current_segment_key
266
+ end
267
+
268
+ def parent_segment_key
269
+ (::Fiber.current.nr_parent_key if ::Fiber.current.respond_to?(:nr_parent_key)) || (::Thread.current.nr_parent_key if ::Thread.current.respond_to?(:nr_parent_key))
270
+ end
271
+
272
+ def current_segment
273
+ current_segment_by_thread[current_segment_key] ||
274
+ current_segment_by_thread[parent_segment_key] ||
275
+ current_segment_by_thread[@starting_segment_key]
276
+ end
277
+
278
+ def set_current_segment(new_segment)
279
+ @current_segment_lock.synchronize { current_segment_by_thread[current_segment_key] = new_segment }
280
+ end
281
+
282
+ def remove_current_segment_by_thread_id(id)
283
+ @current_segment_lock.synchronize { current_segment_by_thread.delete(id) }
284
+ end
285
+
283
286
  def distributed_tracer
284
287
  @distributed_tracer ||= DistributedTracer.new(self)
285
288
  end
286
289
 
287
290
  def sampled?
288
291
  return unless Agent.config[:'distributed_tracing.enabled']
292
+
289
293
  if @sampled.nil?
290
294
  @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
291
295
  end
@@ -293,7 +297,7 @@ module NewRelic
293
297
  end
294
298
 
295
299
  def trace_id
296
- @trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid 32
300
+ @trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid(32)
297
301
  end
298
302
 
299
303
  def trace_id=(value)
@@ -301,7 +305,7 @@ module NewRelic
301
305
  end
302
306
 
303
307
  def priority
304
- @priority ||= (sampled? ? 1.0 + rand : rand).round(NewRelic::PRIORITY_PRECISION)
308
+ @priority ||= (sampled? ? rand + 1.0 : rand).round(NewRelic::PRIORITY_PRECISION)
305
309
  end
306
310
 
307
311
  def referer
@@ -316,7 +320,7 @@ module NewRelic
316
320
  @request_attributes && @request_attributes.port
317
321
  end
318
322
 
319
- # This transaction-local hash may be used as temprory storage by
323
+ # This transaction-local hash may be used as temporary storage by
320
324
  # instrumentation that needs to pass data from one instrumentation point
321
325
  # to another.
322
326
  #
@@ -348,6 +352,7 @@ module NewRelic
348
352
 
349
353
  def set_default_transaction_name(name, category)
350
354
  return log_frozen_name(name) if name_frozen?
355
+
351
356
  if influences_transaction_name?(category)
352
357
  self.default_name = name
353
358
  @category = category if category
@@ -356,10 +361,9 @@ module NewRelic
356
361
 
357
362
  def set_overriding_transaction_name(name, category)
358
363
  return log_frozen_name(name) if name_frozen?
359
- if influences_transaction_name?(category)
360
- self.overridden_name = name
361
- @category = category if category
362
- end
364
+
365
+ self.overridden_name = name
366
+ @category = category if category
363
367
  end
364
368
 
365
369
  def log_frozen_name(name)
@@ -373,9 +377,9 @@ module NewRelic
373
377
 
374
378
  def best_name
375
379
  @frozen_name ||
376
- @overridden_name ||
377
- @default_name ||
378
- NewRelic::Agent::UNKNOWN_METRIC
380
+ @overridden_name ||
381
+ @default_name ||
382
+ NewRelic::Agent::UNKNOWN_METRIC
379
383
  end
380
384
 
381
385
  # For common interface with Trace
@@ -413,32 +417,33 @@ module NewRelic
413
417
  @frozen_name ? true : false
414
418
  end
415
419
 
416
- def start
420
+ def start(options = {})
417
421
  return if !state.is_execution_traced?
418
422
 
419
- sql_sampler.on_start_transaction(state, start_time, request_path)
423
+ sql_sampler.on_start_transaction(state, request_path)
420
424
  NewRelic::Agent.instance.events.notify(:start_transaction)
421
425
  NewRelic::Agent::TransactionTimeAggregator.transaction_start(start_time)
422
426
 
423
427
  ignore! if user_defined_rules_ignore?
424
428
 
425
- create_initial_segment
426
- Segment.merge_untrusted_agent_attributes \
429
+ create_initial_segment(options)
430
+ Segment.merge_untrusted_agent_attributes( \
427
431
  @filtered_params,
428
432
  :'request.parameters',
429
433
  AttributeFilter::DST_SPAN_EVENTS
434
+ )
430
435
  end
431
436
 
432
437
  def initial_segment
433
438
  segments.first
434
439
  end
435
440
 
436
- def create_initial_segment
437
- segment = create_segment @default_name
441
+ def create_initial_segment(options = {})
442
+ segment = create_segment(@default_name, options)
438
443
  segment.record_scoped_metric = false
439
444
  end
440
445
 
441
- def create_segment(name)
446
+ def create_segment(name, options = {})
442
447
  summary_metrics = nil
443
448
 
444
449
  if name.start_with?(MIDDLEWARE_PREFIX)
@@ -452,6 +457,10 @@ module NewRelic
452
457
  unscoped_metrics: summary_metrics
453
458
  )
454
459
 
460
+ # #code_information will glean the code info out of the options hash
461
+ # if it exists or noop otherwise
462
+ segment.code_information = options
463
+
455
464
  segment
456
465
  end
457
466
 
@@ -461,18 +470,19 @@ module NewRelic
461
470
  merge_request_parameters(options[:filtered_params])
462
471
  end
463
472
 
464
- @ignore_apdex = options[:ignore_apdex] if options.key? :ignore_apdex
465
- @ignore_enduser = options[:ignore_enduser] if options.key? :ignore_enduser
473
+ @ignore_apdex = options[:ignore_apdex] if options.key?(:ignore_apdex)
474
+ @ignore_enduser = options[:ignore_enduser] if options.key?(:ignore_enduser)
466
475
 
467
476
  nest_initial_segment if segments.length == 1
468
- nested_name = self.class.nested_transaction_name options[:transaction_name]
469
- segment = create_segment nested_name
477
+ nested_name = self.class.nested_transaction_name(options[:transaction_name])
478
+
479
+ segment = create_segment(nested_name, options)
470
480
  set_default_transaction_name(options[:transaction_name], category)
471
481
  segment
472
482
  end
473
483
 
474
484
  def nest_initial_segment
475
- self.initial_segment.name = self.class.nested_transaction_name initial_segment.name
485
+ self.initial_segment.name = self.class.nested_transaction_name(initial_segment.name)
476
486
  initial_segment.record_scoped_metric = true
477
487
  end
478
488
 
@@ -505,8 +515,9 @@ module NewRelic
505
515
 
506
516
  def finish
507
517
  return unless state.is_execution_traced?
508
- @end_time = Time.now
509
- @duration = @end_time.to_f - @start_time.to_f
518
+
519
+ @end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
520
+ @duration = @end_time - @start_time
510
521
  freeze_name_and_execute_if_not_ignored
511
522
 
512
523
  if nesting_max_depth == 1
@@ -554,6 +565,7 @@ module NewRelic
554
565
 
555
566
  record_exceptions
556
567
  record_transaction_event
568
+ record_log_events
557
569
  merge_metrics
558
570
  send_transaction_finished_event
559
571
  end
@@ -561,14 +573,14 @@ module NewRelic
561
573
  def assign_segment_dt_attributes
562
574
  dt_payload = distributed_tracer.trace_state_payload || distributed_tracer.distributed_trace_payload
563
575
  parent_attributes = {}
564
- DistributedTraceAttributes.copy_parent_attributes self, dt_payload, parent_attributes
565
- parent_attributes.each { |k, v| initial_segment.add_agent_attribute k, v }
576
+ DistributedTraceAttributes.copy_parent_attributes(self, dt_payload, parent_attributes)
577
+ parent_attributes.each { |k, v| initial_segment.add_agent_attribute(k, v) }
566
578
  end
567
579
 
568
580
  def assign_agent_attributes
569
581
  default_destinations = AttributeFilter::DST_TRANSACTION_TRACER |
570
- AttributeFilter::DST_TRANSACTION_EVENTS |
571
- AttributeFilter::DST_ERROR_COLLECTOR
582
+ AttributeFilter::DST_TRANSACTION_EVENTS |
583
+ AttributeFilter::DST_ERROR_COLLECTOR
572
584
 
573
585
  if http_response_code
574
586
  add_agent_attribute(:'http.statusCode', http_response_code, default_destinations)
@@ -583,7 +595,7 @@ module NewRelic
583
595
  end
584
596
 
585
597
  if @request_attributes
586
- @request_attributes.assign_agent_attributes self
598
+ @request_attributes.assign_agent_attributes(self)
587
599
  end
588
600
 
589
601
  display_host = Agent.config[:'process_host.display_name']
@@ -620,11 +632,11 @@ module NewRelic
620
632
  # This method returns transport_duration in seconds. Transport duration
621
633
  # is stored in milliseconds on the payload, but it's needed in seconds
622
634
  # for metrics and intrinsics.
623
- def calculate_transport_duration distributed_trace_payload
635
+ def calculate_transport_duration(distributed_trace_payload)
624
636
  return unless distributed_trace_payload
625
637
 
626
- duration = (start_time.to_f * 1000 - distributed_trace_payload.timestamp) / 1000
627
- duration < 0 ? 0 : duration
638
+ duration = start_time - (distributed_trace_payload.timestamp / 1000.0)
639
+ [duration, 0].max
628
640
  end
629
641
 
630
642
  # The summary metrics recorded by this method all end up with a duration
@@ -643,14 +655,14 @@ module NewRelic
643
655
 
644
656
  def generate_payload
645
657
  @payload = {
646
- :name => @frozen_name,
647
- :bucket => recording_web_transaction? ? :request : :background,
648
- :start_timestamp => start_time.to_f,
649
- :duration => duration,
650
- :metrics => @metrics,
651
- :attributes => @attributes,
652
- :error => false,
653
- :priority => priority
658
+ :name => @frozen_name,
659
+ :bucket => recording_web_transaction? ? :request : :background,
660
+ :start_timestamp => start_time,
661
+ :duration => duration,
662
+ :metrics => @metrics,
663
+ :attributes => @attributes,
664
+ :error => false,
665
+ :priority => priority
654
666
  }
655
667
 
656
668
  distributed_tracer.append_payload(@payload)
@@ -663,7 +675,7 @@ module NewRelic
663
675
  end
664
676
 
665
677
  def is_synthetics_request?
666
- synthetics_payload != nil && raw_synthetics_header != nil
678
+ !synthetics_payload.nil? && !raw_synthetics_header.nil?
667
679
  end
668
680
 
669
681
  def synthetics_version
@@ -704,7 +716,6 @@ module NewRelic
704
716
  when :apdex_s then APDEX_S
705
717
  when :apdex_t then APDEX_T
706
718
  when :apdex_f then APDEX_F
707
- else nil
708
719
  end
709
720
  payload[:apdex_perf_zone] = bucket_str if bucket_str
710
721
  end
@@ -713,8 +724,8 @@ module NewRelic
713
724
  return unless is_synthetics_request?
714
725
 
715
726
  payload[:synthetics_resource_id] = synthetics_resource_id
716
- payload[:synthetics_job_id] = synthetics_job_id
717
- payload[:synthetics_monitor_id] = synthetics_monitor_id
727
+ payload[:synthetics_job_id] = synthetics_job_id
728
+ payload[:synthetics_monitor_id] = synthetics_monitor_id
718
729
  end
719
730
 
720
731
  def merge_metrics
@@ -724,35 +735,38 @@ module NewRelic
724
735
  def record_exceptions
725
736
  error_recorded = false
726
737
  @exceptions.each do |exception, options|
727
- options[:uri] ||= request_path if request_path
728
- options[:port] = request_port if request_port
729
- options[:metric] = best_name
738
+ options[:uri] ||= request_path if request_path
739
+ options[:port] = request_port if request_port
740
+ options[:metric] = best_name
730
741
  options[:attributes] = @attributes
731
742
 
732
- span_id = options.delete :span_id
743
+ span_id = options.delete(:span_id)
733
744
  error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
734
745
  end
735
746
  payload[:error] = error_recorded if payload
736
747
  end
737
748
 
738
749
  # Do not call this. Invoke the class method instead.
739
- def notice_error(error, options={}) # :nodoc:
740
-
750
+ def notice_error(error, options = {}) # :nodoc:
741
751
  # Only the last error is kept
742
- if @current_segment
743
- @current_segment.notice_error error, expected: options[:expected]
744
- options[:span_id] = @current_segment.guid
752
+ if current_segment
753
+ current_segment.notice_error(error, expected: options[:expected])
754
+ options[:span_id] = current_segment.guid
745
755
  end
746
756
 
747
757
  if @exceptions[error]
748
- @exceptions[error].merge! options
758
+ @exceptions[error].merge!(options)
749
759
  else
750
760
  @exceptions[error] = options
751
761
  end
752
762
  end
753
763
 
754
764
  def record_transaction_event
755
- agent.transaction_event_recorder.record payload
765
+ agent.transaction_event_recorder.record(payload)
766
+ end
767
+
768
+ def record_log_events
769
+ agent.log_event_aggregator.record_batch(self, @logs.to_a)
756
770
  end
757
771
 
758
772
  def queue_time
@@ -792,8 +806,8 @@ module NewRelic
792
806
  record_apdex_metrics(APDEX_METRIC, APDEX_TXN_METRIC_PREFIX, apdex_t)
793
807
  else
794
808
  record_apdex_metrics(APDEX_OTHER_METRIC,
795
- APDEX_OTHER_TXN_METRIC_PREFIX,
796
- transaction_specific_apdex_t)
809
+ APDEX_OTHER_TXN_METRIC_PREFIX,
810
+ transaction_specific_apdex_t)
797
811
  end
798
812
  end
799
813
  end
@@ -801,9 +815,9 @@ module NewRelic
801
815
  def record_apdex_metrics(rollup_metric, transaction_prefix, current_apdex_t)
802
816
  return unless current_apdex_t
803
817
 
804
- total_duration = end_time - apdex_start
818
+ total_duration = end_time - apdex_start
805
819
  apdex_bucket_global = apdex_bucket(total_duration, current_apdex_t)
806
- apdex_bucket_txn = apdex_bucket(duration, current_apdex_t)
820
+ apdex_bucket_txn = apdex_bucket(duration, current_apdex_t)
807
821
 
808
822
  @metrics.record_unscoped(rollup_metric, apdex_bucket_global, current_apdex_t)
809
823
  @metrics.record_unscoped(APDEX_ALL_METRIC, apdex_bucket_global, current_apdex_t)
@@ -821,7 +835,7 @@ module NewRelic
821
835
  end
822
836
 
823
837
  def threshold
824
- source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
838
+ source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
825
839
  if source_class == Configuration::DefaultSource
826
840
  apdex_t * 4
827
841
  else
@@ -829,7 +843,7 @@ module NewRelic
829
843
  end
830
844
  end
831
845
 
832
- def with_database_metric_name(model, method, product=nil)
846
+ def with_database_metric_name(model, method, product = nil)
833
847
  previous = self.instrumentation_state[:datastore_override]
834
848
  model_name = case model
835
849
  when Class
@@ -838,7 +852,7 @@ module NewRelic
838
852
  model
839
853
  else
840
854
  model.to_s
841
- end
855
+ end
842
856
  self.instrumentation_state[:datastore_override] = [method, model_name, product]
843
857
  yield
844
858
  ensure
@@ -849,6 +863,10 @@ module NewRelic
849
863
  attributes.merge_custom_attributes(p)
850
864
  end
851
865
 
866
+ def add_log_event(event)
867
+ logs.append(event: event)
868
+ end
869
+
852
870
  def recording_web_transaction?
853
871
  web_category?(@category)
854
872
  end
@@ -867,11 +885,13 @@ module NewRelic
867
885
 
868
886
  def normal_cpu_burn
869
887
  return unless @process_cpu_start
888
+
870
889
  process_cpu - @process_cpu_start
871
890
  end
872
891
 
873
892
  def jruby_cpu_burn
874
893
  return unless @jruby_cpu_start
894
+
875
895
  jruby_cpu_time - @jruby_cpu_start
876
896
  end
877
897
 
@@ -907,18 +927,21 @@ module NewRelic
907
927
 
908
928
  def process_cpu
909
929
  return nil if defined? JRuby
930
+
910
931
  p = Process.times
911
932
  p.stime + p.utime
912
933
  end
913
934
 
914
935
  def jruby_cpu_time
915
936
  return nil unless @@java_classes_loaded
937
+
916
938
  threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()
917
939
 
918
940
  return nil unless threadMBean.isCurrentThreadCpuTimeSupported
919
- java_utime = threadMBean.getCurrentThreadUserTime() # ns
920
941
 
921
- -1 == java_utime ? 0.0 : java_utime/1e9
942
+ java_utime = threadMBean.getCurrentThreadUserTime() # ns
943
+
944
+ -1 == java_utime ? 0.0 : java_utime / 1e9
922
945
  rescue => e
923
946
  ::NewRelic::Agent.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
924
947
  ::NewRelic::Agent.logger.debug(JRUBY_CPU_TIME_ERROR, e)