newrelic_rpm 6.15.0 → 8.13.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (427) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +7 -1
  3. data/.rubocop.yml +1817 -0
  4. data/.rubocop_todo.yml +59 -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 +754 -40
  10. data/CONTRIBUTING.md +32 -5
  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 +21 -20
  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/shutdown.rb +35 -0
  30. data/lib/new_relic/agent/agent/special_startup.rb +72 -0
  31. data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
  32. data/lib/new_relic/agent/agent/startup.rb +197 -0
  33. data/lib/new_relic/agent/agent.rb +178 -555
  34. data/lib/new_relic/agent/agent_logger.rb +23 -19
  35. data/lib/new_relic/agent/attribute_filter.rb +66 -47
  36. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  37. data/lib/new_relic/agent/attributes.rb +5 -4
  38. data/lib/new_relic/agent/audit_logger.rb +8 -3
  39. data/lib/new_relic/agent/autostart.rb +20 -19
  40. data/lib/new_relic/agent/chained_call.rb +1 -1
  41. data/lib/new_relic/agent/commands/agent_command.rb +3 -3
  42. data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
  43. data/lib/new_relic/agent/commands/thread_profiler_session.rb +9 -7
  44. data/lib/new_relic/agent/configuration/default_source.rb +1728 -1194
  45. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  46. data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
  47. data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
  48. data/lib/new_relic/agent/configuration/high_security_source.rb +9 -8
  49. data/lib/new_relic/agent/configuration/manager.rb +82 -69
  50. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  51. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  52. data/lib/new_relic/agent/configuration/security_policy_source.rb +90 -77
  53. data/lib/new_relic/agent/configuration/server_source.rb +21 -19
  54. data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
  55. data/lib/new_relic/agent/configuration.rb +1 -1
  56. data/lib/new_relic/agent/connect/request_builder.rb +18 -18
  57. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  58. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
  59. data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
  60. data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
  61. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  62. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  63. data/lib/new_relic/agent/database.rb +53 -47
  64. data/lib/new_relic/agent/database_adapter.rb +3 -1
  65. data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
  66. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  67. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
  68. data/lib/new_relic/agent/datastores/mongo.rb +6 -11
  69. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  70. data/lib/new_relic/agent/datastores/redis.rb +5 -11
  71. data/lib/new_relic/agent/datastores.rb +11 -13
  72. data/lib/new_relic/agent/deprecator.rb +1 -1
  73. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
  74. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +39 -32
  75. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
  76. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
  77. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
  79. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
  80. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
  81. data/lib/new_relic/agent/distributed_tracing.rb +32 -100
  82. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  83. data/lib/new_relic/agent/error_collector.rb +73 -54
  84. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  85. data/lib/new_relic/agent/error_filter.rb +174 -0
  86. data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
  87. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  88. data/lib/new_relic/agent/event_buffer.rb +7 -8
  89. data/lib/new_relic/agent/event_listener.rb +1 -2
  90. data/lib/new_relic/agent/event_loop.rb +25 -23
  91. data/lib/new_relic/agent/external.rb +11 -44
  92. data/lib/new_relic/agent/guid_generator.rb +4 -11
  93. data/lib/new_relic/agent/harvester.rb +4 -5
  94. data/lib/new_relic/agent/heap.rb +6 -8
  95. data/lib/new_relic/agent/hostname.rb +20 -13
  96. data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
  97. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
  98. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
  99. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
  100. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
  101. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
  102. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
  103. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
  104. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +8 -8
  105. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
  106. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -13
  107. data/lib/new_relic/agent/instrumentation/active_job.rb +14 -7
  108. data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
  109. data/lib/new_relic/agent/instrumentation/active_record.rb +29 -27
  110. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
  111. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +31 -44
  112. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
  113. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
  114. data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
  115. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +18 -15
  116. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  117. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  118. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  119. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  120. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +18 -10
  121. data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -2
  122. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  123. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  124. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  125. data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
  126. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +68 -58
  127. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  128. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  129. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  130. data/lib/new_relic/agent/instrumentation/curb.rb +11 -243
  131. data/lib/new_relic/agent/instrumentation/data_mapper.rb +65 -54
  132. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
  133. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  134. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  135. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +29 -53
  136. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  137. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  138. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  139. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  140. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +5 -5
  141. data/lib/new_relic/agent/instrumentation/excon.rb +22 -24
  142. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  143. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  144. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  145. data/lib/new_relic/agent/instrumentation/grape.rb +11 -112
  146. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  147. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  148. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  149. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  150. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  151. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  152. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  153. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  154. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  155. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  156. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  157. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  158. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  159. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  160. data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
  161. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  162. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  163. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  164. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  165. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
  166. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  167. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  168. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  169. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  170. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  171. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +57 -128
  172. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  173. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  174. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
  175. data/lib/new_relic/agent/instrumentation/memcache.rb +56 -72
  176. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -12
  177. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
  178. data/lib/new_relic/agent/instrumentation/mongo.rb +5 -136
  179. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
  180. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  181. data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +13 -13
  182. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  183. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  184. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +10 -9
  185. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  186. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  187. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  188. data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
  189. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
  190. data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
  191. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  192. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  193. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  194. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  195. data/lib/new_relic/agent/instrumentation/rack.rb +30 -140
  196. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +16 -52
  197. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  198. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +5 -4
  199. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -3
  200. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
  201. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +13 -3
  202. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  203. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
  204. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  205. data/lib/new_relic/agent/instrumentation/rake.rb +16 -157
  206. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  207. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  208. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +72 -0
  209. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  210. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  211. data/lib/new_relic/agent/instrumentation/redis.rb +18 -107
  212. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  213. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  214. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  215. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  216. data/lib/new_relic/agent/instrumentation/resque.rb +28 -39
  217. data/lib/new_relic/agent/instrumentation/sequel.rb +14 -16
  218. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
  219. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  220. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  221. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  222. data/lib/new_relic/agent/instrumentation/sidekiq.rb +23 -64
  223. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  224. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
  225. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
  226. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  227. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  228. data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
  229. data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -3
  230. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  231. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  232. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  233. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  234. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  235. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  236. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  237. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  238. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  239. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  240. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  241. data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
  242. data/lib/new_relic/agent/instrumentation.rb +1 -1
  243. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  244. data/lib/new_relic/agent/javascript_instrumentor.rb +47 -41
  245. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  246. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  247. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  248. data/lib/new_relic/agent/log_once.rb +1 -1
  249. data/lib/new_relic/agent/log_priority.rb +20 -0
  250. data/lib/new_relic/agent/logging.rb +24 -21
  251. data/lib/new_relic/agent/memory_logger.rb +2 -2
  252. data/lib/new_relic/agent/messaging.rb +65 -81
  253. data/lib/new_relic/agent/method_tracer.rb +154 -149
  254. data/lib/new_relic/agent/method_tracer_helpers.rb +85 -3
  255. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +25 -17
  256. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  257. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  258. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
  259. data/lib/new_relic/agent/monitors.rb +6 -7
  260. data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
  261. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
  262. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  263. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -4
  264. data/lib/new_relic/agent/new_relic_service.rb +248 -196
  265. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  266. data/lib/new_relic/agent/null_logger.rb +7 -3
  267. data/lib/new_relic/agent/obfuscator.rb +8 -10
  268. data/lib/new_relic/agent/parameter_filtering.rb +24 -10
  269. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  270. data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
  271. data/lib/new_relic/agent/pipe_service.rb +8 -5
  272. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  273. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
  274. data/lib/new_relic/agent/range_extensions.rb +8 -28
  275. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  276. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -13
  277. data/lib/new_relic/agent/rules_engine.rb +5 -4
  278. data/lib/new_relic/agent/sampler.rb +3 -4
  279. data/lib/new_relic/agent/sampler_collection.rb +3 -4
  280. data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
  281. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +12 -9
  282. data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
  283. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  284. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  285. data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
  286. data/lib/new_relic/agent/span_event_primitive.rb +62 -56
  287. data/lib/new_relic/agent/sql_sampler.rb +18 -18
  288. data/lib/new_relic/agent/stats.rb +78 -41
  289. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  290. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  291. data/lib/new_relic/agent/stats_engine.rb +8 -8
  292. data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
  293. data/lib/new_relic/agent/system_info.rb +85 -65
  294. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  295. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  296. data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
  297. data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
  298. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  299. data/lib/new_relic/agent/tracer.rb +76 -85
  300. data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
  301. data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
  302. data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
  303. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  304. data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
  305. data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
  306. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  307. data/lib/new_relic/agent/transaction/segment.rb +14 -10
  308. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  309. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  310. data/lib/new_relic/agent/transaction/trace.rb +15 -11
  311. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  312. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  313. data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
  314. data/lib/new_relic/agent/transaction/tracing.rb +14 -11
  315. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +4 -4
  316. data/lib/new_relic/agent/transaction.rb +164 -145
  317. data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
  318. data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
  319. data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
  320. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  321. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  322. data/lib/new_relic/agent/transaction_sampler.rb +5 -6
  323. data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
  324. data/lib/new_relic/agent/utilization/aws.rb +33 -3
  325. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  326. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  327. data/lib/new_relic/agent/utilization/pcf.rb +5 -4
  328. data/lib/new_relic/agent/utilization/vendor.rb +43 -28
  329. data/lib/new_relic/agent/utilization_data.rb +7 -5
  330. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  331. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
  332. data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
  333. data/lib/new_relic/agent/vm/snapshot.rb +5 -5
  334. data/lib/new_relic/agent/vm.rb +1 -1
  335. data/lib/new_relic/agent/worker_loop.rb +10 -12
  336. data/lib/new_relic/agent.rb +64 -75
  337. data/lib/new_relic/cli/command.rb +20 -22
  338. data/lib/new_relic/cli/commands/deployments.rb +92 -42
  339. data/lib/new_relic/cli/commands/install.rb +12 -15
  340. data/lib/new_relic/coerce.rb +15 -13
  341. data/lib/new_relic/collection_helper.rb +50 -48
  342. data/lib/new_relic/constants.rb +1 -4
  343. data/lib/new_relic/control/class_methods.rb +3 -3
  344. data/lib/new_relic/control/frameworks/external.rb +2 -2
  345. data/lib/new_relic/control/frameworks/rails.rb +23 -17
  346. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  347. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  348. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  349. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  350. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  351. data/lib/new_relic/control/frameworks.rb +1 -1
  352. data/lib/new_relic/control/instance_methods.rb +23 -45
  353. data/lib/new_relic/control/instrumentation.rb +39 -11
  354. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  355. data/lib/new_relic/control/server_methods.rb +3 -4
  356. data/lib/new_relic/control.rb +1 -2
  357. data/lib/new_relic/delayed_job_injection.rb +1 -1
  358. data/lib/new_relic/dependency_detection.rb +126 -19
  359. data/lib/new_relic/environment_report.rb +40 -32
  360. data/lib/new_relic/helper.rb +48 -7
  361. data/lib/new_relic/language_support.rb +29 -5
  362. data/lib/new_relic/latest_changes.rb +7 -6
  363. data/lib/new_relic/local_environment.rb +24 -18
  364. data/lib/new_relic/metric_data.rb +31 -26
  365. data/lib/new_relic/metric_spec.rb +8 -6
  366. data/lib/new_relic/noticed_error.rb +22 -30
  367. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  368. data/lib/new_relic/rack/agent_middleware.rb +5 -3
  369. data/lib/new_relic/rack/browser_monitoring.rb +133 -123
  370. data/lib/new_relic/rack.rb +1 -1
  371. data/lib/new_relic/recipes/capistrano3.rb +3 -61
  372. data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
  373. data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
  374. data/lib/new_relic/recipes.rb +1 -1
  375. data/lib/new_relic/supportability_helper.rb +9 -10
  376. data/lib/new_relic/traced_thread.rb +35 -0
  377. data/lib/new_relic/version.rb +6 -17
  378. data/lib/newrelic_rpm.rb +11 -35
  379. data/lib/sequel/extensions/newrelic_instrumentation.rb +12 -15
  380. data/lib/sequel/plugins/newrelic_instrumentation.rb +4 -10
  381. data/lib/tasks/all.rb +3 -3
  382. data/lib/tasks/config.rake +22 -117
  383. data/lib/tasks/coverage_report.rake +28 -0
  384. data/lib/tasks/helpers/config.html.erb +21 -0
  385. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  386. data/lib/tasks/helpers/format.rb +123 -0
  387. data/lib/tasks/helpers/matches.rb +12 -0
  388. data/lib/tasks/helpers/prompt.rb +24 -0
  389. data/lib/tasks/helpers/removers.rb +33 -0
  390. data/lib/tasks/install.rake +4 -0
  391. data/lib/tasks/instrumentation_generator/README.md +63 -0
  392. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  393. data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
  394. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  395. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  396. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  397. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  398. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  399. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  400. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  401. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  402. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  403. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  404. data/lib/tasks/multiverse.rake +4 -0
  405. data/lib/tasks/multiverse.rb +5 -32
  406. data/lib/tasks/newrelic.rb +1 -1
  407. data/lib/tasks/tests.rake +10 -15
  408. data/newrelic.yml +648 -3
  409. data/newrelic_rpm.gemspec +25 -25
  410. data/recipes/newrelic.rb +2 -2
  411. data/test/agent_helper.rb +219 -178
  412. metadata +164 -122
  413. data/ROADMAP.md +0 -24
  414. data/bin/mongrel_rpm +0 -33
  415. data/cert/cacert.pem +0 -1177
  416. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  417. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  418. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  419. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  420. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  421. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  422. data/lib/new_relic/agent/instrumentation/net.rb +0 -70
  423. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  424. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  425. data/lib/new_relic/agent/supported_versions.rb +0 -275
  426. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  427. data/lib/tasks/config.html.erb +0 -32
