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,23 +1,25 @@
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 'thread'
6
6
  require 'logger'
7
7
  require 'new_relic/agent/hostname'
8
8
  require 'new_relic/agent/log_once'
9
+ require 'new_relic/agent/instrumentation/logger/instrumentation'
9
10
 
10
11
  module NewRelic
11
12
  module Agent
12
13
  class AgentLogger
13
14
  include LogOnce
14
15
 
15
- def initialize(root = "", override_logger=nil)
16
+ def initialize(root = "", override_logger = nil)
16
17
  @already_logged_lock = Mutex.new
17
18
  clear_already_logged
18
19
  create_log(root, override_logger)
19
20
  set_log_level!
20
21
  set_log_format!
22
+ disable_log_instrumentation!
21
23
 
22
24
  gather_startup_logs
23
25
  end
@@ -50,8 +52,8 @@ module NewRelic
50
52
  # the log level that the backtrace is logged at. If you just want the
51
53
  # default behavior of backtraces logged at debug, use one of the methods
52
54
  # above and pass an Exception as one of the args.
53
- def log_exception(level, e, backtrace_level=level)
54
- @log.send(level, "%p: %s" % [ e.class, e.message ])
55
+ def log_exception(level, e, backtrace_level = level)
56
+ @log.send(level, "%p: %s" % [e.class, e.message])
55
57
  @log.send(backtrace_level) do
56
58
  backtrace = backtrace_from_exception(e)
57
59
  if backtrace
@@ -72,7 +74,7 @@ module NewRelic
72
74
  # We've seen that often the backtrace on a SystemStackError is bunk
73
75
  # so massage the caller instead at a known depth.
74
76
  #
75
- # Tests keep us honest about minmum method depth our log calls add.
77
+ # Tests keep us honest about minimum method depth our log calls add.
76
78
  return caller.drop(5) if e.is_a?(SystemStackError)
77
79
 
78
80
  e.backtrace
@@ -81,11 +83,9 @@ module NewRelic
81
83
  # Allows for passing exceptions in explicitly, which format with backtrace
82
84
  def format_and_send(level, *msgs, &block)
83
85
  if block
84
- if @log.send("#{level}?")
85
- msgs = Array(block.call)
86
- else
87
- msgs = []
88
- end
86
+ return unless @log.send("#{level}?")
87
+
88
+ msgs = Array(yield)
89
89
  end
90
90
 
91
91
  msgs.flatten.each do |item|
@@ -132,12 +132,12 @@ module NewRelic
132
132
  end
133
133
 
134
134
  def wants_stdout?
135
- ::NewRelic::Agent.config[:log_file_path].upcase == "STDOUT"
135
+ ::NewRelic::Agent.config[:log_file_path].casecmp(NewRelic::STANDARD_OUT) == 0
136
136
  end
137
137
 
138
138
  def find_or_create_file_path(path_setting, root)
139
- for abs_path in [ File.expand_path(path_setting),
140
- File.expand_path(File.join(root, path_setting)) ] do
139
+ for abs_path in [File.expand_path(path_setting),
140
+ File.expand_path(File.join(root, path_setting))] do
141
141
  if File.directory?(abs_path) || (Dir.mkdir(abs_path) rescue nil)
142
142
  return abs_path[%r{^(.*?)/?$}]
143
143
  end
@@ -151,10 +151,10 @@ module NewRelic
151
151
 
152
152
  LOG_LEVELS = {
153
153
  "debug" => ::Logger::DEBUG,
154
- "info" => ::Logger::INFO,
155
- "warn" => ::Logger::WARN,
154
+ "info" => ::Logger::INFO,
155
+ "warn" => ::Logger::WARN,
156
156
  "error" => ::Logger::ERROR,
157
- "fatal" => ::Logger::FATAL,
157
+ "fatal" => ::Logger::FATAL
158
158
  }
159
159
 
160
160
  def self.log_level_for(level)
@@ -164,19 +164,23 @@ module NewRelic
164
164
  def set_log_format!
165
165
  @hostname = NewRelic::Agent::Hostname.get
166
166
  @prefix = wants_stdout? ? '** [NewRelic]' : ''
