newrelic_rpm 5.7.0.350 → 7.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (360) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +9 -0
  3. data/.yardopts +1 -0
  4. data/CHANGELOG.md +788 -0
  5. data/CONTRIBUTING.md +106 -19
  6. data/Gemfile +6 -2
  7. data/Guardfile +18 -1
  8. data/LICENSE +208 -38
  9. data/README.md +80 -84
  10. data/ROADMAP.md +24 -0
  11. data/Rakefile +2 -0
  12. data/THIRD_PARTY_NOTICES.md +213 -0
  13. data/bin/nrdebug +1 -1
  14. data/init.rb +1 -1
  15. data/install.rb +1 -1
  16. data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
  17. data/lib/new_relic/agent/agent.rb +176 -191
  18. data/lib/new_relic/agent/agent_logger.rb +5 -1
  19. data/lib/new_relic/agent/attribute_filter.rb +8 -8
  20. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  21. data/lib/new_relic/agent/attributes.rb +152 -0
  22. data/lib/new_relic/agent/audit_logger.rb +11 -1
  23. data/lib/new_relic/agent/autostart.rb +19 -15
  24. data/lib/new_relic/agent/chained_call.rb +1 -1
  25. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  26. data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
  27. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  28. data/lib/new_relic/agent/configuration/default_source.rb +447 -89
  29. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  30. data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
  31. data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
  32. data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
  33. data/lib/new_relic/agent/configuration/manager.rb +16 -12
  34. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  35. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  36. data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
  37. data/lib/new_relic/agent/configuration/server_source.rb +39 -4
  38. data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
  39. data/lib/new_relic/agent/configuration.rb +1 -1
  40. data/lib/new_relic/agent/connect/request_builder.rb +61 -0
  41. data/lib/new_relic/agent/connect/response_handler.rb +61 -0
  42. data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
  43. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  44. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  45. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  46. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  47. data/lib/new_relic/agent/database.rb +2 -3
  48. data/lib/new_relic/agent/database_adapter.rb +33 -0
  49. data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
  50. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
  51. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  52. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
  53. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  54. data/lib/new_relic/agent/datastores/mongo.rb +2 -2
  55. data/lib/new_relic/agent/datastores/redis.rb +1 -5
  56. data/lib/new_relic/agent/datastores.rb +7 -9
  57. data/lib/new_relic/agent/deprecator.rb +1 -1
  58. data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
  59. data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
  60. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  61. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  62. data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +32 -113
  63. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
  64. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
  65. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
  66. data/lib/new_relic/agent/distributed_tracing.rb +115 -32
  67. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  68. data/lib/new_relic/agent/error_collector.rb +37 -20
  69. data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
  70. data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
  71. data/lib/new_relic/agent/event_aggregator.rb +27 -33
  72. data/lib/new_relic/agent/event_buffer.rb +1 -1
  73. data/lib/new_relic/agent/event_listener.rb +1 -1
  74. data/lib/new_relic/agent/event_loop.rb +1 -1
  75. data/lib/new_relic/agent/external.rb +13 -11
  76. data/lib/new_relic/agent/guid_generator.rb +28 -0
  77. data/lib/new_relic/agent/harvester.rb +1 -1
  78. data/lib/new_relic/agent/heap.rb +1 -1
  79. data/lib/new_relic/agent/hostname.rb +16 -2
  80. data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
  81. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
  82. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
  83. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
  84. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
  85. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
  86. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
  87. data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
  88. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -43
  89. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +53 -73
  90. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
  91. data/lib/new_relic/agent/instrumentation/active_job.rb +7 -8
  92. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  93. data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
  94. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
  95. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +152 -0
  96. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
  97. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +47 -49
  98. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  99. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +13 -9
  100. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
  101. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  102. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  103. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +152 -0
  104. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  105. data/lib/new_relic/agent/instrumentation/bunny.rb +13 -132
  106. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +10 -4
  107. data/lib/new_relic/agent/instrumentation/curb/chain.rb +93 -0
  108. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +222 -0
  109. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +63 -0
  110. data/lib/new_relic/agent/instrumentation/curb.rb +11 -183
  111. data/lib/new_relic/agent/instrumentation/data_mapper.rb +5 -3
  112. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +38 -0
  113. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +53 -0
  114. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +34 -0
  115. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +9 -49
  116. data/lib/new_relic/agent/instrumentation/excon/connection.rb +8 -5
  117. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  118. data/lib/new_relic/agent/instrumentation/excon.rb +4 -3
  119. data/lib/new_relic/agent/instrumentation/grape/chain.rb +25 -0
  120. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  121. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  122. data/lib/new_relic/agent/instrumentation/grape.rb +14 -118
  123. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +25 -0
  124. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +38 -0
  125. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +17 -0
  126. data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -30
  127. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  128. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  129. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  130. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  131. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  132. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +16 -0
  133. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +39 -118
  134. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +56 -0
  135. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +88 -0
  136. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +88 -0
  137. data/lib/new_relic/agent/instrumentation/memcache.rb +55 -68
  138. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  139. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  140. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +4 -2
  141. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +20 -11
  142. data/lib/new_relic/agent/instrumentation/mongo.rb +17 -4
  143. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
  144. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +25 -0
  145. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
  146. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  147. data/lib/new_relic/agent/instrumentation/net_http.rb +39 -0
  148. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
  149. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +34 -0
  150. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +27 -0
  151. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  152. data/lib/new_relic/agent/instrumentation/padrino.rb +19 -52
  153. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
  154. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  155. data/lib/new_relic/agent/instrumentation/rack/chain.rb +57 -0
  156. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +32 -0
  157. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +73 -0
  158. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +36 -0
  159. data/lib/new_relic/agent/instrumentation/rack.rb +30 -138
  160. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
  161. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
  162. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
  163. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  164. data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +6 -7
  165. data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
  166. data/lib/new_relic/agent/instrumentation/{rails4 → rails_notifications}/action_view.rb +4 -4
  167. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
  168. data/lib/new_relic/agent/instrumentation/rake/chain.rb +25 -0
  169. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +144 -0
  170. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  171. data/lib/new_relic/agent/instrumentation/rake.rb +14 -155
  172. data/lib/new_relic/agent/instrumentation/redis/chain.rb +34 -0
  173. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +65 -0
  174. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +24 -0
  175. data/lib/new_relic/agent/instrumentation/redis.rb +11 -104
  176. data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
  177. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +33 -0
  178. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
  179. data/lib/new_relic/agent/instrumentation/resque.rb +9 -26
  180. data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
  181. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  182. data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
  183. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  184. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -35
  185. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +118 -0
  186. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  187. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  188. data/lib/new_relic/agent/instrumentation/sinatra.rb +21 -160
  189. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  190. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  191. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +82 -0
  192. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  193. data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -74
  194. data/lib/new_relic/agent/instrumentation.rb +1 -1
  195. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  196. data/lib/new_relic/agent/javascript_instrumentor.rb +3 -3
  197. data/lib/new_relic/agent/log_once.rb +1 -1
  198. data/lib/new_relic/agent/logging.rb +139 -0
  199. data/lib/new_relic/agent/memory_logger.rb +1 -1
  200. data/lib/new_relic/agent/messaging.rb +15 -82
  201. data/lib/new_relic/agent/method_tracer.rb +10 -8
  202. data/lib/new_relic/agent/method_tracer_helpers.rb +5 -5
  203. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
  204. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
  205. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
  206. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +4 -7
  207. data/lib/new_relic/agent/monitors.rb +27 -0
  208. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  209. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -2
  210. data/lib/new_relic/agent/new_relic_service/marshaller.rb +6 -27
  211. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
  212. data/lib/new_relic/agent/new_relic_service.rb +95 -40
  213. data/lib/new_relic/agent/noticible_error.rb +22 -0
  214. data/lib/new_relic/agent/null_logger.rb +1 -1
  215. data/lib/new_relic/agent/obfuscator.rb +1 -1
  216. data/lib/new_relic/agent/parameter_filtering.rb +19 -6
  217. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  218. data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
  219. data/lib/new_relic/agent/pipe_service.rb +1 -1
  220. data/lib/new_relic/agent/prepend_supportability.rb +1 -1
  221. data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
  222. data/lib/new_relic/agent/range_extensions.rb +1 -1
  223. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
  224. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  225. data/lib/new_relic/agent/rules_engine.rb +1 -1
  226. data/lib/new_relic/agent/sampler.rb +1 -1
  227. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  228. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  229. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
  230. data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
  231. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  232. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
  233. data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
  234. data/lib/new_relic/agent/span_event_primitive.rb +108 -54
  235. data/lib/new_relic/agent/sql_sampler.rb +10 -10
  236. data/lib/new_relic/agent/stats.rb +1 -1
  237. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
  238. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  239. data/lib/new_relic/agent/stats_engine.rb +3 -3
  240. data/lib/new_relic/agent/supported_versions.rb +3 -3
  241. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  242. data/lib/new_relic/agent/system_info.rb +18 -4
  243. data/lib/new_relic/agent/threading/agent_thread.rb +2 -2
  244. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  245. data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
  246. data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
  247. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  248. data/lib/new_relic/agent/tracer.rb +509 -0
  249. data/lib/new_relic/agent/transaction/abstract_segment.rb +33 -6
  250. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  251. data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
  252. data/lib/new_relic/agent/transaction/distributed_tracing.rb +59 -149
  253. data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
  254. data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
  255. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  256. data/lib/new_relic/agent/transaction/segment.rb +28 -2
  257. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  258. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  259. data/lib/new_relic/agent/transaction/trace.rb +6 -13
  260. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
  261. data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
  262. data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
  263. data/lib/new_relic/agent/transaction/tracing.rb +1 -100
  264. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  265. data/lib/new_relic/agent/transaction.rb +140 -170
  266. data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
  267. data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
  268. data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
  269. data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
  270. data/lib/new_relic/agent/transaction_metrics.rb +1 -1
  271. data/lib/new_relic/agent/transaction_sampler.rb +2 -6
  272. data/lib/new_relic/agent/transaction_time_aggregator.rb +20 -6
  273. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  274. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  275. data/lib/new_relic/agent/utilization/gcp.rb +1 -1
  276. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  277. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  278. data/lib/new_relic/agent/utilization_data.rb +37 -2
  279. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  280. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  281. data/lib/new_relic/agent/vm/mri_vm.rb +7 -5
  282. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  283. data/lib/new_relic/agent/vm.rb +1 -1
  284. data/lib/new_relic/agent/worker_loop.rb +1 -1
  285. data/lib/new_relic/agent.rb +106 -18
  286. data/lib/new_relic/cli/command.rb +1 -1
  287. data/lib/new_relic/cli/commands/deployments.rb +2 -3
  288. data/lib/new_relic/cli/commands/install.rb +4 -3
  289. data/lib/new_relic/coerce.rb +32 -7
  290. data/lib/new_relic/collection_helper.rb +1 -1
  291. data/lib/new_relic/constants.rb +42 -0
  292. data/lib/new_relic/control/class_methods.rb +8 -2
  293. data/lib/new_relic/control/frameworks/external.rb +1 -1
  294. data/lib/new_relic/control/frameworks/merb.rb +1 -1
  295. data/lib/new_relic/control/frameworks/rails.rb +12 -10
  296. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  297. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  298. data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
  299. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  300. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  301. data/lib/new_relic/control/frameworks.rb +1 -1
  302. data/lib/new_relic/control/instance_methods.rb +12 -2
  303. data/lib/new_relic/control/instrumentation.rb +1 -1
  304. data/lib/new_relic/control/server_methods.rb +1 -1
  305. data/lib/new_relic/control.rb +1 -1
  306. data/lib/new_relic/delayed_job_injection.rb +1 -1
  307. data/lib/new_relic/dependency_detection.rb +124 -14
  308. data/lib/new_relic/environment_report.rb +2 -4
  309. data/lib/new_relic/helper.rb +1 -1
  310. data/lib/new_relic/language_support.rb +1 -1
  311. data/lib/new_relic/latest_changes.rb +2 -2
  312. data/lib/new_relic/local_environment.rb +1 -1
  313. data/lib/new_relic/metric_data.rb +1 -1
  314. data/lib/new_relic/metric_spec.rb +1 -1
  315. data/lib/new_relic/noticed_error.rb +35 -18
  316. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  317. data/lib/new_relic/rack/agent_middleware.rb +2 -2
  318. data/lib/new_relic/rack/browser_monitoring.rb +16 -9
  319. data/lib/new_relic/rack.rb +1 -1
  320. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  321. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  322. data/lib/new_relic/recipes.rb +1 -1
  323. data/lib/new_relic/supportability_helper.rb +16 -1
  324. data/lib/new_relic/version.rb +3 -3
  325. data/lib/newrelic_rpm.rb +1 -1
  326. data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
  327. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
  328. data/lib/tasks/all.rb +1 -1
  329. data/lib/tasks/config.rake +1 -2
  330. data/lib/tasks/multiverse.rb +35 -1
  331. data/lib/tasks/newrelic.rb +1 -1
  332. data/lib/tasks/tests.rake +6 -1
  333. data/newrelic_rpm.gemspec +22 -17
  334. data/recipes/newrelic.rb +1 -1
  335. data/test/agent_helper.rb +358 -78
  336. metadata +147 -66
  337. data/.travis.yml +0 -228
  338. data/cert/cacert.pem +0 -1177
  339. data/lib/new_relic/agent/commands/xray_session.rb +0 -55
  340. data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
  341. data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
  342. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -41
  343. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  344. data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
  345. data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
  346. data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
  347. data/lib/new_relic/agent/instrumentation/http.rb +0 -46
  348. data/lib/new_relic/agent/instrumentation/net.rb +0 -50
  349. data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
  350. data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
  351. data/lib/new_relic/agent/transaction/attributes.rb +0 -154
  352. data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
  353. data/lib/new_relic/agent/transaction_state.rb +0 -186
  354. data/lib/new_relic/build.rb +0 -2
  355. data/lib/new_relic/metrics.rb +0 -13
  356. data/lib/tasks/versions.html.erb +0 -28
  357. data/lib/tasks/versions.postface.html +0 -8
  358. data/lib/tasks/versions.preface.html +0 -9
  359. data/lib/tasks/versions.rake +0 -65
  360. data/lib/tasks/versions.txt.erb +0 -14