@@ -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'
6
6
  require 'new_relic/agent/transaction/segment'
@@ -86,9 +86,9 @@ module NewRelic
86
86
  #
87
87
  # @api public
88
88
  def in_transaction(name: nil,
89
- partial_name: nil,
90
- category: nil,
91
- options: {})
89
+ partial_name: nil,
90
+ category:,
91
+ options: {})
92
92
 
93
93
  finishable = start_transaction_or_segment(
94
94
  name: name,
@@ -130,15 +130,11 @@ module NewRelic
130
130
  #
131
131
  # @api public
132
132
  def start_transaction_or_segment(name: nil,
133
- partial_name: nil,
134
- category: nil,
135
- options: {})
136
- if name.nil? && partial_name.nil?
137
- raise ArgumentError, 'missing required argument: name or partial_name'
138
- end
139
- if category.nil?
140
- raise ArgumentError, 'missing required argument: category'
141
- end
133
+ partial_name: nil,
134
+ category:,
135
+ options: {})
136
+
137
+ raise ArgumentError, 'missing required argument: name or partial_name' if name.nil? && partial_name.nil?
142
138
 
143
139
  if name
144
140
  options[:transaction_name] = name
@@ -154,7 +150,6 @@ module NewRelic
154
150
  else
155
151
  Transaction.start_new_transaction(state, category, options)
