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,10 +1,14 @@
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/language_support'
6
+ require 'open3'
6
7
 
7
8
  module NewRelic
9
+ class CommandExecutableNotFoundError < StandardError; end
10
+ class CommandRunFailedError < StandardError; end
11
+
8
12
  # A singleton for shared generic helper methods
9
13
  module Helper
10
14
  extend self
@@ -12,16 +16,17 @@ module NewRelic
12
16
  # Confirm a string is correctly encoded,
13
17
  # If not force the encoding to ASCII-8BIT (binary)
14
18
  def correctly_encoded(string)
15
- return string unless string.is_a? String
19
+ return string unless string.is_a?(String)
20
+
16
21
  # The .dup here is intentional, since force_encoding mutates the target,
17
22
  # and we don't know who is going to use this string downstream of us.
18
23
  string.valid_encoding? ? string : string.dup.force_encoding(Encoding::ASCII_8BIT)
19
24
  end
20
25
 
21
26
  def instance_method_visibility(klass, method_name)
22
- if klass.private_instance_methods.map{|s|s.to_sym}.include? method_name.to_sym
27
+ if klass.private_instance_methods.map { |s| s.to_sym }.include?(method_name.to_sym)
23
28
  :private
24
- elsif klass.protected_instance_methods.map{|s|s.to_sym}.include? method_name.to_sym
29
+ elsif klass.protected_instance_methods.map { |s| s.to_sym }.include?(method_name.to_sym)
25
30
  :protected
26
31
  else
27
32
  :public
@@ -31,14 +36,50 @@ module NewRelic
31
36
  def instance_methods_include?(klass, method_name)
32
37
  method_name_sym = method_name.to_sym
33
38
  (
34
- klass.instance_methods.map{ |s| s.to_sym }.include?(method_name_sym) ||
35
- klass.protected_instance_methods.map{ |s|s.to_sym }.include?(method_name_sym) ||
36
- klass.private_instance_methods.map{ |s|s.to_sym }.include?(method_name_sym)
39
+ klass.instance_methods.map { |s| s.to_sym }.include?(method_name_sym) ||
40
+ klass.protected_instance_methods.map { |s| s.to_sym }.include?(method_name_sym) ||
41
+ klass.private_instance_methods.map { |s| s.to_sym }.include?(method_name_sym)
37
42
  )
38
43
  end
39
44
 
40
45
  def time_to_millis(time)
41
46
  (time.to_f * 1000).round
42
47
  end
48
+
49
+ def run_command(command)
50
+ executable = command.split(' ').first
51
+ unless executable_in_path?(executable)
52
+ raise NewRelic::CommandExecutableNotFoundError.new("Executable not found: '#{executable}'")
53
+ end
54
+
55
+ exception = nil
56
+ begin
57
+ output, status = Open3.capture2e(command)
58
+ rescue => exception
59
+ end
60
+
61
+ if exception || !status.success?
62
+ message = exception ? "#{exception.class} - #{exception.message}" : output
63
+ raise NewRelic::CommandRunFailedError.new("Failed to run command '#{command}': #{message}")
64
+ end
65
+
66
+ output.chomp
67
+ end
68
+
69
+ # TODO: Open3 defers the actual execution of a binary to Process.spawn,
70
+ # which will raise an Errno::ENOENT exception for a file that
71
+ # cannot be found. We might want to take the time to evaluate
72
+ # relying on that Process.spawn behavior instead of checking for
73
+ # existence ourselves. We'd need to see what it does, how efficient
74
+ # it is, if it differs in functionality between Ruby versions and
75
+ # operating systems, etc.
76
+ def executable_in_path?(executable)
77
+ return false unless ENV['PATH']
78
+
79
+ ENV['PATH'].split(File::PATH_SEPARATOR).any? do |bin_path|
80
+ executable_path = File.join(bin_path, executable)
81
+ File.exist?(executable_path) && File.file?(executable_path) && File.executable?(executable_path)
82
+ end
83
+ end
43
84
  end