@@ -0,0 +1,509 @@
1
+ # encoding: utf-8
2
+ # This file is distributed under New Relic's license terms.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+
5
+ require 'new_relic/agent/transaction'
6
+ require 'new_relic/agent/transaction/segment'
7
+ require 'new_relic/agent/transaction/datastore_segment'
8
+ require 'new_relic/agent/transaction/external_request_segment'
9
+ require 'new_relic/agent/transaction/message_broker_segment'
10
+
11
+ module NewRelic
12
+ module Agent
13
+ #
14
+ # This class helps you interact with the current transaction (if
15
+ # it exists), start new transactions/segments, etc.
16
+ #
17
+ # @api public
18
+ class Tracer
19
+ class << self
20
+ def state
21
+ state_for(Thread.current)
22
+ end
23
+
24
+ alias_method :tl_get, :state
25
+
26
+ # Returns +true+ unless called from within an
27
+ # +NewRelic::Agent.disable_all_tracing+ block.
28
+ #
29
+ # @api public
30
+ def tracing_enabled?
31
+ state.tracing_enabled?
32
+ end
33
+
34
+ # Returns the transaction in progress for this thread, or
35
+ # +nil+ if none exists.
36
+ #
37
+ # @api public
38
+ def current_transaction
39
+ state.current_transaction
40
+ end
41
+
42
+ # Returns the trace_id of the current_transaction, or +nil+ if
43
+ # none exists.
44
+ #
45
+ # @api public
46
+ def current_trace_id
47
+ if txn = current_transaction
48
+ txn.trace_id
49
+ end
50
+ end
51
+ alias_method :trace_id, :current_trace_id
52
+
53
+ # Returns the id of the current span, or +nil+ if none exists.
54
+ #
55
+ # @api public
56
+ def current_span_id
57
+ if span = current_segment
58
+ span.guid
59
+ end
60
+ end
61
+ alias_method :span_id, :current_span_id
62
+
63
+ # Returns a boolean indicating whether the current_transaction
64
+ # is sampled, or +nil+ if there is no current transaction.
65
+ #
66
+ # @api public
67
+ def transaction_sampled?
68
+ if txn = current_transaction
69
+ txn.sampled?
70
+ end
71
+ end
72
+ alias_method :sampled?, :transaction_sampled?
73
+
74
+ # Runs the given block of code in a transaction.
75
+ #
76
+ # @param [String] name reserved for New Relic internal use
77
+ #
78
+ # @param [String] partial_name a meaningful name for this
79
+ # transaction (e.g., +blogs/index+); the Ruby agent will add a
80
+ # New-Relic-specific prefix
81
+ #
82
+ # @param [Symbol] category +:web+ for web transactions or
83
+ # +:background+ for background transactions
84
+ #
85
+ # @param [Hash] options reserved for New Relic internal use
86
+ #
87
+ # @api public
88
+ def in_transaction(name: nil,
89
+ partial_name: nil,
90
+ category: nil,
91
+ options: {})
92
+
93
+ finishable = start_transaction_or_segment(
94
+ name: name,
95
+ partial_name: partial_name,
96
+ category: category,
97
+ options: options
98
+ )
99
+
100
+ begin
101
+ # We shouldn't raise from Tracer.start_transaction_or_segment, but
102
+ # only wrap the yield to be absolutely sure we don't report agent
103
+ # problems as app errors
104
+ yield
105
+ rescue => exception
106
+ current_transaction.notice_error(exception)
107
+ raise
108
+ ensure
109
+ finishable.finish if finishable
110
+ end
111
+ end
112
+
113
+ # Starts a segment on the current transaction (if one exists)
114
+ # or starts a new transaction otherwise.
115
+ #
116
+ # @param [String] name reserved for New Relic internal use
117
+ #
118
+ # @param [String] partial_name a meaningful name for this
119
+ # transaction (e.g., +blogs/index+); the Ruby agent will add a
120
+ # New-Relic-specific prefix
121
+ #
122
+ # @param [Symbol] category +:web+ for web transactions or
123
+ # +:task+ for background transactions
124
+ #
125
+ # @param [Hash] options reserved for New Relic internal use
126
+ #
127
+ # @return [Object, #finish] an object that responds to
128
+ # +finish+; you _must_ call +finish+ on it at the end of the
129
+ # code you're tracing
130
+ #
131
+ # @api public
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
142
+
143
+ if name
144
+ options[:transaction_name] = name
145
+ else
146
+ options[:transaction_name] = Transaction.name_from_partial(
147
+ partial_name,
148
+ category
149
+ )
150
+ end
151
+
152
+ if (txn = current_transaction)
153
+ txn.create_nested_segment(category, options)
154
+ else
155
+ Transaction.start_new_transaction(state, category, options)
156
+ end
157
+
158
+ rescue ArgumentError
159
+ raise
160
+ rescue => exception
161
+ log_error('start_transaction_or_segment', exception)
162
+ end
163
+
164
+ # Takes name or partial_name and a category.
165
+ # 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
176
+
177
+ return current_transaction if current_transaction
178
+
179
+ if name
180
+ options[:transaction_name] = name
181
+ else
182
+ options[:transaction_name] = Transaction.name_from_partial(
183
+ partial_name,
184
+ category
185
+ )
186
+ end
187
+
188
+ Transaction.start_new_transaction(state,
189
+ category,
190
+ options)
191
+ rescue ArgumentError
192
+ raise
193
+ rescue => exception
194
+ log_error('start_transaction', exception)
195
+ end
196
+
197
+ def create_distributed_trace_payload
198
+ return unless txn = current_transaction
199
+ txn.distributed_tracer.create_distributed_trace_payload
200
+ end
201
+
202
+ def accept_distributed_trace_payload(payload)
203
+ return unless txn = current_transaction
204
+ txn.distributed_tracer.accept_distributed_trace_payload(payload)
205
+ end
206
+
207
+ # Returns the currently active segment in the transaction in
208
+ # progress for this thread, or +nil+ if no segment or
209
+ # transaction exists.
210
+ #
211
+ # @api public
212
+ def current_segment
213
+ return unless txn = current_transaction
214
+ txn.current_segment
215
+ end
216
+
217
+ # Creates and starts a general-purpose segment used to time
218
+ # arbitrary code.
219
+ #
220
+ # @param [String] name full name of the segment; the agent
221
+ # will not add a prefix. Third-party users should begin the
222
+ # name with +Custom/+; e.g.,
223
+ # +Custom/UserMailer/send_welcome_email+
224
+ #
225
+ # @param [optional, String, Array] unscoped_metrics additional
226
+ # unscoped metrics to record using this segment's timing
227
+ # information
228
+ #
229
+ # @param start_time [optional, Time] a +Time+ instance
230
+ # denoting the start time of the segment. Value is set by
231
+ # AbstractSegment#start if not given.
232
+ #
233
+ # @param parent [optional, Segment] Use for the rare cases
234
+ # (such as async) where the parent segment should be something
235
+ # other than the current segment
236
+ #
237
+ # @return [Segment] the newly created segment; you _must_ call
238
+ # +finish+ on it at the end of the code you're tracing
239
+ #
240
+ # @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
251
+
252
+ rescue ArgumentError
253
+ raise
254
+ rescue => exception
255
+ log_error('start_segment', exception)
256
+ end
257
+
258
+ UNKNOWN = "Unknown".freeze
259
+ OTHER = "other".freeze
260
+
261
+ # Creates and starts a datastore segment used to time
262
+ # datastore operations.
263
+ #
264
+ # @param [String] product the datastore name for use in metric
265
+ # naming, e.g. "FauxDB"
266
+ #
267
+ # @param [String] operation the name of the operation
268
+ # (e.g. "select"), often named after the method that's being
269
+ # instrumented.
270
+ #
271
+ # @param [optional, String] collection the collection name for use in
272
+ # statement-level metrics (i.e. table or model name)
273
+ #
274
+ # @param [optional, String] host the host this database
275
+ # instance is running on
276
+ #
277
+ # @param [optional, String] port_path_or_id TCP port, file
278
+ # path, UNIX domain socket, or other connection-related info
279
+ #
280
+ # @param [optional, String] database_name the name of this
281
+ # database
282
+ #
283
+ # @param start_time [optional, Time] a +Time+ instance
284
+ # denoting the start time of the segment. Value is set by
285
+ # AbstractSegment#start if not given.
286
+ #
287
+ # @param parent [optional, Segment] Use for the rare cases
288
+ # (such as async) where the parent segment should be something
289
+ # other than the current segment
290
+ #
291
+ # @return [DatastoreSegment] the newly created segment; you
292
+ # _must_ call +finish+ on it at the end of the code you're
293
+ # tracing
294
+ #
295
+ # @api public
296
+ 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)
304
+
305
+ product ||= UNKNOWN
306
+ operation ||= OTHER
307
+
308
+ segment = Transaction::DatastoreSegment.new product, operation, collection, host, port_path_or_id, database_name
309
+ start_and_add_segment segment, parent
310
+
311
+ rescue ArgumentError
312
+ raise
313
+ rescue => exception
314
+ log_error('start_datastore_segment', exception)
315
+ end
316
+
317
+ # Creates and starts an external request segment using the
318
+ # given library, URI, and procedure. This is used to time
319
+ # external calls made over HTTP.
320
+ #
321
+ # @param [String] library a string of the class name of the library used to
322
+ # make the external call, for example, 'Net::HTTP'.
323
+ #
324
+ # @param [String, URI] uri indicates the URI to which the
325
+ # external request is being made. The URI should begin with the protocol,
326
+ # for example, 'https://github.com'.
327
+ #
328
+ # @param [String] procedure the HTTP method being used for the external
329
+ # request as a string, for example, 'GET'.
330
+ #
331
+ # @param start_time [optional, Time] a +Time+ instance
332
+ # denoting the start time of the segment. Value is set by
333
+ # AbstractSegment#start if not given.
334
+ #
335
+ # @param parent [optional, Segment] Use for the rare cases
336
+ # (such as async) where the parent segment should be something
337
+ # other than the current segment
338
+ #
339
+ # @return [ExternalRequestSegment] the newly created segment;
340
+ # you _must_ call +finish+ on it at the end of the code
341
+ # you're tracing
342
+ #
343
+ # @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
+
358
+ rescue ArgumentError
359
+ raise
360
+ rescue => exception
361
+ log_error('start_external_request_segment', exception)
362
+ end
363
+
364
+ # Will potentially capture and notice an error at the
365
+ # segment that was executing when error occurred.
366
+ # if passed +segment+ is something that doesn't
367
+ # respond to +notice_segment_error+ then this method
368
+ # is effectively just a yield to the given &block
369
+ def capture_segment_error segment
370
+ return unless block_given?
371
+ yield
372
+ rescue => exception
373
+ if segment && segment.is_a?(Transaction::AbstractSegment)
374
+ segment.notice_error exception
375
+ end
376
+ raise
377
+ end
378
+
379
+ # 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?
394
+
395
+ segment = Transaction::MessageBrokerSegment.new(
396
+ action: action,
397
+ library: library,
398
+ destination_type: destination_type,
399
+ destination_name: destination_name,
400
+ headers: headers,
401
+ parameters: parameters,
402
+ start_time: start_time
403
+ )
404
+ start_and_add_segment segment, parent
405
+
406
+ rescue ArgumentError
407
+ raise
408
+ rescue => exception
409
+ log_error('start_datastore_segment', exception)
410
+ end
411
+
412
+ # This method should only be used by Tracer for access to the
413
+ # current thread's state or to provide read-only accessors for other threads
414
+ #
415
+ # If ever exposed, this requires additional synchronization
416
+ def state_for(thread)
417
+ state = thread[:newrelic_tracer_state]
418
+
419
+ if state.nil?
420
+ state = Tracer::State.new
421
+ thread[:newrelic_tracer_state] = state
422
+ end
423
+
424
+ state
425
+ end
426
+
427
+ alias_method :tl_state_for, :state_for
428
+
429
+ def clear_state
430
+ Thread.current[:newrelic_tracer_state] = nil
431
+ end
432
+
433
+ alias_method :tl_clear, :clear_state
434
+
435
+ private
436
+
437
+ def start_and_add_segment segment, parent = nil
438
+ tracer_state = state
439
+ if (txn = tracer_state.current_transaction) &&
440
+ tracer_state.tracing_enabled?
441
+ txn.add_segment segment, parent
442
+ else
443
+ segment.record_metrics = false
444
+ end
445
+ segment.start
446
+ segment
447
+ end
448
+
449
+ def log_error(method_name, exception)
450
+ NewRelic::Agent.logger.error("Exception during Tracer.#{method_name}", exception)
451
+ nil
452
+ end
453
+ end
454
+
455
+ # This is THE location to store thread local information during a transaction
456
+ # Need a new piece of data? Add a method here, NOT a new thread local variable.
457
+ class State
458
+
459
+ def initialize
460
+ @untraced = []
461
+ @current_transaction = nil
462
+ @record_sql = nil
463
+ end
464
+
465
+ # This starts the timer for the transaction.
466
+ def reset(transaction=nil)
467
+ # We purposefully don't reset @untraced or @record_sql
468
+ # since those are managed by NewRelic::Agent.disable_* calls explicitly
469
+ # and (more importantly) outside the scope of a transaction
470
+
471
+ @current_transaction = transaction
472
+ @sql_sampler_transaction_data = nil
473
+ end
474
+
475
+ # Current transaction stack
476
+ attr_reader :current_transaction
477
+
478
+ # Execution tracing on current thread
479
+ attr_accessor :untraced
480
+
481
+ def push_traced(should_trace)
482
+ @untraced << should_trace
483
+ end
484
+
485
+ def pop_traced
486
+ @untraced.pop if @untraced
487
+ end
488
+
489
+ def is_execution_traced?
490
+ @untraced.nil? || @untraced.last != false
491
+ end
492
+
493
+ alias_method :tracing_enabled?, :is_execution_traced?
494
+
495
+ # TT's and SQL
496
+ attr_accessor :record_sql
497
+
498
+ def is_sql_recorded?
499
+ @record_sql != false
500
+ end
501
+
502
+ # Sql Sampler Transaction Data
503
+ attr_accessor :sql_sampler_transaction_data
504
+ end
505
+ end
506
+
507
+ TransactionState = Tracer
508
+ end
509
+ end
@@ -1,9 +1,9 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/range_extensions'
6
- require 'securerandom'
6
+ require 'new_relic/agent/guid_generator'
7
7
 