156
152
  end
157
-
158
153
  rescue ArgumentError
159
154
  raise
160
155
  rescue => exception
@@ -163,16 +158,12 @@ module NewRelic
163
158
 
164
159
  # Takes name or partial_name and a category.
165
160
  # Returns a transaction instance or nil
166
- def start_transaction(name: nil,
167
- partial_name: nil,
168
- category: nil,
169
- **options)
170
- if name.nil? && partial_name.nil?
171
- raise ArgumentError, 'missing required argument: name or partial_name'
172
- end
173
- if category.nil?
174
- raise ArgumentError, 'missing required argument: category'
175
- end
161
+ def start_transaction(category:,
162
+ name: nil,
163
+ partial_name: nil,
164
+ **options)
165
+
166
+ raise ArgumentError, 'missing required argument: name or partial_name' if name.nil? && partial_name.nil?
176
167
 
177
168
  return current_transaction if current_transaction
178
169
 
@@ -186,8 +177,8 @@ module NewRelic
186
177
  end
187
178
 
188
179
  Transaction.start_new_transaction(state,
189
- category,
190
- options)
180
+ category,
181
+ options)
191
182
  rescue ArgumentError
192
183
  raise
193
184
  rescue => exception
@@ -196,11 +187,13 @@ module NewRelic
196
187
 
