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/helper'
6
6
  require 'new_relic/agent/transaction/trace'
@@ -12,10 +12,10 @@ module NewRelic
12
12
  module TraceBuilder
13
13
  extend self
14
14
 
15
- def build_trace transaction
16
- trace = Trace.new transaction.start_time
15
+ def build_trace(transaction)
16
+ trace = Trace.new(transaction.start_time)
17
17
  trace.root_node.exit_timestamp = transaction.end_time - transaction.start_time
18
- copy_attributes transaction, trace
18
+ copy_attributes(transaction, trace)
19
19
  first, *rest = transaction.segments
20
20
  relationship_map = rest.group_by { |s| s.parent }
21
21
  trace.root_node.children << process_segments(transaction, first, trace.root_node, relationship_map)
@@ -25,25 +25,25 @@ module NewRelic
25
25
  private
26
26
 
27
27
  # recursively builds a transaction trace from the flat list of segments
28
- def process_segments transaction, segment, parent, relationship_map
29
- current = create_trace_node transaction, segment, parent
28
+ def process_segments(transaction, segment, parent, relationship_map)
29
+ current = create_trace_node(transaction, segment, parent)
30
30
 
31
31
  if children = relationship_map[segment]
32
32
  current.children = children.map! do |child|
33
- process_segments transaction, child, current, relationship_map
33
+ process_segments(transaction, child, current, relationship_map)
34
34
  end
35
35
  end
36
36
 
37
37
  current
38
38
  end
39
39
 
40
- def create_trace_node transaction, segment, parent
40
+ def create_trace_node(transaction, segment, parent)
41
41
  relative_start = segment.start_time - transaction.start_time
42
42
  relative_end = segment.end_time - transaction.start_time
43
- TraceNode.new segment.name, relative_start, relative_end, segment.params, parent
43
+ TraceNode.new(segment.name, relative_start, relative_end, segment.params, parent)
44
44
  end
45
45
 
46
- def copy_attributes transaction, trace
46
+ def copy_attributes(transaction, trace)
47
47
  trace.transaction_name = transaction.best_name
48
48
  trace.guid = transaction.guid
49
49
  trace.attributes = transaction.attributes
@@ -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
@@ -21,59 +20,60 @@ module NewRelic
21
20
  end
22
21
  end
23
22
 
24
- SUPPORTABILITY_PREFIX = "Supportability/TraceContext"
25
- CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
26
- ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
27
- TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
23
+ SUPPORTABILITY_PREFIX = "Supportability/TraceContext"
24
+ CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
25
+ ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
26
+ TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
28
27
 
29
- CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
30
- CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
28
+ CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
29
+ CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
31
30
 
32
- ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
33
- ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
34
- IGNORE_MULTIPLE_ACCEPT_METRIC = "#{ACCEPT_PREFIX}/Ignored/Multiple"
31
+ ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
32
+ ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
33
+ IGNORE_MULTIPLE_ACCEPT_METRIC = "#{ACCEPT_PREFIX}/Ignored/Multiple"
35
34
  IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept"
36
35
 
37
- NO_NR_ENTRY_TRACESTATE_METRIC = "#{TRACESTATE_PREFIX}/NoNrEntry"
36
+ NO_NR_ENTRY_TRACESTATE_METRIC = "#{TRACESTATE_PREFIX}/NoNrEntry"
38
37
  INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidNrEntry"
39
38
 
40
39
  attr_accessor :trace_context_header_data
41
- attr_reader :trace_state_payload
40
+ attr_reader :trace_state_payload
42
41
 
43
- def trace_parent_header_present? request
42
+ def trace_parent_header_present?(request)
44
43
  request[NewRelic::HTTP_TRACEPARENT_KEY]
45
44
  end
46
45
 
47
- def accept_trace_context_incoming_request request
46
+ def accept_trace_context_incoming_request(request)
48
47
  header_data = NewRelic::Agent::DistributedTracing::TraceContext.parse(
49
48
  format: NewRelic::FORMAT_RACK,
50
49
  carrier: request,
51
- trace_state_entry_key: AccountHelpers.trace_state_entry_key,
50
+ trace_state_entry_key: AccountHelpers.trace_state_entry_key
52
51
  )
53
52
  return if header_data.nil?
54
53
 
55
- accept_trace_context header_data
54
+ accept_trace_context(header_data)
56
55
  end
57
56
  private :accept_trace_context_incoming_request
58
57
 
