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/database/obfuscator'
6
6
  require 'new_relic/agent/database/postgres_explain_obfuscator'
@@ -9,7 +9,6 @@ module NewRelic
9
9
  module Agent
10
10
  module Database
11
11
  module ExplainPlanHelpers
12
-
13
12
  SUPPORTED_ADAPTERS_FOR_EXPLAIN = [:postgres, :mysql2, :mysql, :sqlite]
14
13
  SELECT = 'select'.freeze
15
14
 
@@ -97,7 +96,7 @@ module NewRelic
97
96
 
98
97
  def process_explain_results_mysql(results)
99
98
  headers = []
100
- values = []
99
+ values = []
101
100
  if results.is_a?(Array)
102
101
  # We're probably using the jdbc-mysql gem for JRuby, which will give
103
102
  # us an array of hashes.
@@ -118,7 +117,7 @@ module NewRelic
118
117
 
119
118
  def process_explain_results_mysql2(results)
120
119
  headers = results.fields
121
- values = []
120
+ values = []
122
121
  results.each { |row| values << row }
123
122
  [headers, values]
124
123
  end
@@ -127,7 +126,7 @@ module NewRelic
127
126
 
128
127
  def process_explain_results_sqlite(results)
129
128
  headers = SQLITE_EXPLAIN_COLUMNS
130
- values = []
129
+ values = []
131
130
  results.each do |row|
132
131
  values << headers.map { |h| row[h] }
133
132
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -20,17 +20,17 @@ module NewRelic
20
20
  }
21
21
 
22
22
  DIALECT_COMPONENTS = {
23
- :fallback => COMPONENTS_REGEX_MAP.keys,
24
- :mysql => [:single_quotes, :double_quotes, :numeric_literals, :boolean_literals,
25
- :hexadecimal_literals, :comments, :multi_line_comments],
26
- :postgres => [:single_quotes, :dollar_quotes, :uuids, :numeric_literals,
27
- :boolean_literals, :comments, :multi_line_comments],
28
- :sqlite => [:single_quotes, :numeric_literals, :boolean_literals, :hexadecimal_literals,
29
- :comments, :multi_line_comments],
30
- :oracle => [:single_quotes, :oracle_quoted_strings, :numeric_literals, :comments,
31
- :multi_line_comments],
32
- :cassandra => [:single_quotes, :uuids, :numeric_literals, :boolean_literals,
33
- :hexadecimal_literals, :comments, :multi_line_comments]
23
+ :fallback => COMPONENTS_REGEX_MAP.keys,
24
+ :mysql => [:single_quotes, :double_quotes, :numeric_literals, :boolean_literals,
25
+ :hexadecimal_literals, :comments, :multi_line_comments],
26
+ :postgres => [:single_quotes, :dollar_quotes, :uuids, :numeric_literals,
27
+ :boolean_literals, :comments, :multi_line_comments],
28
+ :sqlite => [:single_quotes, :numeric_literals, :boolean_literals, :hexadecimal_literals,
29
+ :comments, :multi_line_comments],
30
+ :oracle => [:single_quotes, :oracle_quoted_strings, :numeric_literals, :comments,
31
+ :multi_line_comments],
32
+ :cassandra => [:single_quotes, :uuids, :numeric_literals, :boolean_literals,
33
+ :hexadecimal_literals, :comments, :multi_line_comments]
34
34
  }
35
35
 
36
36
  # We use these to check whether the query contains any quote characters
@@ -53,12 +53,13 @@ module NewRelic
53
53
 
54
54
  def obfuscate_single_quote_literals(sql)
55
55
  return sql unless sql =~ COMPONENTS_REGEX_MAP[:single_quotes]
56
+
56
57
  sql.gsub(COMPONENTS_REGEX_MAP[:single_quotes], PLACEHOLDER)
57
58
  end
58
59
 
59
60
  def self.generate_regex(dialect)
60
61
  components = DIALECT_COMPONENTS[dialect]
61
- Regexp.union(components.map{|component| COMPONENTS_REGEX_MAP[component]})
62
+ Regexp.union(components.map { |component| COMPONENTS_REGEX_MAP[component] })
62
63
  end