197
188
  def create_distributed_trace_payload
198
189
  return unless txn = current_transaction
190
+
199
191
  txn.distributed_tracer.create_distributed_trace_payload
200
192
  end
201
193
 
202
194
  def accept_distributed_trace_payload(payload)
203
195
  return unless txn = current_transaction
196
+
204
197
  txn.distributed_tracer.accept_distributed_trace_payload(payload)
205
198
  end
206
199
 
@@ -211,6 +204,7 @@ module NewRelic
211
204
  # @api public
212
205
  def current_segment
213
206
  return unless txn = current_transaction
207
+
214
208
  txn.current_segment
215
209
  end
216
210
 
@@ -238,17 +232,13 @@ module NewRelic
238
232
  # +finish+ on it at the end of the code you're tracing
239
233
  #
240
234
  # @api public
241
- def start_segment(name:nil,
242
- unscoped_metrics:nil,
243
- start_time: nil,
244
- parent: nil)
245
-
246
- # ruby 2.0.0 does not support required kwargs
247
- raise ArgumentError, 'missing required argument: name' if name.nil?
248
-
249
- segment = Transaction::Segment.new name, unscoped_metrics, start_time
250
- start_and_add_segment segment, parent
235
+ def start_segment(name:,
236
+ unscoped_metrics: nil,
237
+ start_time: nil,
238
+ parent: nil)
251
239
 