44
85
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module LanguageSupport
@@ -9,7 +9,8 @@ module NewRelic
9
9
  @@forkable = nil
10
10
  def can_fork?
11
11
  # this is expensive to check, so we should only check once
12
- return @@forkable if @@forkable != nil
12
+ return @@forkable if !@@forkable.nil?
13
+
13
14
  @@forkable = Process.respond_to?(:fork)
14
15
  end
15
16
 
@@ -22,7 +23,8 @@ module NewRelic
22
23
  end
23
24
 
24
25
  def object_space_usable?
25
- if defined?(::JRuby) && JRuby.respond_to?(:runtime)
26
+ if jruby?
27
+ require 'jruby'
26
28
  JRuby.runtime.is_object_space_enabled
27
29
  else
28
30
  defined?(::ObjectSpace)
@@ -33,12 +35,29 @@ module NewRelic
33
35
  RUBY_ENGINE == 'jruby'
34
36
  end
35
37
 
38
+ # TODO: OLD RUBIES - RUBY_VERSION < 2.6
39
+ #
40
+ # Ruby 2.6 introduced an improved version of `Object.const_get` that
41
+ # respects the full namespace of the input and doesn't just grab the first
42
+ # constant matching the string to the right of the last '::'.
43
+ # Once we drop support for Ruby 2.5 and below, the only value this custom
44
+ # method will provide beyond `Object.const_get` itself is to automatically
45
+ # catch NameError.
46
+ #
47
+ # see: https://github.com/rails/rails/commit/7057ccf6565c1cb5354c1906880119276a9d15c0
48
+ #
49
+ # With Ruby 2.6+, this method can be defined like so:
50
+ # def constantize(constant_as_string_or_symbol)
51
+ # Object.const_get(constant_as_string_or_symbol)
52
+ # rescue NameError
53
+ # end
54
+ #
36
55
  def constantize(const_name)
37
- const_name.to_s.sub(/\A::/,'').split('::').inject(Object) do |namespace, name|
56
+ const_name.to_s.sub(/\A::/, '').split('::').inject(Object) do |namespace, name|
38
57
  begin
39
58
  result = namespace.const_get(name)
40
59
 
41
- # const_get looks up the inheritence chain, so if it's a class
60
+ # const_get looks up the inheritance chain, so if it's a class
42
61
  # in the constant make sure we found the one in our namespace.
43
62
  #
44
63
  # Can't help if the constant isn't a class...
@@ -54,6 +73,11 @@ module NewRelic
54
73
  end
55
74
  end
56
75
 
76
+ def camelize(string)
77
+ camelized = string.downcase
78
+ camelized.split(/\-|\_/).map(&:capitalize).join
79
+ end
80
+
57
81
  def bundled_gem?(gem_name)
58
82
  defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
59
83
  rescue => e
@@ -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 LatestChanges
@@ -13,7 +13,7 @@ module NewRelic
13
13
  changes.
14
14
  EOS
15
15
 
16
- def self.read(changelog=default_changelog)
16
+ def self.read(changelog = default_changelog)
17
17
  changes = extract_latest_changes(File.read(changelog))
18
18
  changes << FOOTER
19
19
 
@@ -24,14 +24,14 @@ EOS
24
24
  # precise version number included in the line in parens. For example:
25
25
  #
26
26
  # * This is a patch item (3.7.1.188)
27
- def self.read_patch(patch_level, changelog=default_changelog)
27
+ def self.read_patch(patch_level, changelog = default_changelog)
28
28
  latest = extract_latest_changes(File.read(changelog))
29
29
  changes = ["## v#{patch_level}", ""]
30
30
 
31
31
  current_item = nil
32
32
  latest.each do |line|
