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/rules_engine/replacement_rule'
6
6
  require 'new_relic/agent/rules_engine/segment_terms_rule'
@@ -24,7 +24,7 @@ module NewRelic
24
24
  end
25
25
 
26
26
  def self.create_transaction_rules(connect_response)
27
- txn_name_specs = connect_response['transaction_name_rules'] || []
27
+ txn_name_specs = connect_response['transaction_name_rules'] || []
28
28
  segment_rule_specs = connect_response['transaction_segment_terms'] || []
29
29
 
30
30
  txn_name_rules = txn_name_specs.map { |s| ReplacementRule.new(s) }
@@ -36,7 +36,7 @@ module NewRelic
36
36
  # Build segment_rules in reverse order from which they're provided,
37
37
  # so that when we eliminate duplicates with #uniq!, we retain the last
38
38
  # instances of repeated rules.
39
- segment_rules.unshift SegmentTermsRule.new(spec)
39
+ segment_rules.unshift(SegmentTermsRule.new(spec))
40
40
  end
41
41
  end
42
42
 
@@ -54,7 +54,7 @@ module NewRelic
54
54
  rules.uniq! { |rule| rule.prefix }
55
55
  end
56
56
 
57
- def initialize(rules=[], segment_term_rules=[])
57
+ def initialize(rules = [], segment_term_rules = [])
58
58
  @rules = rules.sort
59
59
  @segment_term_rules = segment_term_rules
60
60
  end
@@ -72,6 +72,7 @@ module NewRelic
72
72
  def rename(original_string)
73
73
  renamed = apply_rules(@rules, original_string)
74
74
  return nil unless renamed
75
+
75
76
  renamed = apply_rules(@segment_term_rules, renamed)
76
77
  renamed
77
78
  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
  # A Sampler is used to capture meaningful metrics in a background thread
6
6
  # periodically. They will be invoked about once a minute, each time the agent
@@ -12,9 +12,8 @@
12
12
  module NewRelic
13
13
  module Agent
14
14
  class Sampler
15
-
16
15
  # Exception denotes a sampler is not available and it will not be registered.
17
- class Unsupported < StandardError; end
16
+ class Unsupported < StandardError; end
18
17
 
19
18
  attr_reader :id
20
19
  @sampler_classes = []
@@ -52,7 +51,7 @@ module NewRelic
52
51
  # The ID passed in here is unused by our code, but is preserved in case
53
52
  # we have clients who are defining their own subclasses of this class, and
54
53
  # expecting to be able to call super with an ID.
55
- def initialize(id=nil)
54
+ def initialize(id = nil)
56
55
  @id = id || self.class.shorthand_name
57
56
  end
58
57
 
@@ -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,7 +17,7 @@ module NewRelic
17
17
  @samplers.each(&blk)
18
18
  end
19
19
 
20
- def clear()
20
+ def clear
21
21
  @samplers.clear
22
22
  end
23
23
 
@@ -34,7 +34,6 @@ module NewRelic
34
34
  end
35
35
  end
36
36
 
37
-
38
37
  def poll_samplers
39
38
  @samplers.delete_if do |sampler|
40
39
  begin
@@ -49,7 +48,7 @@ module NewRelic
49
48
 
50
49
  def add_sampler(sampler_class)
51
50
  supported = sampler_class.supported_on_this_platform?
52
- enabled = sampler_class.enabled?
51
+ enabled = sampler_class.enabled?
53
52
  if supported && enabled
54
53
  if !sampler_class_registered?(sampler_class)
55
54
  sampler = sampler_class.new
@@ -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/sampler'
6
6
 
@@ -44,11 +44,12 @@ module NewRelic
44
44
  if defined?(JRuby)
45
45
  return JRUBY_VERSION >= '1.7.0'
46
46
  end
47
+
47
48
  true
48
49
  end
49
50
 
50
51
  def poll
51
- now = Time.now
52
+ now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
52
53
  t = Process.times
53
54
 
54
55
  if @last_time && t.utime != 0.0 && t.stime != 0.0
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/sampler'
6
6
  require 'new_relic/delayed_job_injection'