240
+ segment = Transaction::Segment.new(name, unscoped_metrics, start_time)
241
+ start_and_add_segment(segment, parent)
252
242
  rescue ArgumentError
253
243
  raise
254
244
  rescue => exception
@@ -294,20 +284,19 @@ module NewRelic
294
284
  #
295
285
  # @api public
296
286
  def start_datastore_segment(product: nil,
297
- operation: nil,
298
- collection: nil,
299
- host: nil,
300
- port_path_or_id: nil,
301
- database_name: nil,
302
- start_time: nil,
303
- parent: nil)
287
+ operation: nil,
288
+ collection: nil,
289
+ host: nil,
290
+ port_path_or_id: nil,
291
+ database_name: nil,
292
+ start_time: nil,
293
+ parent: nil)
304
294
 
305
295
  product ||= UNKNOWN
306
296
  operation ||= OTHER
307
297
 
308
- segment = Transaction::DatastoreSegment.new product, operation, collection, host, port_path_or_id, database_name
309
- start_and_add_segment segment, parent
310
-
298
+ segment = Transaction::DatastoreSegment.new(product, operation, collection, host, port_path_or_id, database_name)
299
+ start_and_add_segment(segment, parent)
311
300
  rescue ArgumentError
312
301
  raise
313
302
  rescue => exception
@@ -341,20 +330,14 @@ module NewRelic
341
330
  # you're tracing
342
331
  #
343
332
  # @api public
344
- def start_external_request_segment(library: nil,
345
- uri: nil,
346
- procedure: nil,
347
- start_time: nil,
348
- parent: nil)
349
-
350
- # ruby 2.0.0 does not support required kwargs
351
- raise ArgumentError, 'missing required argument: library' if library.nil?
352
- raise ArgumentError, 'missing required argument: uri' if uri.nil?
353
- raise ArgumentError, 'missing required argument: procedure' if procedure.nil?
354
-
355
- segment = Transaction::ExternalRequestSegment.new library, uri, procedure, start_time
356
- start_and_add_segment segment, parent
357
-
333
+ def start_external_request_segment(library:,
334
+ uri:,
335
+ procedure:,
336
+ start_time: nil,
337
+ parent: nil)
338
+
339
+ segment = Transaction::ExternalRequestSegment.new(library, uri, procedure, start_time)
340
+ start_and_add_segment(segment, parent)
358
341
  rescue ArgumentError
359
342
  raise
360
343
  rescue => exception
@@ -363,34 +346,29 @@ module NewRelic
363
346
 
364
347
  # Will potentially capture and notice an error at the
365
348
  # segment that was executing when error occurred.
366
- # if passed +segment+ is something that doesn't
349
+ # if passed +segment+ is something that doesn't
367
350
  # respond to +notice_segment_error+ then this method
368
351
  # is effectively just a yield to the given &block
369
- def capture_segment_error segment
352
+ def capture_segment_error(segment)
370
353
  return unless block_given?
354
+
371
355
  yield
372
356
  rescue => exception
373
357
  if segment && segment.is_a?(Transaction::AbstractSegment)
374
- segment.notice_error exception
358
+ segment.notice_error(exception)
375
359
  end
376
360
  raise
377
361
  end
378
362
 
379
363
  # For New Relic internal use only.
380
- def start_message_broker_segment(action: nil,
381
- library: nil,
382
- destination_type: nil,
383
- destination_name: nil,
384
- headers: nil,
385
- parameters: nil,
386
- start_time: nil,
387
- parent: nil)
388
-
389
- # ruby 2.0.0 does not support required kwargs
390
- raise ArgumentError, 'missing required argument: action' if action.nil?
391
- raise ArgumentError, 'missing required argument: library' if library.nil?
392
- raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
393
- raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
364
+ def start_message_broker_segment(action:,
365
+ library:,
366
+ destination_type:,
367
+ destination_name:,
368
+ headers: nil,
369
+ parameters: nil,
370
+ start_time: nil,
371
+ parent: nil)
394
372
 
395
373
  segment = Transaction::MessageBrokerSegment.new(
396
374
  action: action,
@@ -401,8 +379,7 @@ module NewRelic
401
379
  parameters: parameters,
402
380
  start_time: start_time
403
381
  )
404
- start_and_add_segment segment, parent
405
-
382
+ start_and_add_segment(segment, parent)
406
383
  rescue ArgumentError
407
384
  raise
408
385
  rescue => exception
@@ -432,13 +409,28 @@ module NewRelic
432
409
 