63
64
 
64
65
  MYSQL_COMPONENTS_REGEX = self.generate_regex(:mysql)
@@ -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/database/obfuscation_helpers'
6
6
 
@@ -50,7 +50,7 @@ module NewRelic
50
50
  def default_sql_obfuscator(sql)
51
51
  stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
52
52
 
53
- if stmt.sql.end_with? ELLIPSIS
53
+ if stmt.sql.end_with?(ELLIPSIS)
54
54
  return QUERY_TOO_LARGE_MESSAGE
55
55
  end
56
56
 
@@ -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
@@ -12,7 +12,7 @@ module NewRelic
12
12
  # Database::Obfuscator class because here we don't look for
13
13
  # backslash-escaped strings.
14
14
  QUOTED_STRINGS_REGEX = /'(?:[^']|'')*'|"(?:[^"]|"")*"/
15
- LABEL_LINE_REGEX = /^([^:\n]*:\s+).*$/.freeze
15
+ LABEL_LINE_REGEX = /^([^:\n]*:\s+).*$/.freeze
16
16
 
17
17
  def obfuscate(explain)
18
18
  # First, we replace all single-quoted strings.
@@ -35,7 +35,7 @@ module NewRelic
35
35
  # All parts of the query that can appear in the explain output are
36
36
  # prefixed with "<label>: ", so we want to preserve the label, but
37
37
  # remove the rest of the line.
38
- explain.gsub!(LABEL_LINE_REGEX, '\1?')
38
+ explain.gsub!(LABEL_LINE_REGEX, '\1?')
39
39
  explain
40
40
  end
41
41
  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 'singleton'
6
6
  require 'new_relic/agent/database/explain_plan_helpers'
@@ -9,17 +9,17 @@ require 'new_relic/agent/database/obfuscator'
9
9
  module NewRelic
10
10
  # columns for a mysql explain plan
11
11
  MYSQL_EXPLAIN_COLUMNS = [
12
- "Id",
13
- "Select Type",
14
- "Table",
15
- "Type",
16
- "Possible Keys",
17
- "Key",
18
- "Key Length",
19
- "Ref",
20
- "Rows",
21
- "Extra"
22
- ].freeze
12
+ "Id",
13
+ "Select Type",
14
+ "Table",
15
+ "Type",
16
+ "Possible Keys",
17
+ "Key",
18
+ "Key Length",
19
+ "Ref",
20
+ "Rows",
21
+ "Extra"
22
+ ].freeze
23
23
 
24
24
  module Agent
25
25
  module Database
@@ -32,6 +32,8 @@ module NewRelic
32
32
  # Take care not to the dup the query more than once as
33
33
  # correctly encoded may also dup the query.
34
34
  def capture_query(query)
35
+ return unless query
36
+
35
37
  id = query.object_id
36
38
  query = Helper.correctly_encoded(truncate_query(query))
37
39
  if query.object_id == id
@@ -42,6 +44,8 @@ module NewRelic
42
44
  end
43
45
 
44
46
  def truncate_query(query)
47
+ return unless query
48
+
45
49
  if query.length > (MAX_QUERY_LENGTH - 4)
46
50
  query[0..MAX_QUERY_LENGTH - 4] << ELLIPSIS
47
51
  else
@@ -57,7 +61,7 @@ module NewRelic
57
61
  Obfuscator.instance.set_sql_obfuscator(type, &block)
58
62
  end
59
63
 
60
- def record_sql_method(config_section=:transaction_tracer)
64
+ def record_sql_method(config_section = :transaction_tracer)
61
65
  key = record_sql_method_key(config_section)
62
66
 
63
67
  case Agent.config[key].to_s
@@ -87,11 +91,11 @@ module NewRelic
87
91
 
88
92
  RECORD_FOR = [:raw, :obfuscated].freeze
89
93
 
90
- def should_record_sql?(config_section=:transaction_tracer)
94
+ def should_record_sql?(config_section = :transaction_tracer)
91
95
  RECORD_FOR.include?(record_sql_method(config_section))
92
96
  end
93
97
 