@@ -62,9 +62,12 @@ module NewRelic
62
62
  end
63
63
 
64
64
  def poll
65
- record_failed_jobs(failed_jobs)
66
- record_locked_jobs(locked_jobs)
67
- record_queue_length_metrics
65
+ # Wrapping these queries within the same connection avoids deadlocks
66
+ ActiveRecord::Base.connection_pool.with_connection do
67
+ record_failed_jobs(failed_jobs)
68
+ record_locked_jobs(locked_jobs)
69
+ record_queue_length_metrics
70
+ end
68
71
  end
69
72
 
70
73
  private
@@ -84,7 +87,7 @@ module NewRelic
84
87
  all_count = 0
85
88
  queue_counts(column_name).each do |column_val, count|
86
89
  all_count += count
87
- column_val = "default" if column_val.nil? || column_val == ""
90
+ column_val = "default" if column_val.nil? || column_val == NewRelic::EMPTY_STR
88
91
  metric = "Workers/DelayedJob/queue_length/#{metric_node}/#{column_val}"
89
92
  NewRelic::Agent.record_metric(metric, count)
90
93
  end
@@ -97,11 +100,11 @@ module NewRelic
97
100
  # here that's valid on 2.x through 4.1, so split it up.
98
101
  result = if ::ActiveRecord::VERSION::MAJOR.to_i < 4
99
102
  ::Delayed::Job.count(:group => column_name,
100
- :conditions => [QUEUE_QUERY_CONDITION, now])
103
+ :conditions => [QUEUE_QUERY_CONDITION, now])
101
104
  else
102
- ::Delayed::Job.where(QUEUE_QUERY_CONDITION, now).
103
- group(column_name).
104
- count
105
+ ::Delayed::Job.where(QUEUE_QUERY_CONDITION, now)
106
+ .group(column_name)
107
+ .count
105
108
  end
106
109
  result.to_a
107
110
  end
@@ -1,13 +1,13 @@
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/sampler'
6
+ require 'new_relic/helper'
6
7
 
7
8
  module NewRelic
8
9
  module Agent
9
10
  module Samplers
10
-
11
11
  class MemorySampler < NewRelic::Agent::Sampler
12
12
  named :memory
13
13
 
@@ -19,21 +19,21 @@ module NewRelic
19
19
  # macos, linux, solaris
20
20
  if defined? JRuby
21
21
  @sampler = JavaHeapSampler.new
22
- elsif platform =~ /linux/
22
+ elsif platform.include?('linux')
23
23
  @sampler = ProcStatus.new
24
24
  if !@sampler.can_run?
25
- ::NewRelic::Agent.logger.debug "Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead."
25
+ ::NewRelic::Agent.logger.debug("Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead.")
26
26
  @sampler = ShellPS.new("ps -o rsz")
27
27
  else
28
- ::NewRelic::Agent.logger.debug "Using /proc/#{$$}/status for reading process memory."
28
+ ::NewRelic::Agent.logger.debug("Using /proc/#{$$}/status for reading process memory.")
29
29
  end
30
- elsif platform =~ /darwin9/ # 10.5
30
+ elsif platform.include?('darwin9') # 10.5
31
31
  @sampler = ShellPS.new("ps -o rsz")
32
32
  elsif platform =~ /darwin(1|2)\d+/ # >= 10.6
33
33
  @sampler = ShellPS.new("ps -o rss")
34
- elsif platform =~ /freebsd/
34
+ elsif platform.include?('freebsd')
35
35
  @sampler = ShellPS.new("ps -o rss")
36
- elsif platform =~ /solaris/
36
+ elsif platform.include?('solaris')
37
37
  @sampler = ShellPS.new("/usr/bin/ps -o rss -p")
38
38
  end
39
39
 
@@ -46,12 +46,17 @@ module NewRelic
46
46
  end
47
47
 
48
48
  def self.platform
49
- if RUBY_PLATFORM =~ /java/
50
- %x[uname -s].downcase
49
+ if RUBY_PLATFORM.include?('java')
50
+ begin
51
+ NewRelic::Helper.run_command('uname -s').downcase
52
+ rescue NewRelic::CommandRunFailedError, NewRelic::CommandExecutableNotFoundError
53
+ 'unknown'
54
+ end
51
55
  else