433
410
  alias_method :tl_clear, :clear_state
434
411
 
412
+ def thread_block_with_current_transaction(*args, &block)
413
+ current_txn = ::Thread.current[:newrelic_tracer_state].current_transaction if ::Thread.current[:newrelic_tracer_state] && ::Thread.current[:newrelic_tracer_state].is_execution_traced?
414
+ proc do
415
+ begin
416
+ if current_txn
417
+ NewRelic::Agent::Tracer.state.current_transaction = current_txn
418
+ segment = NewRelic::Agent::Tracer.start_segment(name: "Ruby/Thread/#{::Thread.current.object_id}")
419
+ end
420
+ yield(*args) if block.respond_to?(:call)
421
+ ensure
422
+ segment.finish if segment
423
+ end
424
+ end
425
+ end
426
+
435
427
  private
436
428
 
437
- def start_and_add_segment segment, parent = nil
429
+ def start_and_add_segment(segment, parent = nil)
438
430
  tracer_state = state
439
431
  if (txn = tracer_state.current_transaction) &&
440
- tracer_state.tracing_enabled?
441
- txn.add_segment segment, parent
432
+ tracer_state.tracing_enabled?
433
+ txn.add_segment(segment, parent)
442
434
  else
443
435
  segment.record_metrics = false
444
436
  end
@@ -455,7 +447,6 @@ module NewRelic
455
447
  # This is THE location to store thread local information during a transaction
456
448
  # Need a new piece of data? Add a method here, NOT a new thread local variable.
457
449
  class State
458
-
459
450
  def initialize
460
451
  @untraced = []
461
452
  @current_transaction = nil
@@ -463,7 +454,7 @@ module NewRelic
463
454
  end
464
455
 
465
456
  # This starts the timer for the transaction.
466
- def reset(transaction=nil)
457
+ def reset(transaction = nil)
467
458
  # We purposefully don't reset @untraced or @record_sql
468
459
  # since those are managed by NewRelic::Agent.disable_* calls explicitly
469
460
  # and (more importantly) outside the scope of a transaction
@@ -473,7 +464,7 @@ module NewRelic
473
464
  end
474
465
 
475
466
  # Current transaction stack
476
- attr_reader :current_transaction
467
+ attr_accessor :current_transaction
477
468
 
478
469
  # Execution tracing on current thread
479
470
  attr_accessor :untraced
@@ -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/range_extensions'
6
6
  require 'new_relic/agent/guid_generator'
@@ -9,9 +9,9 @@ module NewRelic
9
9
  module Agent
10
10
  class Transaction
11
11
  class AbstractSegment
12
- # This class is the base class for all segments. It is reponsible for
12
+ # This class is the base class for all segments. It is responsible for
13
13
  # timing, naming, and defining lifecycle callbacks. One of the more
14
- # complex responsibilites of this class is computing exclusive duration.
14
+ # complex responsibilities of this class is computing exclusive duration.
15
15
  # One of the reasons for this complexity is that exclusive time will be
16
16
  # computed using time ranges or by recording an aggregate value for
17
17
  # a segments children time. The reason for this is that computing
@@ -20,13 +20,14 @@ module NewRelic
20
20
  # after its parent. We will use the optimized exclusive duration
21
21
  # calculation in all other cases.
22
22
  #
23
- attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
23
+ attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_thread_id
24
24
  attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
25
25
  attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
26
26
  attr_reader :noticed_error
27
27
 
28
- def initialize name=nil, start_time=nil
28
+ def initialize(name = nil, start_time = nil)
29
29
  @name = name
30
+ @starting_thread_id = ::Thread.current.object_id
30
31
  @transaction_name = nil
31
32
  @transaction = nil
32
33
  @guid = NewRelic::Agent::GuidGenerator.generate_guid
@@ -36,8 +37,8 @@ module NewRelic
36
37
  @end_time = nil
37
38
  @duration = 0.0
38
39
  @exclusive_duration = 0.0
40
+ @children_timings = []
39
41
  @children_time = 0.0
40
- @children_time_ranges = nil
41
42
  @active_children = 0
42
43
  @range_recorded = false
43
44
  @concurrent_children = false
@@ -45,22 +46,29 @@ module NewRelic
45
46
  @record_scoped_metric = true
46
47
  @record_on_finish = false
47
48
  @noticed_error = nil
49
+ @code_filepath = nil
50
+ @code_function = nil
51
+ @code_lineno = nil
52
+ @code_namespace = nil
48
53
  end
49
54
 