94
- def should_collect_explain_plans?(config_section=:transaction_tracer)
98
+ def should_collect_explain_plans?(config_section = :transaction_tracer)
95
99
  should_record_sql?(config_section) &&
96
100
  Agent.config["#{config_section}.explain_enabled".to_sym]
97
101
  end
@@ -114,32 +118,33 @@ module NewRelic
114
118
  # in a report period, selected for shipment to New Relic
115
119
  def explain_sql(statement)
116
120
  return nil unless statement.sql && statement.explainer && statement.config
121
+
117
122
  statement.sql = statement.sql.split(";\n")[0] # only explain the first
118
123
  return statement.explain || []
119
124
  end
120
125
 
121
- KNOWN_OPERATIONS = [
122
- 'alter',
123
- 'select',
124
- 'update',
125
- 'delete',
126
- 'insert',
127
- 'create',
128
- 'show',
129
- 'set',
130
- 'exec',
131
- 'execute',
132
- 'call'
126
+ KNOWN_OPERATIONS = %w[
127
+ alter
128
+ select
129
+ update
130
+ delete
131
+ insert
132
+ create
133
+ show
134
+ set
135
+ exec
136
+ execute
137
+ call
133
138
  ]
134
-
139
+ OTHER_OPERATION = 'other'.freeze
135
140
  SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
136
141
 
137
142
  def parse_operation_from_query(sql)
138
143
  sql = Helper.correctly_encoded(sql).gsub(SQL_COMMENT_REGEX, NewRelic::EMPTY_STR)
139
- if sql =~ /(\w+)/
140
- op = $1.downcase
141
- return op if KNOWN_OPERATIONS.include?(op)
142
- end
144
+ return unless sql =~ /(\w+)/
145
+
146
+ op = Regexp.last_match(1).downcase
147
+ KNOWN_OPERATIONS.include?(op) ? op : OTHER_OPERATION
143
148
  end
144
149
 
145
150
  class ConnectionManager
@@ -157,7 +162,7 @@ module NewRelic
157
162
  return connection if connection
158
163
 
159
164
  begin
160
- @connections[config] = connector.call(config)
165
+ @connections[config] = yield(config)
161
166
  rescue => e
162
167
  ::NewRelic::Agent.logger.error("Caught exception trying to get connection to DB for explain.", e)
163
168
  nil
@@ -185,7 +190,7 @@ module NewRelic
185
190
 
186
191
  DEFAULT_QUERY_NAME = "SQL".freeze
187
192
 
188
- def initialize(sql, config={}, explainer=nil, binds=nil, name=DEFAULT_QUERY_NAME, host=nil, port_path_or_id=nil, database_name=nil)
193
+ def initialize(sql, config = {}, explainer = nil, binds = nil, name = DEFAULT_QUERY_NAME, host = nil, port_path_or_id = nil, database_name = nil)
189
194
  @sql = Database.capture_query(sql)
190
195
  @config = config
191
196
  @explainer = explainer
@@ -205,9 +210,7 @@ module NewRelic
205
210
  Database.obfuscate_sql(self)
206
211
  when :raw
207
212
  sql.to_s
208
- else
209
- nil
210
- end
213
+ end
211
214
  end
212
215
 
213
216
  # This takes a connection config hash from ActiveRecord or Sequel and
@@ -220,35 +223,38 @@ module NewRelic
220
223
  elsif @config[:uri] && @config[:uri].to_s =~ /^jdbc:([^:]+):/
221
224
  # This case is for Sequel with the jdbc-mysql, jdbc-postgres, or jdbc-sqlite3 gems.
222
225
  symbolized_adapter($1)
223
- else
224
- nil
225
226
  end
226
227
  end
227
228
 
228
229
  def explain
229
230
  return unless explainable?
231
+
230
232
  handle_exception_in_explain do
231
- start = Time.now
233
+ start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
232
234
  plan = @explainer.call(self)
233
- ::NewRelic::Agent.record_metric("Supportability/Database/execute_explain_plan", Time.now - start)
235
+ ::NewRelic::Agent.record_metric(
236
+ "Supportability/Database/execute_explain_plan",
237
+ Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
238
+ )
234
239
  return process_resultset(plan, adapter) if plan
235
240
  end
236
241
  end
237
242
 
238
243
  NEWLINE = "\n".freeze
239
244
 
240
- def append_sql new_sql
245
+ def append_sql(new_sql)
241
246
  return if new_sql.empty?
247
+
242
248
  @sql = Database.truncate_query(@sql << NEWLINE << new_sql)
243
249
  end
244
250
 
245
251
  private
246
252
 
247
- POSTGIS_PREFIX = 'postgis'.freeze
253
+ POSTGIS_PREFIX = 'postgis'.freeze
248
254
  POSTGRES_PREFIX = 'postgres'.freeze
249
- MYSQL_PREFIX = 'mysql'.freeze
250
- MYSQL2_PREFIX = 'mysql2'.freeze
251
- SQLITE_PREFIX = 'sqlite'.freeze
255
+ MYSQL_PREFIX = 'mysql'.freeze
256
+ MYSQL2_PREFIX = 'mysql2'.freeze
257
+ SQLITE_PREFIX = 'sqlite'.freeze
252
258
 
253
259
  def symbolized_adapter(adapter)
254
260
  if adapter.start_with?(POSTGRES_PREFIX) || adapter == POSTGIS_PREFIX
@@ -259,7 +265,7 @@ module NewRelic
259
265
  # between usage of mysql and mysql2. Obfuscation is the same, though.
260
266
  elsif adapter == MYSQL2_PREFIX
261
267
  :mysql2
262
- elsif adapter.start_with? SQLITE_PREFIX
268
+ elsif adapter.start_with?(SQLITE_PREFIX)
263
269
  :sqlite
264
270
  else
265
271
  adapter.to_sym
@@ -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
@@ -13,6 +13,7 @@ module NewRelic
13
13
 
14
14
  def self.value
15
15
  return unless defined? ActiveRecord::Base
16
+
16
17
  new(::NewRelic::Control.instance.env, ActiveRecord::VERSION::STRING).value
17
18
  end
18
19
 
@@ -26,6 +27,7 @@ module NewRelic
26
27
  def value
27
28
  match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
28
29
  return unless match
30
+
29
31
  VERSIONS[match].call(env)
30
32
  end
31
33
  end
@@ -1,15 +1,12 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
7
7
  module Datastores
8
8
  module MetricHelper
9
- ROLLUP_METRIC = "Datastore/all".freeze
10
- WEB_ROLLUP_METRIC = "Datastore/allWeb".freeze
11
- OTHER_ROLLUP_METRIC = "Datastore/allOther".freeze
12
- DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
9
+ ROLLUP_METRIC = "Datastore/all".freeze
13
10
  OTHER = "Other".freeze
14
11
 
15
12
  ALL = "all".freeze
@@ -48,15 +45,15 @@ module NewRelic
48
45
  end
49
46
  end
50
47
 
51
- def self.scoped_metric_for product, operation, collection=nil
48
+ def self.scoped_metric_for(product, operation, collection = nil)
52
49
  if collection
53
- statement_metric_for product, collection, operation
50
+ statement_metric_for(product, collection, operation)
54
51
  else
55
- operation_metric_for product, operation
52
+ operation_metric_for(product, operation)
56
53
  end
57
54
  end
58
55
 
59
- def self.unscoped_metrics_for product, operation, collection=nil, host=nil, port_path_or_id=nil
56
+ def self.unscoped_metrics_for(product, operation, collection = nil, host = nil, port_path_or_id = nil)
60
57
  suffix = all_suffix
61
58
 
62
59
  metrics = [
@@ -67,30 +64,30 @@ module NewRelic
67
64
  ]
68
65
 
69
66
  if NewRelic::Agent.config[:'datastore_tracer.instance_reporting.enabled'] && host && port_path_or_id
70
- metrics.unshift instance_metric_for(product, host, port_path_or_id)
67
+ metrics.unshift(instance_metric_for(product, host, port_path_or_id))
71
68
  end
72
- metrics.unshift operation_metric_for(product, operation) if collection
69
+ metrics.unshift(operation_metric_for(product, operation)) if collection
73
70
 
74
71
  metrics
75
72
  end
76
73
 
77
- def self.product_operation_collection_for product, operation, collection=nil, generic_product = nil
74
+ def self.product_operation_collection_for(product, operation, collection = nil, generic_product = nil)
78
75
  if overrides = overridden_operation_and_collection
79
76
  if should_override?(overrides, product, generic_product)
80
- operation = overrides[0] || operation
77
+ operation = overrides[0] || operation
81
78
  collection = overrides[1] || collection
82
79
  end
83
80
  end
84
81
  [product, operation, collection]
85
82
  end
86
83
 
87
- def self.metrics_for(product, operation, collection = nil, generic_product = nil, host=nil, port_path_or_id=nil)
84
+ def self.metrics_for(product, operation, collection = nil, generic_product = nil, host = nil, port_path_or_id = nil)
88
85
  product, operation, collection = product_operation_collection_for(product, operation, collection, generic_product)
89
86
 
90
87
  # Order of these metrics matters--the first metric in the list will
91
88
  # be treated as the scoped metric in a bunch of different cases.
92
89
  metrics = unscoped_metrics_for(product, operation, collection, host, port_path_or_id)
93
- metrics.unshift scoped_metric_for(product, operation, collection)
90
+ metrics.unshift(scoped_metric_for(product, operation, collection))
94
91
 
95
92
  metrics
96
93
  end
@@ -101,13 +98,15 @@ module NewRelic
101
98
  end
102
99
 
103
100
  def self.operation_from_sql(sql)
104
- NewRelic::Agent::Database.parse_operation_from_query(sql) || OTHER
101
+ operation = NewRelic::Agent::Database.parse_operation_from_query(sql)
102
+ operation = OTHER if operation.eql?(NewRelic::Agent::Database::OTHER_OPERATION)
103
+ operation
105
104
  end
106
105
 
107
106
  # Allow Transaction#with_database_metric_name to override our
108
107
  # collection and operation
109
- def self.overridden_operation_and_collection #THREAD_LOCAL_ACCESS
110
- txn = Tracer.current_transaction
108
+ def self.overridden_operation_and_collection # THREAD_LOCAL_ACCESS
109
+ txn = Tracer.current_transaction
111
110
  txn ? txn.instrumentation_state[:datastore_override] : nil
112
111
  end
113
112
 
@@ -1,19 +1,19 @@
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
- require 'new_relic/agent/datastores/mongo/obfuscator'
3
+ # frozen_string_literal: true
4
+
5
+ require_relative '../nosql_obfuscator'
5
6
 
6
7
  module NewRelic
7
8
  module Agent
8
9
  module Datastores
9
10
  module Mongo
10
11
  module EventFormatter
11
-
12
12
  # Keys that will get their values replaced with '?'.
13
- OBFUSCATE_KEYS = [ 'filter', 'query', 'pipeline' ].freeze
13
+ OBFUSCATE_KEYS = %w[filter query pipeline].freeze
14
14
 
15
15
  # Keys that will get completely removed from the statement.
16
- DENYLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
16
+ DENYLISTED_KEYS = %w[deletes documents updates].freeze
17
17
 
18
18
  def self.format(command_name, database_name, command)
19
19
  return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
@@ -26,6 +26,7 @@ module NewRelic
26
26
 
27
27
  command.each do |key, value|
28
28
  next if DENYLISTED_KEYS.include?(key)
29
+
29
30
  if OBFUSCATE_KEYS.include?(key)
30
31
  obfuscated = obfuscate(value)
31
32
  result[key] = obfuscated if obfuscated
@@ -38,7 +39,7 @@ module NewRelic
38
39
 
39
40
  def self.obfuscate(statement)
40
41
  if NewRelic::Agent.config[:'mongo.obfuscate_queries']
41
- statement = Obfuscator.obfuscate_statement(statement)
42
+ statement = NewRelic::Agent::Datastores::NosqlObfuscator.obfuscate_statement(statement)
42
43
  end
43
44
  statement
44
45
  end
@@ -1,8 +1,8 @@
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 'new_relic/agent/datastores/mongo/obfuscator'
5
+ require 'new_relic/agent/datastores/nosql_obfuscator'
6
6
  require 'new_relic/agent/datastores/metric_helper'
7
7
 
8
8
  module NewRelic
@@ -15,8 +15,8 @@ module NewRelic
15
15
 
16
16
  if collection_in_selector?(payload)
17
17
  command_key = command_key_from_selector(payload)
18
- name = get_name_from_selector(command_key, payload)
19
- collection = get_collection_from_selector(command_key, payload)
18
+ name = get_name_from_selector(command_key, payload)
19
+ collection = get_collection_from_selector(command_key, payload)
20
20
  else
21
21
  collection = payload[:collection]
22
22
  end
@@ -57,8 +57,6 @@ module NewRelic
57
57
  nil
58
58
  end
59
59
 
60
- MONGO_PRODUCT_NAME = "MongoDB".freeze
61
-
62
60
  def self.collection_in_selector?(payload)
63
61
  payload[:collection] == '$cmd' && payload[:selector]
64
62
  end
@@ -79,7 +77,7 @@ module NewRelic
79
77
 
80
78
  :collstats,
81
79
  :renameCollection,
82
- :drop,
80
+ :drop
83
81
  ]