52
56
  RUBY_PLATFORM.downcase
53
57
  end
54
58
  end
59
+
55
60
  def platform
56
61
  NewRelic::Agent::Samplers::MemorySampler.platform
57
62
  end
@@ -70,21 +75,23 @@ module NewRelic
70
75
 
71
76
  def can_run?
72
77
  return false if @broken
78
+
73
79
  m = get_memory rescue nil
74
80
  m && m > 0
75
81
  end
76
82
 
77
83
  def get_sample
78
84
  return nil if @broken
85
+
79
86
  begin
80
87
  m = get_memory
81
88
  if m.nil?
82
- ::NewRelic::Agent.logger.warn "Unable to get the resident memory for process #{$$}. Disabling memory sampler."
89
+ ::NewRelic::Agent.logger.warn("Unable to get the resident memory for process #{$$}. Disabling memory sampler.")
83
90
  @broken = true
84
91
  end
85
92
  return m
86
93
  rescue => e
87
- ::NewRelic::Agent.logger.warn "Unable to get the resident memory for process #{$$}. Disabling memory sampler.", e
94
+ ::NewRelic::Agent.logger.warn("Unable to get the resident memory for process #{$$}. Disabling memory sampler.", e)
88
95
  @broken = true
89
96
  return nil
90
97
  end
@@ -94,6 +101,7 @@ module NewRelic
94
101
  class JavaHeapSampler < Base
95
102
  def get_memory
96
103
  raise "Can't sample Java heap unless running in JRuby" unless defined? JRuby
104
+
97
105
  java.lang.Runtime.getRuntime.totalMemory / (1024 * 1024).to_f rescue nil
98
106
  end
99
107
 
@@ -116,8 +124,10 @@ module NewRelic
116
124
  # if for some reason the ps command doesn't work on the resident os,
117
125
  # then don't execute it any more.
118
126
  raise "Faulty command: `#{@command} #{process}`" if memory.nil? || memory <= 0
127
+
119
128
  memory
120
129
  end
130
+
121
131
  def to_s
122
132
  "shell command sampler: #{@command}"
123
133
  end
@@ -130,10 +140,11 @@ module NewRelic
130
140
  class ProcStatus < Base
131
141
  # Returns the amount of resident memory this process is using in MB
132
142
  def get_memory
133
- proc_status = File.open(proc_status_file, "r") {|f| f.read_nonblock(4096).strip }
143
+ proc_status = File.open(proc_status_file, "r") { |f| f.read_nonblock(4096).strip }
134
144
  if proc_status =~ /RSS:\s*(\d+) kB/i
135
145
  return $1.to_f / 1024.0
136
146
  end
147
+
137
148
  raise "Unable to find RSS in #{proc_status_file}"
138
149
  end
139
150
 
@@ -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/sampler'
6
6
 
@@ -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/sampler'
6
6
  require 'new_relic/agent/vm'
@@ -9,15 +9,16 @@ module NewRelic
9
9
  module Agent
10
10
  module Samplers
11
11
  class VMSampler < Sampler
12
- GC_RUNS_METRIC = 'RubyVM/GC/runs'.freeze
13
- HEAP_LIVE_METRIC = 'RubyVM/GC/heap_live'.freeze
14
- HEAP_FREE_METRIC = 'RubyVM/GC/heap_free'.freeze
15
- THREAD_COUNT_METRIC = 'RubyVM/Threads/all'.freeze
16
- OBJECT_ALLOCATIONS_METRIC = 'RubyVM/GC/total_allocated_object'.freeze
17
- MAJOR_GC_METRIC = 'RubyVM/GC/major_gc_count'.freeze
18
- MINOR_GC_METRIC = 'RubyVM/GC/minor_gc_count'.freeze
19
- METHOD_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/method'.freeze
12
+ GC_RUNS_METRIC = 'RubyVM/GC/runs'.freeze
13
+ HEAP_LIVE_METRIC = 'RubyVM/GC/heap_live'.freeze
14
+ HEAP_FREE_METRIC = 'RubyVM/GC/heap_free'.freeze
15
+ THREAD_COUNT_METRIC = 'RubyVM/Threads/all'.freeze
16
+ OBJECT_ALLOCATIONS_METRIC = 'RubyVM/GC/total_allocated_object'.freeze
17
+ MAJOR_GC_METRIC = 'RubyVM/GC/major_gc_count'.freeze
18
+ MINOR_GC_METRIC = 'RubyVM/GC/minor_gc_count'.freeze
19
+ METHOD_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/method'.freeze
20
20
  CONSTANT_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/constant'.freeze