50
55
  def start
51
- @start_time ||= Time.now
56
+ @start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
52
57
  return unless transaction
53
- parent.child_start self if parent
58
+
59
+ parent.child_start(self) if parent
54
60
  end
55
61
 
56
62
  def finish
57
- @end_time = Time.now
58
- @duration = end_time.to_f - start_time.to_f
63
+ @end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
64
+ @duration = end_time - start_time
65
+
59
66
  return unless transaction
67
+
60
68
  run_complete_callbacks
61
69
  finalize if record_on_finish?
62
70
  rescue => e
63
- NewRelic::Agent.logger.error "Exception finishing segment: #{name}", e
71
+ NewRelic::Agent.logger.error("Exception finishing segment: #{name}", e)
64
72
  end
65
73
 
66
74
  def finished?
@@ -94,21 +102,71 @@ module NewRelic
94
102
  end
95
103
 
96
104
  def time_range
97
- @start_time.to_f .. @end_time.to_f
105
+ @start_time.to_f..@end_time.to_f
106
+ end
107
+
108
+ def timings_overlap?(timing1, timing2)
109
+ (timing1.first >= timing2.first && timing1.first <= timing2.last) ||
110
+ (timing2.first >= timing1.first && timing2.first <= timing1.last)
98
111
  end
99
112
 
113
+ def merge_timings(timing1, timing2)
114
+ [(timing1.first < timing2.first ? timing1.first : timing2.first),
115
+ (timing1.last > timing2.last ? timing1.last : timing2.last)]
116
+ end
117
+
118
+ # @children_timings is an array of array, with each inner array
119
+ # holding exactly 2 values, a child segment's start time and finish
120
+ # time (in that order). When it's time to record, these timings are
121
+ # converted into an array of range objects (using the same start and
122
+ # end values as the original array). Any two range objects that
123
+ # intersect and merged into a larger range. This checking for a
124
+ # intersections and merging of ranges is expensive, so the operation
125
+ # is only done at recording time.
100
126
  def children_time_ranges
101
- @children_time_ranges ||= []
127
+ @children_time_ranges ||= begin
128
+ overlapped = @children_timings.each_with_object([]) do |timing, timings|
129
+ i = timings.index { |t| timings_overlap?(t, timing) }
130
+ if i
131
+ timings[i] = merge_timings(timing, timings[i])
132
+ else
133
+ timings << timing
134
+ end
135
+ end
136
+ overlapped.map { |t| Range.new(t.first, t.last) }
137
+ end
102
138
  end
103
139
 
104
140
  def children_time_ranges?
105
- !!@children_time_ranges
141
+ !@children_timings.empty?
106
142
  end
107
143
 
108
144
  def concurrent_children?
109
145
  @concurrent_children
110
146
  end
111
147
 
148
+ def code_information=(info = {})
149
+ return unless info[:filepath]
150
+
151
+ @code_filepath = info[:filepath]
152
+ @code_function = info[:function]
153
+ @code_lineno = info[:lineno]
154
+ @code_namespace = info[:namespace]
155
+ end
156
+
157
+ def all_code_information_present?
158
+ @code_filepath && @code_function && @code_lineno && @code_namespace
159
+ end
160
+
161
+ def code_attributes
162
+ return ::NewRelic::EMPTY_HASH unless all_code_information_present?
163
+
164
+ @code_attributes ||= {'code.filepath' => @code_filepath,
165
+ 'code.function' => @code_function,
166
+ 'code.lineno' => @code_lineno,
167
+ 'code.namespace' => @code_namespace}
168
+ end
169
+
112
170
  INSPECT_IGNORE = [:@transaction, :@transaction_state].freeze
113
171
 
114
172
  def inspect
@@ -122,27 +180,30 @@ module NewRelic
122
180
  def transaction_assigned
123
181
  end
124
182
 
125
- def set_noticed_error noticed_error
183
+ def set_noticed_error(noticed_error)
126
184
  if @noticed_error
127
- NewRelic::Agent.logger.debug \
185
+ NewRelic::Agent.logger.debug( \
128
186
  "Segment: #{name} overwriting previously noticed " \
129
187
  "error: #{@noticed_error.inspect} with: #{noticed_error.inspect}"
188
+ )
130
189
  end
131
190
  @noticed_error = noticed_error
132
191
  end
133
192
 
134
- def notice_error exception, options={}
193
+ def notice_error(exception, options = {})
135
194
  if Agent.config[:high_security]