84
82
 
85
83
  def self.command_key_from_selector(payload)
@@ -121,7 +119,7 @@ module NewRelic
121
119
  name == :findandmodify && payload[:selector] && payload[:selector][:remove]
122
120
  end
123
121
 
124
- def self.create_indexes?(name, paylod)
122
+ def self.create_indexes?(name, _payload)
125
123
  name == :createIndexes
126
124
  end
127
125
 
@@ -176,9 +174,7 @@ module NewRelic
176
174
  parts.shift
177
175
  parts.join('.')
178
176
  end
179
-
180
177
  end
181
-
182
178
  end
183
179
  end
184
180
  end
@@ -1,28 +1,23 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
7
7
  module Datastores
8
8
  module Mongo
9
9
  def self.is_supported_version?
10
- # No version constant in < 2.0 versions of Mongo :(
11
- defined?(::Mongo) && (defined?(::Mongo::MongoClient) || is_monitoring_enabled?)
12
- end
13
-
14
- def self.is_monitoring_enabled?
15
- defined?(::Mongo::Monitoring) # @since 2.1.0
10
+ defined?(::Mongo) && is_monitoring_enabled?
16
11
  end
17
12
 
18
13
  def self.is_unsupported_2x?
19
- defined?(::Mongo::VERSION) && Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
14
+ defined?(::Mongo::VERSION) &&
15
+ Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
20
16
  !self.is_monitoring_enabled?