167
- @log.formatter = Proc.new do |severity, timestamp, progname, msg|
167
+ @log.formatter = proc do |severity, timestamp, progname, msg|
168
168
  "#{@prefix}[#{timestamp.strftime("%F %H:%M:%S %z")} #{@hostname} (#{$$})] #{severity} : #{msg}\n"
169
169
  end
170
170
  end
171
171
 
172
+ # Don't allow agent logs into agent log forwarding for now
173
+ def disable_log_instrumentation!
174
+ NewRelic::Agent::Instrumentation::Logger.mark_skip_instrumenting(@log)
175
+ end
176
+
172
177
  def gather_startup_logs
173
178
  StartupLogger.instance.dump(self)
174
179
  end
175
180
 
176
- def self.format_fatal_error message
181
+ def self.format_fatal_error(message)
177
182
  "** [NewRelic] FATAL : #{message}\n"
178
183
  end
179
-
180
184
  end
181
185
 
182
186
  # In an effort to not lose messages during startup, we trap them in memory
@@ -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
  # This class applies filtering rules as specified in the Agent Attributes
6
6
  # cross-agent spec.
@@ -64,64 +64,83 @@ module NewRelic
64
64
  class AttributeFilter
65
65
  DST_NONE = 0x0
66
66
 
67
- DST_TRANSACTION_EVENTS = 1 << 0
68
- DST_TRANSACTION_TRACER = 1 << 1
69
- DST_ERROR_COLLECTOR = 1 << 2
70
- DST_BROWSER_MONITORING = 1 << 3
71
- DST_SPAN_EVENTS = 1 << 4
67
+ DST_TRANSACTION_EVENTS = 1 << 0
68
+ DST_TRANSACTION_TRACER = 1 << 1
69
+ DST_ERROR_COLLECTOR = 1 << 2
70
+ DST_BROWSER_MONITORING = 1 << 3
71
+ DST_SPAN_EVENTS = 1 << 4
72
72
  DST_TRANSACTION_SEGMENTS = 1 << 5
73
73
 
74
- DST_ALL = 0x3f
74
+ DST_ALL = 0x3f
75
75
 
76
76
  attr_reader :rules
77
77
 
78
78
  def initialize(config)
79
- @enabled_destinations = DST_NONE
79
+ prep_enabled_destinations(config)
80
+ prep_rules(config)
80
81
 
81
- @enabled_destinations |= DST_TRANSACTION_TRACER if config[:'transaction_tracer.attributes.enabled']
82
- @enabled_destinations |= DST_TRANSACTION_EVENTS if config[:'transaction_events.attributes.enabled']
83
- @enabled_destinations |= DST_ERROR_COLLECTOR if config[:'error_collector.attributes.enabled']
84
- @enabled_destinations |= DST_BROWSER_MONITORING if config[:'browser_monitoring.attributes.enabled']
85
- @enabled_destinations |= DST_SPAN_EVENTS if config[:'span_events.attributes.enabled']
86
- @enabled_destinations |= DST_TRANSACTION_SEGMENTS if config[:'transaction_segments.attributes.enabled']
82
+ # We're ok to cache high security for fast lookup because the attribute
83
+ # filter is re-generated on any significant config change.
84
+ @high_security = config[:high_security]
85
+
86
+ setup_key_cache
87
+ cache_prefix_denylist
88
+ end
87
89
 
88
- @enabled_destinations = DST_NONE unless config[:'attributes.enabled']
90
+ def prep_enabled_destinations(config)
91
+ @enabled_destinations = config[:'attributes.enabled'] ? enabled_destinations_for_attributes(config) : DST_NONE
92
+ end
93
+
94
+ def enabled_destinations_for_attributes(config)
95
+ destinations = DST_NONE
96
+ destinations |= DST_TRANSACTION_TRACER if config[:'transaction_tracer.attributes.enabled']
97
+ destinations |= DST_TRANSACTION_EVENTS if config[:'transaction_events.attributes.enabled']
98
+ destinations |= DST_ERROR_COLLECTOR if config[:'error_collector.attributes.enabled']
99
+ destinations |= DST_BROWSER_MONITORING if config[:'browser_monitoring.attributes.enabled']
100
+ destinations |= DST_SPAN_EVENTS if config[:'span_events.attributes.enabled']
101
+ destinations |= DST_TRANSACTION_SEGMENTS if config[:'transaction_segments.attributes.enabled']
102
+ destinations
103
+ end
89
104
 