21
+ CONSTANT_MISSES_METRIC = 'RubyVM/CacheMisses/constant'.freeze
21
22
 
22
23
  attr_reader :transaction_count
23
24
 
@@ -49,7 +50,7 @@ module NewRelic
49
50
  end
50
51
  end
51
52
 
52
- def record_gc_runs_metric(snapshot, txn_count) #THREAD_LOCAL_ACCESS
53
+ def record_gc_runs_metric(snapshot, txn_count) # THREAD_LOCAL_ACCESS
53
54
  if snapshot.gc_total_time || snapshot.gc_runs
54
55
  if snapshot.gc_total_time
55
56
  gc_time = snapshot.gc_total_time - @last_snapshot.gc_total_time.to_f
@@ -59,30 +60,30 @@ module NewRelic
59
60
  end
60
61
  wall_clock_time = snapshot.taken_at - @last_snapshot.taken_at
61
62
  NewRelic::Agent.agent.stats_engine.tl_record_unscoped_metrics(GC_RUNS_METRIC) do |stats|
62
- stats.call_count += txn_count
63
- stats.total_call_time += gc_runs if gc_runs
63
+ stats.call_count += txn_count
64
+ stats.total_call_time += gc_runs if gc_runs
64
65
  stats.total_exclusive_time += gc_time if gc_time
65
- stats.max_call_time = (gc_time.nil? ? 0 : 1)
66
- stats.sum_of_squares += wall_clock_time
66
+ stats.max_call_time = (gc_time.nil? ? 0 : 1)
67
+ stats.sum_of_squares += wall_clock_time
67
68
  end
68
69
  end
69
70
  end
70
71
 
71
- def record_delta(snapshot, key, metric, txn_count) #THREAD_LOCAL_ACCESS
72
+ def record_delta(snapshot, key, metric, txn_count) # THREAD_LOCAL_ACCESS
72
73
  value = snapshot.send(key)
73
74
  if value
74
75
  delta = value - @last_snapshot.send(key)
75
76
  NewRelic::Agent.agent.stats_engine.tl_record_unscoped_metrics(metric) do |stats|
76
- stats.call_count += txn_count
77
+ stats.call_count += txn_count
77
78
  stats.total_call_time += delta
78
79
  end
79
80
  end
80
81
  end
81
82
 
82
- def record_gauge_metric(metric_name, value) #THREAD_LOCAL_ACCESS
83
+ def record_gauge_metric(metric_name, value) # THREAD_LOCAL_ACCESS
83
84
  NewRelic::Agent.agent.stats_engine.tl_record_unscoped_metrics(metric_name) do |stats|
84
- stats.call_count = value
85
- stats.sum_of_squares = 1
85
+ stats.call_count = value
86
+ stats.sum_of_squares = 1
86
87
  end
87
88
  end
88
89
 
@@ -114,6 +115,7 @@ module NewRelic
114
115
  record_delta(snap, :minor_gc_count, MINOR_GC_METRIC, tcount)
115
116
  record_delta(snap, :method_cache_invalidations, METHOD_INVALIDATIONS_METRIC, tcount)
116
117
  record_delta(snap, :constant_cache_invalidations, CONSTANT_INVALIDATIONS_METRIC, tcount)
118
+ record_delta(snap, :constant_cache_misses, CONSTANT_MISSES_METRIC, tcount)
117
119
  record_heap_live_metric(snap)
118
120
  record_heap_free_metric(snap)
119
121
  record_thread_count_metric(snap)