59
- def insert_trace_context_header header, format=NewRelic::FORMAT_NON_RACK
58
+ def insert_trace_context_header(header, format = NewRelic::FORMAT_NON_RACK)
60
59
  return unless Agent.config[:'distributed_tracing.enabled']
61
60
 
62
- NewRelic::Agent::DistributedTracing::TraceContext.insert \
61
+ NewRelic::Agent::DistributedTracing::TraceContext.insert( \
63
62
  format: format,
64
63
  carrier: header,
65
64
  trace_id: transaction.trace_id.rjust(32, '0').downcase,
66
65
  parent_id: transaction.current_segment.guid,
67
66
  trace_flags: transaction.sampled? ? 0x1 : 0x0,
68
67
  trace_state: create_trace_state
68
+ )
69
69
 
70
70
  @trace_context_inserted = true
71
71
 
72
- NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
72
+ NewRelic::Agent.increment_metric(CREATE_SUCCESS_METRIC)
73
73
  true
74
74
  rescue Exception => e
75
- NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
76
- NewRelic::Agent.logger.warn "Failed to create trace context payload", e
75
+ NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
76
+ NewRelic::Agent.logger.warn("Failed to create trace context payload", e)
77
77
  false
78
78
  end
79
79
 
@@ -82,9 +82,10 @@ module NewRelic
82
82
  payload = create_trace_state_payload
83
83
 
84
84
  if payload
85
- entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry \
85
+ entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry( \
86
86
  entry_key,
87
87
  payload.to_s
88
+ )
88
89
  else
89
90
  entry = NewRelic::EMPTY_STR
90
91
  end
@@ -94,37 +95,37 @@ module NewRelic
94
95
 
95
96
  def create_trace_state_payload
96
97
  unless Agent.config[:'distributed_tracing.enabled']
97
- NewRelic::Agent.logger.warn "Not configured to create WC3 trace context payload"
98
+ NewRelic::Agent.logger.warn("Not configured to create WC3 trace context payload")
98
99
  return
99
100
  end
100
101
 
101
-
102
102
  span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
103
- transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
103
+ transaction_guid = Agent.config[:'transaction_events.enabled'] ? transaction.guid : nil
104
104
 
105
- TraceContextPayload.create \
105
+ TraceContextPayload.create( \
106
106
  parent_account_id: Agent.config[:account_id],
107
107
  parent_app_id: Agent.config[:primary_application_id],
108
108
  transaction_id: transaction_guid,
109
109
  sampled: transaction.sampled?,
110
110
  priority: float!(transaction.priority, NewRelic::PRIORITY_PRECISION),
111
111
  id: span_guid
112
+ )
112
113
  end
113
114
 
114
115
  def assign_trace_state_payload
115
116
  payload = @trace_context_header_data.trace_state_payload
116
117
  unless payload
117
- NewRelic::Agent.increment_metric NO_NR_ENTRY_TRACESTATE_METRIC
118
+ NewRelic::Agent.increment_metric(NO_NR_ENTRY_TRACESTATE_METRIC)
118
119
  return false
119
120
  end
120
121
  unless payload.valid?
121
- NewRelic::Agent.increment_metric INVALID_TRACESTATE_PAYLOAD_METRIC
122
+ NewRelic::Agent.increment_metric(INVALID_TRACESTATE_PAYLOAD_METRIC)
122
123
  return false
123
124
  end
124
125
  @trace_state_payload = payload
125
126
  end
126
127
 
127
- def accept_trace_context header_data
128
+ def accept_trace_context(header_data)
128
129
  return if ignore_trace_context?
129
130
 
130
131
  @trace_context_header_data = header_data
@@ -139,20 +140,20 @@ module NewRelic
139
140
  transaction.sampled = payload.sampled
140
141
  transaction.priority = payload.priority if payload.priority
141
142
  end
142
- NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
143
+ NewRelic::Agent.increment_metric(ACCEPT_SUCCESS_METRIC)
143
144
  true
144
145
  rescue => e
145
- NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
146
- NewRelic::Agent.logger.warn "Failed to accept trace context payload", e
146
+ NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
147
+ NewRelic::Agent.logger.warn("Failed to accept trace context payload", e)
147
148
  false
148
149
  end
149
150
 
150
151
  def ignore_trace_context?
151
152
  if trace_context_header_data
152
- NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
153
+ NewRelic::Agent.increment_metric(IGNORE_MULTIPLE_ACCEPT_METRIC)
153
154
  return true
154
155
  elsif trace_context_inserted?
155
- NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
156
+ NewRelic::Agent.increment_metric(IGNORE_ACCEPT_AFTER_CREATE_METRIC)
156
157
  return true