105
+ def prep_rules(config)
90
106
  @rules = []
107
+ prep_attributes_exclude_rules(config)
108
+ prep_capture_params_rules(config)
109
+ prep_datastore_rules(config)
110
+ prep_attributes_include_rules(config)
111
+ build_uri_rule(config[:'attributes.exclude'])
112
+ @rules.sort!
113
+ end
91
114
 
115
+ def prep_attributes_exclude_rules(config)
92
116
  build_rule(config[:'attributes.exclude'], DST_ALL, false)
93
- build_rule(config[:'transaction_tracer.attributes.exclude'], DST_TRANSACTION_TRACER, false)
94
- build_rule(config[:'transaction_events.attributes.exclude'], DST_TRANSACTION_EVENTS, false)
95
- build_rule(config[:'error_collector.attributes.exclude'], DST_ERROR_COLLECTOR, false)
96
- build_rule(config[:'browser_monitoring.attributes.exclude'], DST_BROWSER_MONITORING, false)
97
- build_rule(config[:'span_events.attributes.exclude'], DST_SPAN_EVENTS, false)
117
+ build_rule(config[:'transaction_tracer.attributes.exclude'], DST_TRANSACTION_TRACER, false)
118
+ build_rule(config[:'transaction_events.attributes.exclude'], DST_TRANSACTION_EVENTS, false)
119
+ build_rule(config[:'error_collector.attributes.exclude'], DST_ERROR_COLLECTOR, false)
120
+ build_rule(config[:'browser_monitoring.attributes.exclude'], DST_BROWSER_MONITORING, false)
121
+ build_rule(config[:'span_events.attributes.exclude'], DST_SPAN_EVENTS, false)
98
122
  build_rule(config[:'transaction_segments.attributes.exclude'], DST_TRANSACTION_SEGMENTS, false)
123
+ end
99
124
 
125
+ def prep_capture_params_rules(config)
100
126
  build_rule(['request.parameters.*'], include_destinations_for_capture_params(config[:capture_params]), true)
101
- build_rule(['job.resque.args.*'], include_destinations_for_capture_params(config[:'resque.capture_params']), true)
102
- build_rule(['job.sidekiq.args.*'], include_destinations_for_capture_params(config[:'sidekiq.capture_params']), true)
127
+ build_rule(['job.resque.args.*'], include_destinations_for_capture_params(config[:'resque.capture_params']), true)
128
+ build_rule(['job.sidekiq.args.*'], include_destinations_for_capture_params(config[:'sidekiq.capture_params']), true)
129
+ end
103
130
 
104
- build_rule(['host', 'port_path_or_id'], DST_TRANSACTION_SEGMENTS, config[:'datastore_tracer.instance_reporting.enabled'])
105
- build_rule(['database_name'], DST_TRANSACTION_SEGMENTS, config[:'datastore_tracer.database_name_reporting.enabled'])
131
+ def prep_datastore_rules(config)
132
+ build_rule(%w[host port_path_or_id], DST_TRANSACTION_SEGMENTS, config[:'datastore_tracer.instance_reporting.enabled'])
133
+ build_rule(['database_name'], DST_TRANSACTION_SEGMENTS, config[:'datastore_tracer.database_name_reporting.enabled'])
134
+ end
106
135
 
136
+ def prep_attributes_include_rules(config)
107
137
  build_rule(config[:'attributes.include'], DST_ALL, true)