136
- NewRelic::Agent.logger.debug \
195
+ NewRelic::Agent.logger.debug( \
137
196
  "Segment: #{name} ignores notice_error for " \
138
197
  "error: #{exception.inspect} because :high_security is enabled"
198
+ )
139
199
  else
140
- NewRelic::Agent.instance.error_collector.notice_segment_error self, exception, options
200
+ NewRelic::Agent.instance.error_collector.notice_segment_error(self, exception, options)
141
201
  end
142
202
  end
143
203
 
144
204
  def noticed_error_attributes
145
205
  return unless @noticed_error
206
+
146
207
  @noticed_error.attributes_from_notice_error
147
208
  end
148
209
 
@@ -154,16 +215,16 @@ module NewRelic
154
215
  @range_recorded
155
216
  end
156
217
 
157
- def child_start segment
218
+ def child_start(segment)
158
219
  @active_children += 1
159
- @concurrent_children = @concurrent_children || @active_children > 1
220
+ @concurrent_children ||= @active_children > 1
160
221
 
161
222
  transaction.async = true if @concurrent_children
162
223
  end
163
224
 
164
- def child_complete segment
225
+ def child_complete(segment)
165
226
  @active_children -= 1
166
- record_child_time segment
227
+ record_child_time(segment)
167
228
 
168
229
  if finished?
169
230
  transaction.async = true
@@ -177,36 +238,39 @@ module NewRelic
177
238
  # an ancestor whose end time is greater than or equal to the descendant's
178
239
  # we can stop the propagation. We pass along the direct child so we can
179
240
  # make any corrections needed for exclusive time calculation.
241
+ def descendant_complete(child, descendant)
242
+ add_child_timing(descendant)
180
243
 
181
- def descendant_complete child, descendant
182
- RangeExtensions.merge_or_append descendant.time_range,
183
- children_time_ranges
184
244
  # If this child's time was previously added to this segment's
185
245
  # aggregate children time, we need to re-record it using a time range
186
246
  # for proper exclusive time calculation
187
247
  unless child.range_recorded?
188
248
  self.children_time -= child.duration
189
- record_child_time_as_range child
249
+ record_child_time_as_range(child)
190
250
  end
191
251
 
192
252
  if parent && finished? && descendant.end_time >= end_time
193
- parent.descendant_complete self, descendant
253
+ parent.descendant_complete(self, descendant)
194
254
  end
195
255
  end
196
256
 
197
257
  private
198
258
 
259
+ def add_child_timing(segment)
260
+ @children_timings << [segment.start_time, segment.end_time]
261
+ end
262
+
199
263
  def force_finish
200
264
  finish
201
- NewRelic::Agent.logger.warn "Segment: #{name} was unfinished at " \
265
+ NewRelic::Agent.logger.warn("Segment: #{name} was unfinished at " \
202
266
  "the end of transaction. Timing information for this segment's" \
203
- "parent #{parent.name} in #{transaction.best_name} may be inaccurate."
267
+ "parent #{parent.name} in #{transaction.best_name} may be inaccurate.")
204
268
  end
205
269
 
206
270
  def run_complete_callbacks
207
271
  segment_complete
208
- parent.child_complete self if parent
209
- transaction.segment_complete self
272
+ parent.child_complete(self) if parent
273
+ transaction.segment_complete(self)
210
274
  end
211
275
 
212
276
  def record_metrics
@@ -217,27 +281,26 @@ module NewRelic
217
281
  def segment_complete
218
282
  end
219
283
 
220
- def record_child_time child
284
+ def record_child_time(child)
221
285
  if concurrent_children? || finished? && end_time < child.end_time
222
- record_child_time_as_range child
286
+ record_child_time_as_range(child)
223
287
  else
224
- record_child_time_as_number child
288
+ record_child_time_as_number(child)
225
289
  end
226
290
  end
227
291
 
228
- def record_child_time_as_range child
229
- RangeExtensions.merge_or_append child.time_range,
230
- children_time_ranges
292
+ def record_child_time_as_range(child)
293
+ add_child_timing(child)
231
294
  child.range_recorded = true
232
295
  end
233
296
 
234
- def record_child_time_as_number child
297
+ def record_child_time_as_number(child)
235
298
  self.children_time += child.duration
236
299
  end
237
300
 
238
301
  def record_exclusive_duration
239
302
  overlapping_duration = if children_time_ranges?
240
- RangeExtensions.compute_overlap time_range, children_time_ranges
303
+ RangeExtensions.compute_overlap(time_range, children_time_ranges)
241
304
  else
242
305
  0.0
243
306
  end