@@ -1,9 +1,9 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
- require 'newrelic_rpm' unless defined?( NewRelic )
6
- require 'new_relic/agent' unless defined?( NewRelic::Agent )
5
+ require 'newrelic_rpm' unless defined?(NewRelic)
6
+ require 'new_relic/agent' unless defined?(NewRelic::Agent)
7
7
  require 'new_relic/agent/event_aggregator'
8
8
  require 'new_relic/agent/priority_sampled_buffer'
9
9
 
@@ -14,33 +14,33 @@ module NewRelic
14
14
  capacity_key :'span_events.max_samples_stored'
15
15
 
16
16
  enabled_keys :'span_events.enabled',
17
- :'distributed_tracing.enabled'
17
+ :'distributed_tracing.enabled'
18
18
 
19
- def record priority: nil, event:nil, &blk
20
- unless(event || priority && blk)
19
+ def record(priority: nil, event: nil, &blk)
20
+ unless event || priority && blk
21
21
  raise ArgumentError, "Expected priority and block, or event"
22
22
  end
23
23
 
24
24
  return unless enabled?
25
25
 
26
26
  @lock.synchronize do
27
- @buffer.append priority: priority, event: event, &blk
27
+ @buffer.append(priority: priority, event: event, &blk)
28
28
  notify_if_full
29
29
  end
30
30
  end
31
31
 
32
32
  SUPPORTABILITY_TOTAL_SEEN = "Supportability/SpanEvent/TotalEventsSeen".freeze
33
33
  SUPPORTABILITY_TOTAL_SENT = "Supportability/SpanEvent/TotalEventsSent".freeze
34
- SUPPORTABILITY_DISCARDED = "Supportability/SpanEvent/Discarded".freeze
34
+ SUPPORTABILITY_DISCARDED = "Supportability/SpanEvent/Discarded".freeze
35
35
 
36
- def after_harvest metadata
37
- seen = metadata[:seen]
38
- sent = metadata[:captured]
36
+ def after_harvest(metadata)
37
+ seen = metadata[:seen]
38
+ sent = metadata[:captured]
39
39
  discarded = seen - sent
40
40
 
41
41
  ::NewRelic::Agent.record_metric(SUPPORTABILITY_TOTAL_SEEN, count: seen)
42
42
  ::NewRelic::Agent.record_metric(SUPPORTABILITY_TOTAL_SENT, count: sent)
43
- ::NewRelic::Agent.record_metric(SUPPORTABILITY_DISCARDED, count: discarded)
43
+ ::NewRelic::Agent.record_metric(SUPPORTABILITY_DISCARDED, count: discarded)
44
44
 
45
45
  super
46
46
  end
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -16,63 +15,63 @@ module NewRelic
16
15
  extend self
17
16
 
18
17
  # Strings for static keys of the event structure
19
- ELLIPSIS = '...'
20
- TYPE_KEY = 'type'
21
- TRACE_ID_KEY = 'traceId'
22
- GUID_KEY = 'guid'
23
- PARENT_ID_KEY = 'parentId'
24
- GRANDPARENT_ID_KEY = 'grandparentId'
25
- TRANSACTION_ID_KEY = 'transactionId'
26
- SAMPLED_KEY = 'sampled'
27
- PRIORITY_KEY = 'priority'
28
- TIMESTAMP_KEY = 'timestamp'
29
- DURATION_KEY = 'duration'
30
- NAME_KEY = 'name'
31
- CATEGORY_KEY = 'category'
32
- HTTP_URL_KEY = 'http.url'
33
- HTTP_METHOD_KEY = 'http.method'
18
+ ELLIPSIS = '...'
19
+ TYPE_KEY = 'type'
20
+ TRACE_ID_KEY = 'traceId'
21
+ GUID_KEY = 'guid'
22
+ PARENT_ID_KEY = 'parentId'
23
+ TRANSACTION_ID_KEY = 'transactionId'
24
+ SAMPLED_KEY = 'sampled'
25
+ PRIORITY_KEY = 'priority'
26
+ TIMESTAMP_KEY = 'timestamp'
27
+ DURATION_KEY = 'duration'
28
+ NAME_KEY = 'name'
29
+ CATEGORY_KEY = 'category'
30
+ HTTP_URL_KEY = 'http.url'
31
+ HTTP_METHOD_KEY = 'http.method'
34
32
  HTTP_STATUS_CODE_KEY = 'http.statusCode'