108
- build_rule(config[:'transaction_tracer.attributes.include'], DST_TRANSACTION_TRACER, true)
109
- build_rule(config[:'transaction_events.attributes.include'], DST_TRANSACTION_EVENTS, true)
110
- build_rule(config[:'error_collector.attributes.include'], DST_ERROR_COLLECTOR, true)
111
- build_rule(config[:'browser_monitoring.attributes.include'], DST_BROWSER_MONITORING, true)
112
- build_rule(config[:'span_events.attributes.include'], DST_SPAN_EVENTS, true)
138
+ build_rule(config[:'transaction_tracer.attributes.include'], DST_TRANSACTION_TRACER, true)
139
+ build_rule(config[:'transaction_events.attributes.include'], DST_TRANSACTION_EVENTS, true)
140
+ build_rule(config[:'error_collector.attributes.include'], DST_ERROR_COLLECTOR, true)
141
+ build_rule(config[:'browser_monitoring.attributes.include'], DST_BROWSER_MONITORING, true)
142
+ build_rule(config[:'span_events.attributes.include'], DST_SPAN_EVENTS, true)
113
143
  build_rule(config[:'transaction_segments.attributes.include'], DST_TRANSACTION_SEGMENTS, true)
114
-
115
- build_uri_rule(config[:'attributes.exclude'])
116
-
117
- @rules.sort!
118
-
119
- # We're ok to cache high security for fast lookup because the attribute
120
- # filter is re-generated on any significant config change.
121
- @high_security = config[:high_security]
122
-
123
- setup_key_cache
124
- cache_prefix_denylist
125
144
  end
126
145
 
127
146
  # Note the key_cache is a global cache, accessible by multiple threads,
@@ -165,7 +184,7 @@ module NewRelic
165
184
  end
166
185
 
167
186
  def build_uri_rule(excluded_attributes)
168
- uri_aliases = %w(uri url request_uri request.uri http.url)
187
+ uri_aliases = %w[uri url request_uri request.uri http.url]
169
188
 
170
189
  if (excluded_attributes & uri_aliases).size > 0
171
190
  build_rule(uri_aliases - excluded_attributes, DST_ALL, false)
@@ -175,7 +194,7 @@ module NewRelic
175
194
  def apply(attribute_name, default_destinations)
176
195
  return DST_NONE if @enabled_destinations == DST_NONE
177
196
 
178
- destinations = default_destinations
197
+ destinations = default_destinations
179
198
  attribute_name = attribute_name.to_s
180
199
 
181
200
  @rules.each do |rule|
@@ -225,8 +244,8 @@ module NewRelic
225
244
  def cache_prefix_denylist
226
245
  @prefix_denylist = {}
227
246
  @prefix_denylist[:'request.parameters'] = true unless might_allow_prefix_uncached?(:'request.parameters')
228
- @prefix_denylist[:'job.sidekiq.args'] = true unless might_allow_prefix_uncached?(:'job.sidekiq.args')
229
- @prefix_denylist[:'job.resque.args'] = true unless might_allow_prefix_uncached?(:'job.resque.args')
247
+ @prefix_denylist[:'job.sidekiq.args'] = true unless might_allow_prefix_uncached?(:'job.sidekiq.args')
248
+ @prefix_denylist[:'job.resque.args'] = true unless might_allow_prefix_uncached?(:'job.resque.args')
230
249
  end
231
250
 
232
251
  # Note that the given prefix *must* be a Symbol
@@ -257,9 +276,9 @@ module NewRelic
257
276
 
258
277
  def initialize(attribute_name, destinations, is_include)
259
278
  @attribute_name = attribute_name.sub(/\*$/, "")
260
- @wildcard = attribute_name.end_with?("*")
261
- @is_include = is_include
262
- @destinations = is_include ? destinations : ~destinations
279
+ @wildcard = attribute_name.end_with?("*")
280
+ @is_include = is_include
281
+ @destinations = is_include ? destinations : ~destinations
263
282
  end
264
283
 
265
284
  # Rules are sorted from least specific to most specific
@@ -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
@@ -11,19 +11,19 @@ module NewRelic
11
11
  EMPTY_ARRAY_STRING_LITERAL = "[]".freeze
12
12
 
13
13
  def flatten_and_coerce(object, prefix = nil, result = {}, &blk)
14
- if object.is_a? Hash
14
+ if object.is_a?(Hash)
15
15
  flatten_and_coerce_hash(object, prefix, result, &blk)
16
- elsif object.is_a? Array
16
+ elsif object.is_a?(Array)
17
17
  flatten_and_coerce_array(object, prefix, result, &blk)
18
18
  elsif prefix
19
19
  val = Coerce.scalar(object)