157
158
  end
158
159
  false
@@ -161,7 +162,6 @@ module NewRelic
161
162
  def trace_context_inserted?
162
163
  @trace_context_inserted ||= false
163
164
  end
164
-
165
165
  end
166
166
  end
167
167
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -17,19 +17,20 @@ module NewRelic
17
17
 
18
18
  UNKNOWN_NODE_NAME = '<unknown>'.freeze
19
19
 
20
- def initialize(metric_name, relative_start, relative_end=nil, params=nil, parent=nil)
20
+ def initialize(metric_name, relative_start, relative_end = nil, params = nil, parent = nil)
21
21
  @entry_timestamp = relative_start
22
- @metric_name = metric_name || UNKNOWN_NODE_NAME
23
- @exit_timestamp = relative_end
24
- @children = nil
25
- @params = select_allowed_params(params)
26
- @parent_node = parent
22
+ @metric_name = metric_name || UNKNOWN_NODE_NAME
23
+ @exit_timestamp = relative_end
24
+ @children = nil
25
+ @params = select_allowed_params(params)
26
+ @parent_node = parent
27
27
  end
28
28
 
29
- def select_allowed_params params
29
+ def select_allowed_params(params)
30
30
  return unless params
31
+
31
32
  params.select do |p|
32
- NewRelic::Agent.instance.attribute_filter.allows_key? p, AttributeFilter::DST_TRANSACTION_SEGMENTS
33
+ NewRelic::Agent.instance.attribute_filter.allows_key?(p, AttributeFilter::DST_TRANSACTION_SEGMENTS)
33
34
  end
34
35
  end
35
36
 
@@ -44,43 +45,43 @@ module NewRelic
44
45
  end
45
46
 
46
47
  def to_array
47
- params = @params ? @params : NewRelic::EMPTY_HASH
48
- [ NewRelic::Helper.time_to_millis(@entry_timestamp),
48
+ params = @params || NewRelic::EMPTY_HASH
49
+ [NewRelic::Helper.time_to_millis(@entry_timestamp),
49
50
  NewRelic::Helper.time_to_millis(@exit_timestamp),
50
51
  NewRelic::Coerce.string(@metric_name),
51
- params ] +
52
- [ (@children ? @children.map{|s| s.to_array} : NewRelic::EMPTY_ARRAY) ]
52
+ params] +
53
+ [(@children ? @children.map { |s| s.to_array } : NewRelic::EMPTY_ARRAY)]
53
54
  end
54
55
 
55
56
  def path_string
56
- "#{metric_name}[#{children.collect {|node| node.path_string }.join('')}]"
57
+ "#{metric_name}[#{children.collect { |node| node.path_string }.join('')}]"
57
58
  end
58
59
 
59
60
  def to_s_compact
60
- str = ""
61
+ str = String.new('')
61
62
  str << metric_name
62
63
  if children.any?
63
- str << "{#{children.map { | cs | cs.to_s_compact }.join(",")}}"
64
+ str << "{#{children.map { |cs| cs.to_s_compact }.join(',')}}"
64
65
  end
65
66
  str
66
67
  end
67
68
 
68
69
  def to_debug_str(depth)
69
- tab = " " * depth
70
+ tab = String.new(' ') * depth
70
71
  s = tab.clone
71
- s << ">> #{'%3i ms' % (@entry_timestamp*1000)} [#{self.class.name.split("::").last}] #{metric_name} \n"
72
+ s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split("::").last}] #{metric_name} \n"
72
73
  unless params.empty?
73
- params.each do |k,v|
74
+ params.each do |k, v|
74
75
  s << "#{tab} -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
75
76
  end
76
77
  end
77
78
  children.each do |cs|
78
79
  s << cs.to_debug_str(depth + 1)
79
80
  end
80
- s << tab + "<< "
81
+ s << tab + '<< '
81
82
  s << case @exit_timestamp
82
83
  when nil then ' n/a'
83
- when Numeric then '%3i ms' % (@exit_timestamp*1000)
84
+ when Numeric then '%3i ms' % (@exit_timestamp * 1000)
84
85
  else @exit_timestamp.to_s
85
86
  end
86
87
  s << " #{metric_name}\n"
@@ -110,7 +111,7 @@ module NewRelic
110
111
 
111
112
  def count_nodes
112
113
  count = 1
113
- children.each { | node | count += node.count_nodes }
114
+ children.each { |node| count += node.count_nodes }
114
115
  count