35
- COMPONENT_KEY = 'component'
36
- DB_INSTANCE_KEY = 'db.instance'
37
- DB_STATEMENT_KEY = 'db.statement'
38
- PEER_ADDRESS_KEY = 'peer.address'
39
- PEER_HOSTNAME_KEY = 'peer.hostname'
40
- SPAN_KIND_KEY = 'span.kind'
41
- ENTRY_POINT_KEY = 'nr.entryPoint'
42
- TRUSTED_PARENT_KEY = "trustedParentId"
43
- TRACING_VENDORS_KEY = "tracingVendors"
33
+ COMPONENT_KEY = 'component'
34
+ DB_INSTANCE_KEY = 'db.instance'
35
+ DB_STATEMENT_KEY = 'db.statement'
36
+ PEER_ADDRESS_KEY = 'peer.address'
37
+ PEER_HOSTNAME_KEY = 'peer.hostname'
38
+ SPAN_KIND_KEY = 'span.kind'
39
+ ENTRY_POINT_KEY = 'nr.entryPoint'
40
+ TRUSTED_PARENT_KEY = "trustedParentId"
41
+ TRACING_VENDORS_KEY = "tracingVendors"
44
42
  TRANSACTION_NAME_KEY = 'transaction.name'
45
43
 
46
44
  # Strings for static values of the event structure
47
- EVENT_TYPE = 'Span'
48
- GENERIC_CATEGORY = 'generic'
49
- HTTP_CATEGORY = 'http'
45
+ EVENT_TYPE = 'Span'
46
+ GENERIC_CATEGORY = 'generic'
47
+ HTTP_CATEGORY = 'http'
50
48
  DATASTORE_CATEGORY = 'datastore'
51
- CLIENT = 'client'
49
+ CLIENT = 'client'
52
50
 
53
51
  # Builds a Hash of error attributes as well as the Span ID when
54
52
  # an error is present. Otherwise, returns nil when no error present.
55
- def error_attributes segment
53
+ def error_attributes(segment)
56
54
  return if Agent.config[:high_security] || !segment.noticed_error
55
+
57
56
  segment.noticed_error.build_error_attributes
58
57
  segment.noticed_error_attributes
59
58
  end
60
59
 
61
- def for_segment segment
60
+ def for_segment(segment)
62
61
  intrinsics = intrinsics_for(segment)
63
62
  intrinsics[CATEGORY_KEY] = GENERIC_CATEGORY
64
63
 
65
64
  [intrinsics, custom_attributes(segment), agent_attributes(segment)]
66
65
  end
67
66
 
68
- def for_external_request_segment segment
67
+ def for_external_request_segment(segment)
69
68
  intrinsics = intrinsics_for(segment)
70
69
 
71
- intrinsics[COMPONENT_KEY] = segment.library
70
+ intrinsics[COMPONENT_KEY] = segment.library
72
71
  intrinsics[HTTP_METHOD_KEY] = segment.procedure
73
72
  intrinsics[HTTP_STATUS_CODE_KEY] = segment.http_status_code if segment.http_status_code
74
- intrinsics[CATEGORY_KEY] = HTTP_CATEGORY
75
- intrinsics[SPAN_KIND_KEY] = CLIENT
73
+ intrinsics[CATEGORY_KEY] = HTTP_CATEGORY
74
+ intrinsics[SPAN_KIND_KEY] = CLIENT
76
75
 
77
76
  agent_attributes = error_attributes(segment) || {}
78
77
 
@@ -80,10 +79,14 @@ module NewRelic
80
79
  agent_attributes[HTTP_URL_KEY] = truncate(segment.uri)
81
80
  end
82
81
 
82
+ if segment.respond_to?(:record_agent_attributes?) && segment.record_agent_attributes?
83
+ agent_attributes.merge!(agent_attributes(segment))
84
+ end
85
+
83
86
  [intrinsics, custom_attributes(segment), agent_attributes]
84
87
  end