20
20
  if blk
21
- blk.call(prefix, val)
21
+ yield(prefix, val)
22
22
  elsif !val.nil?
23
23
  result[prefix] = val
24
24
  end
25
25
  else
26
- NewRelic::Agent.logger.warn "Unexpected object: #{object.inspect} with nil prefix passed to NewRelic::Agent::AttributeProcessing.flatten_and_coerce"
26
+ NewRelic::Agent.logger.warn("Unexpected object: #{object.inspect} with nil prefix passed to NewRelic::Agent::AttributeProcessing.flatten_and_coerce")
27
27
  end
28
28
  result
29
29
  end
@@ -31,7 +31,7 @@ module NewRelic
31
31
  def flatten_and_coerce_hash(hash, prefix, result, &blk)
32
32
  if hash.empty?
33
33
  if blk
34
- blk.call(prefix, EMPTY_HASH_STRING_LITERAL)
34
+ yield(prefix, EMPTY_HASH_STRING_LITERAL)
35
35
  else
36
36
  result[prefix] = EMPTY_HASH_STRING_LITERAL
37
37
  end
@@ -46,7 +46,7 @@ module NewRelic
46
46
  def flatten_and_coerce_array(array, prefix, result, &blk)
47
47
  if array.empty?
48
48
  if blk
49
- blk.call(prefix, EMPTY_ARRAY_STRING_LITERAL)
49
+ yield(prefix, EMPTY_ARRAY_STRING_LITERAL)
50
50
  else
51
51
  result[prefix] = EMPTY_ARRAY_STRING_LITERAL
52
52
  end
@@ -1,13 +1,13 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/attribute_processing'
6
6
 
7
7
  module NewRelic
8
8
  module Agent
9
9
  class Attributes
10
- KEY_LIMIT = 255
10
+ KEY_LIMIT = 255
11
11
  VALUE_LIMIT = 255
12
12
  COUNT_LIMIT = 64
13
13
 
@@ -34,7 +34,7 @@ module NewRelic
34
34
  end
35
35
 
36
36
  def add_agent_attribute_with_key_check(key, value, default_destinations)
37
- if exceeds_bytesize_limit? key, KEY_LIMIT
37
+ if exceeds_bytesize_limit?(key, KEY_LIMIT)
38
38
  NewRelic::Agent.logger.debug("Agent attribute #{key} was dropped for exceeding key length limit #{KEY_LIMIT}")
39
39
  return
40
40
  end
@@ -58,6 +58,7 @@ module NewRelic
58
58
  def merge_custom_attributes(other)
59
59
  return unless Agent.config[:'custom_attributes.enabled']
60
60
  return if other.empty?
61
+
61
62
  AttributeProcessing.flatten_and_coerce(other) do |k, v|
62
63
  add_custom_attribute(k, v)
63
64
  end
@@ -73,7 +74,7 @@ module NewRelic
73
74
 
74
75
  def intrinsic_attributes_for(destination)
75
76
  if destination == NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER ||
76
- destination == NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
77
+ destination == NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
77
78
  @intrinsic_attributes
78
79
  else
79
80
  NewRelic::EMPTY_HASH
@@ -1,10 +1,11 @@
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 'logger'
6
6
  require 'fileutils'
7
7
  require 'new_relic/agent/hostname'
8
+ require 'new_relic/agent/instrumentation/logger/instrumentation'
8
9
 
9
10
  module NewRelic
10
11
  module Agent
@@ -28,6 +29,7 @@ module NewRelic
28
29
 
29
30
  def log_request_headers(uri, headers)
30
31
  return unless enabled? && allowed_endpoint?(uri)
32
+
31
33
  @log.info("REQUEST HEADERS: #{headers}")
32
34
  rescue StandardError, SystemStackError, SystemCallError => e
33
35
  ::NewRelic::Agent.logger.warn("Failed writing request headers to audit log", e)
@@ -70,6 +72,9 @@ module NewRelic
70
72
  @log = NewRelic::Agent::NullLogger.new
71
73
  end
72
74
 
75
+ # Never have agent log forwarding capture audits
76
+ NewRelic::Agent::Instrumentation::Logger.mark_skip_instrumenting(@log)
77
+
73
78
  @log.formatter = create_log_formatter