115
116
  end
116
117
 
@@ -133,7 +134,7 @@ module NewRelic
133
134
  # call the provided block for this node and each
134
135
  # of the called nodes
135
136
  def each_node(&block)
136
- block.call self
137
+ yield(self)
137
138
 
138
139
  if @children
139
140
  @children.each do |node|
@@ -145,7 +146,7 @@ module NewRelic
145
146
  # call the provided block for this node and each
146
147
  # of the called nodes while keeping track of nested nodes
147
148
  def each_node_with_nest_tracking(&block)
148
- summary = block.call self
149
+ summary = yield(self)
149
150
  summary.current_nest_count += 1 if summary
150
151
 
151
152
  if @children
@@ -1,13 +1,12 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
7
7
  class Transaction
8
8
  module Tracing
9
-
10
- attr_reader :current_segment
9
+ attr_reader :current_segment_by_thread
11
10
 
12
11
  def async?
13
12
  @async ||= false
@@ -21,10 +20,10 @@ module NewRelic
21
20
 
22
21
  attr_writer :total_time
23
22
 
24
- def add_segment segment, parent = nil
23
+ def add_segment(segment, parent = nil)
25
24
  segment.transaction = self
26
25
  segment.parent = parent || current_segment
27
- @current_segment = segment
26
+ set_current_segment(segment)
28
27
  if @segments.length < segment_limit
29
28
  @segments << segment
30
29
  else
@@ -34,8 +33,13 @@ module NewRelic
34
33
  segment.transaction_assigned
35
34
  end
36
35
 
37
- def segment_complete segment
38
- @current_segment = segment.parent
36
+ def segment_complete(segment)
37
+ # if parent was in another thread, remove the current_segment entry for this thread
38
+ if segment.parent && segment.parent.starting_thread_id != ::Thread.current.object_id
39
+ remove_current_segment_by_thread_id(::Thread.current.object_id)
40
+ else
41
+ set_current_segment(segment.parent)
42
+ end
39
43
  end
40
44
 
41
45
  def segment_limit
@@ -48,8 +52,7 @@ module NewRelic
48
52
  segments.each { |s| s.finalize }
49
53
  end
50
54
 
51
-
52
- WEB_TRANSACTION_TOTAL_TIME = "WebTransactionTotalTime".freeze
55
+ WEB_TRANSACTION_TOTAL_TIME = "WebTransactionTotalTime".freeze
53
56
  OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
54
57
 
55
58
  def record_total_time_metrics
@@ -59,8 +62,8 @@ module NewRelic
59
62
  OTHER_TRANSACTION_TOTAL_TIME
60
63
  end
61
64
 
62
- @metrics.record_unscoped total_time_metric, total_time
63
- @metrics.record_unscoped "#{total_time_metric}/#{@frozen_name}", total_time
65
+ @metrics.record_unscoped(total_time_metric, total_time)
66
+ @metrics.record_unscoped("#{total_time_metric}/#{@frozen_name}", total_time)
64
67
  end
65
68
  end
66
69
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -9,7 +9,6 @@ module NewRelic
9
9
  attr_reader :samples
10
10
 
11
11
  SINGLE_BUFFER_MAX = 20
12
- NO_SAMPLES = [].freeze
13
12
 
14
13
  def initialize
15
14
  @samples = []
@@ -35,6 +34,7 @@ module NewRelic
35
34
 
36
35
  def store(sample)
37
36
  return unless enabled?
37
+
38
38
  if allow_sample?(sample)
39
39
  add_sample(sample)
40
40
  truncate_samples_if_needed
@@ -43,6 +43,7 @@ module NewRelic
43
43
 
44
44
  def store_previous(previous_samples)
45
45
  return unless enabled?
46
+
46
47
  previous_samples.each do |sample|
47
48
  add_sample(sample) if allow_sample?(sample)
48
49
  end
@@ -81,7 +82,7 @@ module NewRelic
81
82
  # This doesn't use the more convenient #last and #sort_by to avoid
82
83
  # additional array allocations (and abundant alliteration)
83
84
  def truncate_samples
84
- @samples.sort!{|a,b| a.duration <=> b.duration}
85
+ @samples.sort! { |a, b| a.duration <=> b.duration }
85
86
  @samples.slice!(0..-(max_capacity + 1))
86
87
  end
87
88
 
@@ -98,7 +99,6 @@ module NewRelic
98
99
  def add_sample(sample)
99
100
  @samples << sample
100
101
  end
101
-
102
102
  end
103
103
  end
104
104
  end