85
88
 
86
- def for_datastore_segment segment
89
+ def for_datastore_segment(segment)
87
90
  intrinsics = intrinsics_for(segment)
88
91
 
89
92
  intrinsics[COMPONENT_KEY] = segment.product
@@ -113,16 +116,16 @@ module NewRelic
113
116
 
114
117
  private
115
118
 
116
- def intrinsics_for segment
119
+ def intrinsics_for(segment)
117
120
  intrinsics = {
118
- TYPE_KEY => EVENT_TYPE,
119
- TRACE_ID_KEY => segment.transaction.trace_id,
120
- GUID_KEY => segment.guid,
121
+ TYPE_KEY => EVENT_TYPE,
122
+ TRACE_ID_KEY => segment.transaction.trace_id,
123
+ GUID_KEY => segment.guid,
121
124
  TRANSACTION_ID_KEY => segment.transaction.guid,
122
- PRIORITY_KEY => segment.transaction.priority,
123
- TIMESTAMP_KEY => milliseconds_since_epoch(segment),
124
- DURATION_KEY => segment.duration,
125
- NAME_KEY => segment.name
125
+ PRIORITY_KEY => segment.transaction.priority,
126
+ TIMESTAMP_KEY => milliseconds_since_epoch(segment),
127
+ DURATION_KEY => segment.duration,
128
+ NAME_KEY => segment.name
126
129
  }
127
130
 
128
131
  # with infinite-tracing, transactions may or may not be sampled!
@@ -155,7 +158,7 @@ module NewRelic
155
158
  intrinsics
156
159
  end
157
160
 
158
- def custom_attributes segment
161
+ def custom_attributes(segment)
159
162
  attributes = segment.attributes
160
163
  if attributes
161
164
  result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
@@ -165,21 +168,24 @@ module NewRelic
165
168
  end
166
169
  end
167
170
 
168
- def merge_and_freeze_attributes agent_attributes, error_attributes
169
- return agent_attributes.freeze unless error_attributes
170
- return error_attributes.freeze if agent_attributes.equal?(NewRelic::EMPTY_HASH)
171
- agent_attributes.merge!(error_attributes).freeze
171
+ def merge_hashes(hash1, hash2)
172
+ return hash1 if hash2.nil? || hash2.empty?
173
+ return hash2 if hash1.nil? || hash1.empty?
174
+
175
+ hash1.merge!(hash2)
172
176
  end
173
177
 
174
- def agent_attributes segment
178
+ def agent_attributes(segment)
175
179
  agent_attributes = segment.attributes
176
180
  .agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
177
181
  error_attributes = error_attributes(segment)
178
- return NewRelic::EMPTY_HASH unless agent_attributes || error_attributes
179
- merge_and_freeze_attributes(agent_attributes, error_attributes)
182
+ code_attributes = segment.code_attributes
183
+ agent_attributes = merge_hashes(agent_attributes, error_attributes)
184
+ agent_attributes = merge_hashes(agent_attributes, code_attributes)
185
+ agent_attributes.freeze
180
186
  end
181
187
 
182
- def parent_guid segment
188
+ def parent_guid(segment)
183
189
  if segment.parent
184
190
  segment.parent.guid
185
191
  elsif txn = segment.transaction
@@ -187,11 +193,11 @@ module NewRelic
187
193
  end
188
194
  end
189
195
 
190
- def milliseconds_since_epoch segment
196
+ def milliseconds_since_epoch(segment)
191
197
  Integer(segment.start_time.to_f * 1000.0)
192
198
  end
193
199
 
194
- def truncate value, max_size=255
200
+ def truncate(value, max_size = 255)
195
201
  value = value.to_s
196
202
  if value.bytesize > max_size
197
203
  value.byteslice(0, max_size - 2).chop! << ELLIPSIS
@@ -200,7 +206,7 @@ module NewRelic
200
206
  end
201
207
  end
202
208
 
203
- def allowed? key
209
+ def allowed?(key)
204
210
  NewRelic::Agent.instance.attribute_filter.allows_key?(key, AttributeFilter::DST_SPAN_EVENTS)
205
211
  end
206
212
  end