74
79
  end
75
80
 
@@ -90,13 +95,13 @@ module NewRelic
90
95
  end
91
96
 
92
97
  def wants_stdout?
93
- ::NewRelic::Agent.config[:'audit_log.path'].upcase == "STDOUT"
98
+ ::NewRelic::Agent.config[:'audit_log.path'].casecmp(NewRelic::STANDARD_OUT) == 0
94
99
  end
95
100
 
96
101
  def create_log_formatter
97
102
  @hostname = NewRelic::Agent::Hostname.get
98
103
  @prefix = wants_stdout? ? '** [NewRelic]' : ''
99
- Proc.new do |severity, time, progname, msg|
104
+ proc do |severity, time, progname, msg|
100
105
  "#{@prefix}[#{time} #{@hostname} (#{$$})] : #{msg}\n"
101
106
  end
102
107
  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
@@ -18,13 +18,12 @@ module NewRelic
18
18
  module Autostart
19
19
  extend self
20
20
 
21
-
22
21
  # The constants, executables (i.e. $0) and rake tasks used can be
23
22
  # configured with the config keys 'autostart.denylisted_constants',
24
23
  # 'autostart.denylisted_executables' and
25
24
  # 'autostart.denylisted_rake_tasks'
26
25
  def agent_should_start?
27
- !denylisted_constants? &&
26
+ !denylisted_constants? &&
28
27
  !denylisted_executables? &&
29
28
  !in_denylisted_rake_task?
30
29
  end
@@ -32,11 +31,19 @@ module NewRelic
32
31
  COMMA = ",".freeze
33
32
 
34
33
  def denylisted_constants?
35
- # For backwards compatibility until :'autostart_blacklisted_constants' config option is removed
36
- constants = NewRelic::Agent.config[:'autostart.denylisted_constants'] << COMMA << NewRelic::Agent.config[:'autostart.blacklisted_constants']
37
-
38
- denylisted?(constants) do |name|
39
- constant_is_defined?(name)
34
+ denylisted?(NewRelic::Agent.config[:'autostart.denylisted_constants']) do |name|
35
+ if RUBY_PLATFORM.eql?('java')
36
+ # As of JRuby 9.3.4.0, Object.const_defined? will still cross
37
+ # namespaces to find constants, which is not what we want. This
38
+ # behavior is similar to CRuby's Object.const_get prior to v2.6.
39
+ #
40
+ # Example:
41
+ # irb> class MyClass; end; module MyModule; end
42
+ # irb> Object.const_defined?('MyModule::MyClass') # => true
43
+ !!::NewRelic::LanguageSupport.constantize(name)
44
+ else
45
+ Object.const_defined?(name)
46
+ end
40
47
  end
41
48
  end
42
49
 
@@ -46,23 +53,17 @@ module NewRelic
46
53
  end
47
54
  end
48
55
 
49
- # Lookup whether namespaced constants (e.g. ::Foo::Bar::Baz) are in the
50
- # environment.
51
- def constant_is_defined?(const_name)
52
- !!::NewRelic::LanguageSupport.constantize(const_name)
53
- end
54
-
55
56
  def denylisted?(value, &block)
56
57
  value.split(/\s*,\s*/).any?(&block)
57
58
  end
58
59
 
59
60
  def in_denylisted_rake_task?
60
61
  tasks = begin
61
- ::Rake.application.top_level_tasks
62
- rescue => e
63
- ::NewRelic::Agent.logger.debug("Not in Rake environment so skipping denylisted_rake_tasks check: #{e}")
64
- []
65
- end
62
+ ::Rake.application.top_level_tasks
63
+ rescue => e
64
+ ::NewRelic::Agent.logger.debug("Not in Rake environment so skipping denylisted_rake_tasks check: #{e}")
65
+ NewRelic::EMPTY_ARRAY
66
+ end
66
67
  !(tasks & ::NewRelic::Agent.config[:'autostart.denylisted_rake_tasks'].split(/\s*,\s*/)).empty?
67
68
  end