8
8
  module NewRelic
9
9
  module Agent
@@ -21,13 +21,15 @@ module NewRelic
21
21
  # calculation in all other cases.
22
22
  #
23
23
  attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
24
- attr_accessor :name, :parent, :children_time, :transaction
24
+ attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
25
25
  attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
26
+ attr_reader :noticed_error
26
27
 
27
28
  def initialize name=nil, start_time=nil
28
29
  @name = name
30
+ @transaction_name = nil
29
31
  @transaction = nil
30
- @guid = SecureRandom.hex(8)
32
+ @guid = NewRelic::Agent::GuidGenerator.generate_guid
31
33
  @parent = nil
32
34
  @params = nil
33
35
  @start_time = start_time if start_time
@@ -42,6 +44,7 @@ module NewRelic
42
44
  @record_metrics = true
43
45
  @record_scoped_metric = true
44
46
  @record_on_finish = false
47
+ @noticed_error = nil
45
48
  end
46
49
 
47
50
  def start
@@ -119,6 +122,30 @@ module NewRelic
119
122
  def transaction_assigned
120
123
  end
121
124
 
125
+ def set_noticed_error noticed_error
126
+ if @noticed_error
127
+ NewRelic::Agent.logger.debug \
128
+ "Segment: #{name} overwriting previously noticed " \
129
+ "error: #{@noticed_error.inspect} with: #{noticed_error.inspect}"
130
+ end
131
+ @noticed_error = noticed_error
132
+ end
133
+
134
+ def notice_error exception, options={}
135
+ if Agent.config[:high_security]
136
+ NewRelic::Agent.logger.debug \
137
+ "Segment: #{name} ignores notice_error for " \
138
+ "error: #{exception.inspect} because :high_security is enabled"
139
+ else
140
+ NewRelic::Agent.instance.error_collector.notice_segment_error self, exception, options
141
+ end
142
+ end
143
+
144
+ def noticed_error_attributes
145
+ return unless @noticed_error
146
+ @noticed_error.attributes_from_notice_error
147
+ end
148
+
122
149
  protected
123
150
 
124
151
  attr_writer :range_recorded
@@ -140,7 +167,7 @@ module NewRelic
140
167
 
141
168
  if finished?
142
169
  transaction.async = true
143
- parent.descendant_complete self, segment
170
+ parent.descendant_complete(self, segment) if parent
144
171
  end
145
172
  end
146
173
 
@@ -228,7 +255,7 @@ module NewRelic
228
255
  @transaction_state ||= if @transaction
229
256
  transaction.state
230
257
  else
231
- TransactionState.tl_get
258
+ Tracer.state
232
259
  end
233
260
  end
234
261
  end
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/transaction/segment'
6
6
  require 'new_relic/agent/datastores/metric_helper'