21
17
  end
22
18
 
23
- def self.is_version_1_10_or_later?
24
- # Again, no VERSION constant in 1.x, so we have to rely on constant checks
25
- defined?(::Mongo::CollectionOperationWriter)
19
+ def self.is_monitoring_enabled?
20
+ defined?(::Mongo::Monitoring) # @since 2.1.0
26
21
  end
27
22
  end
28
23
  end
@@ -0,0 +1,41 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic
6
+ module Agent
7
+ module Datastores
8
+ module NosqlObfuscator
9
+ ALLOWLIST = [:operation].freeze
10
+
11
+ def self.obfuscate_statement(source, allowlist = ALLOWLIST)
12
+ if source.is_a?(Hash)
13
+ obfuscated = {}
14
+ source.each do |key, value|
15
+ if allowlist.include?(key)
16
+ obfuscated[key] = value
17
+ else
18
+ obfuscated[key] = obfuscate_value(value, allowlist)
19
+ end
20
+ end
21
+ obfuscated
22
+ else
23
+ obfuscate_value(source, allowlist)
24
+ end
25
+ end
26
+
27
+ QUESTION_MARK = '?'.freeze
28
+
29
+ def self.obfuscate_value(value, allowlist = ALLOWLIST)
30
+ if value.is_a?(Hash)
31
+ obfuscate_statement(value, allowlist)
32
+ elsif value.is_a?(Array)
33
+ value.map { |v| obfuscate_value(v, allowlist) }
34
+ else
35
+ QUESTION_MARK
36
+ end
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end