68
69
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  # This class is used by NewRelic::Agent.set_sql_obfuscator to chain multiple
6
6
  # obfuscation blocks when not using the default :replace action
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -9,8 +9,8 @@ module NewRelic
9
9
  attr_reader :id, :name, :arguments
10
10
 
11
11
  def initialize(raw_collector_command)
12
- @id = raw_collector_command[0]
13
- @name = raw_collector_command[1]["name"]
12
+ @id = raw_collector_command[0]
13
+ @name = raw_collector_command[1]["name"]
14
14
  @arguments = raw_collector_command[1]["arguments"]
15
15
  end
16
16
  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
  # This class is the central point for dispatching get_agent_commands messages
6
6
  # to the various components that actually process them.
@@ -19,15 +19,15 @@ module NewRelic
19
19
 
20
20
  attr_accessor :thread_profiler_session, :backtrace_service
21
21
 
22
- def initialize(event_listener=nil)
23
- @handlers = Hash.new { |*| Proc.new { |cmd| self.unrecognized_agent_command(cmd) } }
22
+ def initialize(event_listener = nil)
23
+ @handlers = Hash.new { |*| proc { |cmd| self.unrecognized_agent_command(cmd) } }
24
24
 
25
25
  @backtrace_service = Threading::BacktraceService.new(event_listener)
26
26
 
27
27
  @thread_profiler_session = ThreadProfilerSession.new(@backtrace_service)
28
28
 
29
- @handlers['start_profiler'] = Proc.new { |cmd| thread_profiler_session.handle_start_command(cmd) }
30
- @handlers['stop_profiler'] = Proc.new { |cmd| thread_profiler_session.handle_stop_command(cmd) }
29
+ @handlers['start_profiler'] = proc { |cmd| thread_profiler_session.handle_start_command(cmd) }
30
+ @handlers['stop_profiler'] = proc { |cmd| thread_profiler_session.handle_stop_command(cmd) }
31
31
 
32
32
  if event_listener
33
33
  event_listener.subscribe(:before_shutdown, &method(:on_before_shutdown))
@@ -63,6 +63,7 @@ module NewRelic
63
63
  # Same with reset! - we don't support asynchronous cancellation of a
64
64
  # running thread profile currently.
65
65
  def merge!(*args); end
66
+
66
67
  def reset!; end
67
68
 
68
69
  def harvest_from_thread_profiler_session
@@ -76,17 +77,17 @@ module NewRelic
76
77
 
77
78
  def log_profiles(profiles)
78
79
  if profiles.empty?
79
- ::NewRelic::Agent.logger.debug "No thread profiles with data found to send."
80
+ ::NewRelic::Agent.logger.debug("No thread profiles with data found to send.")
80
81
  else
81
82
  profile_descriptions = profiles.map { |p| p.to_log_description }
82
- ::NewRelic::Agent.logger.debug "Sending thread profiles [#{profile_descriptions.join(", ")}]"
83
+ ::NewRelic::Agent.logger.debug("Sending thread profiles [#{profile_descriptions.join(", ")}]")
83
84
  end
84
85
  end
85
86
 
86
87
  def get_agent_commands
87
88
  commands = new_relic_service.get_agent_commands
88
- NewRelic::Agent.logger.debug "Received get_agent_commands = #{commands.inspect}"
89
- commands.map {|collector_command| AgentCommand.new(collector_command)}
89
+ NewRelic::Agent.logger.debug("Received get_agent_commands = #{commands.inspect}")
90
+ commands.map { |collector_command| AgentCommand.new(collector_command) }
90
91
  end
91
92
 
92
93
  def invoke_commands(agent_commands)
@@ -112,7 +113,7 @@ module NewRelic
112
113
  end
113
114
  end
114
115
 
115
- SUCCESS_RESULT = {}.freeze
116
+ SUCCESS_RESULT = NewRelic::EMPTY_HASH
116
117
  ERROR_KEY = "error"
117
118
 
118
119
  def success
@@ -120,7 +121,7 @@ module NewRelic
120
121
  end
121
122
 
122
123
  def error(err)
123
- { ERROR_KEY => err.message }
124
+ {ERROR_KEY => err.message}
124
125
  end
125
126
 
126
127
  def call_handler_for(agent_command)