33
- if line.match(/^\s*\*.*/)
34
- if line.match(/\(#{patch_level}\)/)
33
+ if line =~ /^\s*\*.*/
34
+ if line =~ /\(#{patch_level}\)/
35
35
  # Found a patch level item, so start tracking the lines!
36
36
  current_item = line
37
37
  else
@@ -52,10 +52,11 @@ EOS
52
52
  changes = []
53
53
  version_count = 0
54
54
  contents.each_line do |line|
55
- if line.match(/##\s+v[\d.]+/)
55
+ if line =~ /##\s+v[\d.]+/
56
56
  version_count += 1
57
57
  end
58
58
  break if version_count >= 2
59
+
59
60
  changes << line.sub(/^ \* /, "* ").chomp
60
61
  end
61
62
  changes
@@ -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 'set'
6
6
  require 'new_relic/version'
@@ -26,7 +26,7 @@ module NewRelic
26
26
  #
27
27
  # If the environment can't be determined, it will be set to nil.
28
28
  #
29
- # NewRelic::LocalEnvironment should be accessed through NewRelic::Control#env (via the NewRelic::Control singleton).
29
+ # NewRelic::LocalEnvironment should be accessed through NewRelic::Control#local_env (via the NewRelic::Control singleton).
30
30
  class LocalEnvironment
31
31
  def discovered_dispatcher
32
32
  discover_dispatcher unless @discovered_dispatcher
@@ -34,11 +34,11 @@ module NewRelic
34
34
  end
35
35
 
36
36
  def initialize
37
- # Extend self with any any submodules of LocalEnvironment. These can override
38
- # the discover methods to discover new framworks and dispatchers.
39
- NewRelic::LocalEnvironment.constants.each do | const |
40
- mod = NewRelic::LocalEnvironment.const_get const
41
- self.extend mod if mod.instance_of? Module
37
+ # Extend self with any submodules of LocalEnvironment. These can override
38
+ # the discover methods to discover new frameworks and dispatchers.
39
+ NewRelic::LocalEnvironment.constants.each do |const|
40
+ mod = NewRelic::LocalEnvironment.const_get(const)
41
+ self.extend(mod) if mod.instance_of?(Module)
42
42
  end
43
43
 
44
44
  @discovered_dispatcher = nil
@@ -71,19 +71,21 @@ module NewRelic
71
71
  thin
72
72
  mongrel
73
73
  litespeed
74
+ unicorn
74
75
  webrick
75
76
  fastcgi
76
77
  rainbows
77
- unicorn
78
78
  ]
79
+ # TODO: MAJOR VERSION - remove rainbows
79
80
  while dispatchers.any? && @discovered_dispatcher.nil?
80
- send 'check_for_'+(dispatchers.shift)
81
+ send('check_for_' + (dispatchers.shift))
81
82
  end
82
83
  end
83
84
 
84
85
  def check_for_torquebox
85
86
  return unless defined?(::JRuby) &&
86
- ( org.torquebox::TorqueBox rescue nil)
87
+ (org.torquebox::TorqueBox rescue nil)
88
+
87
89
  @discovered_dispatcher = :torquebox
88
90
  end
89
91
 
@@ -92,11 +94,13 @@ module NewRelic
92
94
  (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
93
95
  defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
94
96
  (jruby_rack? && defined?(::GlassFish::Server)))
97
+
95
98
  @discovered_dispatcher = :glassfish
96
99
  end
97
100
 
98
101
  def check_for_trinidad
99
102
  return unless defined?(::JRuby) && jruby_rack? && defined?(::Trinidad::Server)
103
+
100
104
  @discovered_dispatcher = :trinidad
101
105
  end
102
106
 
@@ -106,17 +110,20 @@ module NewRelic
106
110
 
107
111
  def check_for_webrick
108
112
  return unless defined?(::WEBrick) && defined?(::WEBrick::VERSION)
113
+
109
114
  @discovered_dispatcher = :webrick
110
115
  end
111
116
 
112
117
  def check_for_fastcgi
113
118
  return unless defined?(::FCGI)
119
+
114
120
  @discovered_dispatcher = :fastcgi
115
121
  end
116
122
 
117
123
  # this case covers starting by mongrel_rails
118
124
  def check_for_mongrel
119
125
  return unless defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
126
+
120
127
  @discovered_dispatcher = :mongrel
121
128
  end
122
129
 
@@ -127,6 +134,7 @@ module NewRelic
127
134
  end
128
135
  end
129
136
 
137
+ # TODO: MAJOR VERSION - remove this method
130
138
  def check_for_rainbows
131
139
  if (defined?(::Rainbows) && defined?(::Rainbows::HttpServer)) && NewRelic::LanguageSupport.object_space_usable?
132
140
  v = find_class_in_object_space(::Rainbows::HttpServer)
@@ -147,9 +155,9 @@ module NewRelic
147
155
  end
148
156
 
149
157
  def check_for_resque
150
- has_queue = ENV['QUEUE'] || ENV['QUEUES']
151
- resque_rake = executable == 'rake' && ARGV.include?('resque:work')
152
- resque_pool_rake = executable == 'rake' && ARGV.include?('resque:pool')
158
+ has_queue = ENV['QUEUE'] || ENV['QUEUES']
159
+ resque_rake = executable == 'rake' && ARGV.include?('resque:work')
160
+ resque_pool_rake = executable == 'rake' && ARGV.include?('resque:pool')
153
161
  resque_pool_executable = executable == 'resque-pool' && defined?(::Resque::Pool)
154
162
 
155
163
  using_resque = defined?(::Resque) &&
@@ -180,7 +188,7 @@ module NewRelic
180
188
  end
181
189
 
182
190
  def check_for_litespeed
183
- if caller.pop =~ /fcgi-bin\/RailsRunner\.rb/
191
+ if caller.pop.include?('fcgi-bin/RailsRunner.rb')
184
192
  @discovered_dispatcher = :litespeed
185
193
  end
186
194
  end
@@ -192,16 +200,14 @@ module NewRelic
192
200
  end
193
201
 
194
202
  public
203
+
195
204
  # outputs a human-readable description
196
205
  def to_s
197
- s = "LocalEnvironment["
198
- s << ";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher
199
- s << "]"
206
+ %Q(LocalEnvironment[#{";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher}])
200
207
  end
201
208
 
202
209
  def executable
203
210
  File.basename($0)
204
211
  end
205
-
206
212
  end
207
213
  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
  require 'new_relic/coerce'
6
6
 
@@ -8,9 +8,11 @@ module NewRelic
8
8
  class MetricData
9
9
  # a NewRelic::MetricSpec object
10
10
  attr_reader :metric_spec
11
- # the actual statistics object
11
+ # a NewRelic::Agent::Stats object
12
12
  attr_accessor :stats
13
13
 
14
+ include NewRelic::Coerce
15
+
14
16
  def initialize(metric_spec, stats)
15
17
  @original_spec = nil
16
18
  @metric_spec = metric_spec
@@ -18,50 +20,53 @@ module NewRelic
18
20
  end
19
21
 
20
22
  def eql?(o)
21
- (metric_spec.eql? o.metric_spec) && (stats.eql? o.stats)
23
+ (metric_spec.eql?(o.metric_spec)) && (stats.eql?(o.stats))
22
24
  end
23
25
 
24
- def original_spec
25
- @original_spec || @metric_spec
26
+ def hash
27
+ [metric_spec, stats].hash
28
+ end
29
+
30
+ def inspect
31
+ "#<MetricData metric_spec:#{metric_spec.inspect}, stats:#{stats.inspect}>"
26
32
  end
27
33
 
28
34
  # assigns a new metric spec, and retains the old metric spec as
29
35
  # @original_spec if it exists currently
30
- def metric_spec= new_spec
36
+ def metric_spec=(new_spec)
31
37
  @original_spec = @metric_spec if @metric_spec
32
38
  @metric_spec = new_spec
33
39
  end
34
40
 
35
- def hash
36
- metric_spec.hash ^ stats.hash
41
+ def original_spec
42
+ @original_spec || @metric_spec
43
+ end
44
+
45
+ def to_collector_array(encoder = nil)
46
+ stat_key = {'name' => metric_spec.name, 'scope' => metric_spec.scope}
47
+ [stat_key, stats_collector_array(stat_key)]
37
48
  end
38
49
 
39
50
  def to_json(*a)
40
- %Q[{"metric_spec":#{metric_spec.to_json},"stats":{"total_exclusive_time":#{stats.total_exclusive_time},"min_call_time":#{stats.min_call_time},"call_count":#{stats.call_count},"sum_of_squares":#{stats.sum_of_squares},"total_call_time":#{stats.total_call_time},"max_call_time":#{stats.max_call_time}}}]
51
+ %Q({"metric_spec":#{metric_spec.to_json},"stats":{"total_exclusive_time":#{stats.total_exclusive_time},"min_call_time":#{stats.min_call_time},"call_count":#{stats.call_count},"sum_of_squares":#{stats.sum_of_squares},"total_call_time":#{stats.total_call_time},"max_call_time":#{stats.max_call_time}}})
41
52
  end
42
53
 
43
54
  def to_s
44
55
  "#{metric_spec.name}(#{metric_spec.scope}): #{stats}"
45
56
  end
46
57
 
47
- def inspect
48
- "#<MetricData metric_spec:#{metric_spec.inspect}, stats:#{stats.inspect}>"
49
- end
50
-
51
- include NewRelic::Coerce
58
+ private
52
59
 
53
- def to_collector_array(encoder=nil)
54
- stat_key = { 'name' => metric_spec.name, 'scope' => metric_spec.scope }
55
- [ stat_key,
56
- [
57
- int(stats.call_count, stat_key),
58
- float(stats.total_call_time, stat_key),
59
- float(stats.total_exclusive_time, stat_key),
60
- float(stats.min_call_time, stat_key),
61
- float(stats.max_call_time, stat_key),
62
- float(stats.sum_of_squares, stat_key)
63
- ]
64
- ]
60
+ def stats_collector_array(stat_key)
61
+ [[:call_count, Integer], [:total_call_time, Float],
62
+ [:total_exclusive_time, Float], [:min_call_time, Float],
63
+ [:max_call_time, Float], [:sum_of_squares, Float]].map do |attr_types|
64
+ if attr_types[1].eql?(Integer)
65
+ int(stats.send(attr_types[0]), stat_key)
66
+ elsif attr_types[1].eql?(Float)
67
+ float(stats.send(attr_types[0]), stat_key)
68
+ end
69
+ end
65
70
  end
66
71
  end
67
72
  end
@@ -1,18 +1,18 @@
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
  # this struct uniquely defines a metric, optionally inside
6
6
  # the call scope of another metric
7
7
  class NewRelic::MetricSpec
8
- attr_reader :name, :scope
8
+ attr_reader :name, :scope
9
9
 
10
10
  # the maximum length of a metric name or metric scope
11
11
  MAX_LENGTH = 255
12
12
  LENGTH_RANGE = (0...MAX_LENGTH)
13
13
  EMPTY_SCOPE = ''.freeze
14
14
 
15
- def initialize(metric_name='', metric_scope=nil)
15
+ def initialize(metric_name = '', metric_scope = nil)
16
16
  if metric_name.to_s.length > MAX_LENGTH
17
17
  @name = metric_name.to_s[LENGTH_RANGE]
18
18
  else
@@ -34,16 +34,17 @@ class NewRelic::MetricSpec
34
34
  self.eql?(o)
35
35
  end
36
36
 
37
- def eql? o
37
+ def eql?(o)
38
38
  @name == o.name && @scope == o.scope
39
39
  end
40
40
 
41
41
  def hash
42
- @name.hash ^ @scope.hash
42
+ [@name, @scope].hash
43
43
  end
44
44
 
45
45
  def to_s
46
46
  return name if scope.empty?
47
+
47
48
  "#{name}:#{scope}"
48
49
  end
49
50
 
@@ -53,12 +54,13 @@ class NewRelic::MetricSpec
53
54
 
54
55
  def to_json(*a)
55
56
  {'name' => name,
56
- 'scope' => scope}.to_json(*a)
57
+ 'scope' => scope}.to_json(*a)
57
58
  end
58
59
 
59
60
  def <=>(o)
60
61
  namecmp = self.name <=> o.name
61
62
  return namecmp if namecmp != 0
63
+
62
64
  return (self.scope || '') <=> (o.scope || '')
63
65
  end
64
66
  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
@@ -12,11 +11,11 @@ class NewRelic::NoticedError
12
11
  extend NewRelic::CollectionHelper
13
12
 
14
13
  attr_accessor :path, :timestamp, :message, :exception_class_name,
15
- :request_uri, :request_port, :file_name, :line_number,
16
- :stack_trace, :attributes_from_notice_error, :attributes,
17
- :expected
14
+ :request_uri, :request_port, :file_name, :line_number,
15
+ :stack_trace, :attributes_from_notice_error, :attributes,
16
+ :expected
18
17
 
19
- attr_reader :exception_id, :is_internal
18
+ attr_reader :exception_id, :is_internal
20
19
 
21
20
  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
22
21
  UNKNOWN_ERROR_CLASS_NAME = 'Error'
@@ -28,12 +27,12 @@ class NewRelic::NoticedError
28
27
 
29
28
  DESTINATION = NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
30
29
 
31
- ERROR_PREFIX_KEY = 'error'
32
- ERROR_MESSAGE_KEY = "#{ERROR_PREFIX_KEY}.message"
33
- ERROR_CLASS_KEY = "#{ERROR_PREFIX_KEY}.class"
30
+ ERROR_PREFIX_KEY = 'error'
31
+ ERROR_MESSAGE_KEY = "#{ERROR_PREFIX_KEY}.message"
32
+ ERROR_CLASS_KEY = "#{ERROR_PREFIX_KEY}.class"
34
33
  ERROR_EXPECTED_KEY = "#{ERROR_PREFIX_KEY}.expected"
35
34
 
36
- def initialize(path, exception, timestamp = Time.now)
35
+ def initialize(path, exception, timestamp = Process.clock_gettime(Process::CLOCK_REALTIME), expected = false)
37
36
  @exception_id = exception.object_id
38
37
  @path = path
39
38
 
@@ -51,14 +50,14 @@ class NewRelic::NoticedError
51
50
 
52
51
  # replace error message if enabled
53
52
  if NewRelic::Agent.config[:'strip_exception_messages.enabled'] &&
54
- !self.class.passes_message_allowlist(exception.class)
53
+ !self.class.passes_message_allowlist(exception.class)
55
54
  @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
56
55
  end
57
56
 
58
57
  @attributes_from_notice_error = nil
59
58
  @attributes = nil
60
59
  @timestamp = timestamp
61
- @expected = false
60
+ @expected = expected
62
61
  end
63
62
 
64
63
  def ==(other)
@@ -70,23 +69,19 @@ class NewRelic::NoticedError
70
69
  end
71
70
 
72
71
  def self.passes_message_allowlist(exception_class)
73
- # For backwards compatibility until we remove :'strip_exception_messages.whitelist' config option
74
-
75
- allowed = NewRelic::Agent.config[:'strip_exception_messages.allowed_classes'].concat(NewRelic::Agent.config[:'strip_exception_messages.whitelist'])
76
-
77
- allowed.any? do |klass|
72
+ NewRelic::Agent.config[:'strip_exception_messages.allowed_classes'].any? do |klass|
78
73
  exception_class <= klass
79
74
  end
80
75
  end
81
76
 
82
77
  include NewRelic::Coerce
83
78
 
84
- def to_collector_array(encoder=nil)
85
- [ NewRelic::Helper.time_to_millis(timestamp),
79
+ def to_collector_array(encoder = nil)
80
+ [NewRelic::Helper.time_to_millis(timestamp),
86
81
  string(path),
87
82
  string(message),
88
83
  string(exception_class_name),
89
- processed_attributes ]
84
+ processed_attributes]
90
85
  end
91
86
 
92
87
  # Note that we process attributes lazily and store the result. This is because
@@ -105,10 +100,10 @@ class NewRelic::NoticedError
105
100
 
106
101
  def base_parameters
107
102
  params = {}
108
- params[:file_name] = file_name if file_name
109
- params[:line_number] = line_number if line_number
110
- params[:stack_trace] = stack_trace if stack_trace
111
- params[:'error.expected'] = expected
103
+ params[:file_name] = file_name if file_name
104
+ params[:line_number] = line_number if line_number
105
+ params[:stack_trace] = stack_trace if stack_trace
106
+ params[ERROR_EXPECTED_KEY.to_sym] = expected
112
107
  params
113
108
  end
114
109
 
@@ -139,11 +134,9 @@ class NewRelic::NoticedError
139
134
 
140
135
  def build_error_attributes
141
136
  @attributes_from_notice_error ||= {}
142
- @attributes_from_notice_error.merge!({
143
- ERROR_MESSAGE_KEY => string(message),
144
- ERROR_CLASS_KEY => string(exception_class_name)
145
- })
146
-
137
+ @attributes_from_notice_error[ERROR_MESSAGE_KEY] = string(message)
138
+ @attributes_from_notice_error[ERROR_CLASS_KEY] = string(exception_class_name)
139
+
147
140
  @attributes_from_notice_error[ERROR_EXPECTED_KEY] = true if expected
148
141
  end
149
142
 
@@ -193,7 +186,7 @@ class NewRelic::NoticedError
193
186
  if exception.nil?
194
187
  @exception_class_name = UNKNOWN_ERROR_CLASS_NAME
195
188
  @message = NIL_ERROR_MESSAGE
196
- elsif exception.is_a? NewRelic::Agent::NoticibleError
189
+ elsif exception.is_a?(NewRelic::Agent::NoticeableError)
197
190
  @exception_class_name = exception.class_name
198
191
  @message = exception.message
199
192
  else
@@ -204,5 +197,4 @@ class NewRelic::NoticedError
204
197
  @message = exception.to_s
205
198
  end
206
199
  end
207
-
208
200
  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
  require 'new_relic/agent/event_listener'
6
6
  require 'new_relic/rack/agent_middleware'
@@ -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/tracer'
6
6
  require 'new_relic/agent/instrumentation/controller_instrumentation'
@@ -13,10 +13,10 @@ module NewRelic
13
13
 
14
14
  attr_reader :transaction_options, :category, :target
15
15
 
16
- def initialize(app, options={})
16
+ def initialize(app, options = {})
17
17
  @app = app
18
18
  @category = :middleware
19
- @target = self
19
+ @target = self
20
20
  @transaction_options = {
21
21
  :transaction_name => build_transaction_name
22
22
  }
@@ -33,11 +33,13 @@ module NewRelic
33
33
  # response code before it goes back to the client.
34
34
  def capture_http_response_code(state, result)
35
35
  return if NewRelic::Agent.config[:disable_middleware_instrumentation]
36
+
36
37
  super
37
38
  end
38
39
 
39
40
  def capture_response_content_type(state, result)
40
41
  return if NewRelic::Agent.config[:disable_middleware_instrumentation]
42
+
41
43
  super
42
44
  end
43
45
  end