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/configuration/dotted_hash'
6
6
 
@@ -26,9 +26,10 @@ module NewRelic
26
26
  def change_setting(policies, option, new_value)
27
27
  current_value = Agent.config[option]
28
28
  unless current_value == new_value
29
- NewRelic::Agent.logger.info \
29
+ NewRelic::Agent.logger.info( \
30
30
  "Setting changed: {#{option}: from #{current_value} " \
31
31
  "to #{new_value}}. Source: SecurityPolicySource"
32
+ )
32
33
  end
33
34
  policies[option] = new_value
34
35
  end
@@ -52,150 +53,159 @@ module NewRelic
52
53
  SECURITY_SETTINGS_MAP = {
53
54
  "record_sql" => [
54
55
  {
55
- option: :'transaction_tracer.record_sql',
56
- supported: true,
57
- enabled_fn: method(:record_sql_enabled?),
56
+ option: :'transaction_tracer.record_sql',
57
+ supported: true,
58
+ enabled_fn: method(:record_sql_enabled?),
58
59
  disabled_value: 'off',
59
- permitted_fn: proc { |policies|
60
+ permitted_fn: proc { |policies|
60
61
  change_setting(policies, :'transaction_tracer.record_sql', 'obfuscated')
61
62
  }
62
63
  },
63
64
  {
64
- option: :'slow_sql.record_sql',
65
- supported: true,
66
- enabled_fn: method(:record_sql_enabled?),
65
+ option: :'slow_sql.record_sql',
66
+ supported: true,
67
+ enabled_fn: method(:record_sql_enabled?),
67
68
  disabled_value: 'off',
68
- permitted_fn: proc { |policies|
69
+ permitted_fn: proc { |policies|
69
70
  change_setting(policies, :'slow_sql.record_sql', 'obfuscated')
70
71
  }
71
72
  },
72
73
  {
73
- option: :'mongo.capture_queries',
74
- supported: true,
75
- enabled_fn: method(:enabled?),
74
+ option: :'mongo.capture_queries',
75
+ supported: true,
76
+ enabled_fn: method(:enabled?),
76
77
  disabled_value: false,
77
- permitted_fn: proc{ |policies|
78
+ permitted_fn: proc { |policies|
78
79
  change_setting(policies, :'mongo.obfuscate_queries', true)
79
80
  }
80
81
  },
81
82
  {
82
- option: :'transaction_tracer.record_redis_arguments',
83
- supported: true,
84
- enabled_fn: method(:enabled?),
83
+ option: :'elasticsearch.capture_queries',
84
+ supported: true,
85
+ enabled_fn: method(:enabled?),
85
86
  disabled_value: false,
86
- permitted_fn: nil
87
+ permitted_fn: proc { |policies|
88
+ change_setting(policies, :'elasticsearch.obfuscate_queries', true)
89
+ }
90
+ },
91
+ {
92
+ option: :'transaction_tracer.record_redis_arguments',
93
+ supported: true,
94
+ enabled_fn: method(:enabled?),
95
+ disabled_value: false,
96
+ permitted_fn: nil
87
97
  }
88
98
  ],
89
99
  "attributes_include" => [
90
100
  {
91
- option: :'attributes.include',
92
- supported: true,
93
- enabled_fn: method(:not_empty?),
101
+ option: :'attributes.include',
102
+ supported: true,
103
+ enabled_fn: method(:not_empty?),
94
104
  disabled_value: [],
95
- permitted_fn: nil
105
+ permitted_fn: nil
96
106
  },
97
107
  {
98
- option: :'transaction_tracer.attributes.include',
99
- supported: true,
100
- enabled_fn: method(:not_empty?),
108
+ option: :'transaction_tracer.attributes.include',
109
+ supported: true,
110
+ enabled_fn: method(:not_empty?),
101
111
  disabled_value: [],
102
- permitted_fn: nil
112
+ permitted_fn: nil
103
113
  },
104
114
  {
105
- option: :'transaction_events.attributes.include',
106
- supported: true,
107
- enabled_fn: method(:not_empty?),
115
+ option: :'transaction_events.attributes.include',
116
+ supported: true,
117
+ enabled_fn: method(:not_empty?),
108
118
  disabled_value: [],
109
- permitted_fn: nil
119
+ permitted_fn: nil
110
120
  },
111
121
  {
112
- option: :'error_collector.attributes.include',
113
- supported: true,
114
- enabled_fn: method(:not_empty?),
122
+ option: :'error_collector.attributes.include',
123
+ supported: true,
124
+ enabled_fn: method(:not_empty?),
115
125
  disabled_value: [],
116
- permitted_fn: nil
126
+ permitted_fn: nil
117
127
  },
118
128
  {
119
- option: :'browser_monitoring.attributes.include',
120
- supported: true,
121
- enabled_fn: method(:not_empty?),
129
+ option: :'browser_monitoring.attributes.include',
130
+ supported: true,
131
+ enabled_fn: method(:not_empty?),
122
132
  disabled_value: [],
123
- permitted_fn: nil
133
+ permitted_fn: nil
124
134
  },
125
135
  {
126
- option: :'span_events.attributes.include',
127
- supported: true,
128
- enabled_fn: method(:not_empty?),
136
+ option: :'span_events.attributes.include',
137
+ supported: true,
138
+ enabled_fn: method(:not_empty?),
129
139
  disabled_value: [],
130
- permitted_fn: nil
140
+ permitted_fn: nil
131
141
  },
132
142
  {
133
- option: :'transaction_segments.attributes.include',
134
- supported: true,
135
- enabled_fn: method(:not_empty?),
143
+ option: :'transaction_segments.attributes.include',
144
+ supported: true,
145
+ enabled_fn: method(:not_empty?),
136
146
  disabled_value: [],
137
- permitted_fn: nil
147
+ permitted_fn: nil
138
148
  }
139
149
  ],
140
150
  "allow_raw_exception_messages" => [
141
151
  {
142
- option: :'strip_exception_messages.enabled',
143
- supported: true,
144
- enabled_fn: method(:enabled?),
152
+ option: :'strip_exception_messages.enabled',
153
+ supported: true,
154
+ enabled_fn: method(:enabled?),
145
155
  disabled_value: false,
146
- permitted_fn: nil
156
+ permitted_fn: nil
147
157
  }
148
158
  ],
149
159
  "custom_events" => [
150
160
  {
151
- option: :'custom_insights_events.enabled',
152
- supported: true,
153
- enabled_fn: method(:enabled?),
161
+ option: :'custom_insights_events.enabled',
162
+ supported: true,
163
+ enabled_fn: method(:enabled?),
154
164
  disabled_value: false,
155
- permitted_fn: nil
165
+ permitted_fn: nil
156
166
  }
157
167
  ],
158
168
  "custom_parameters" => [
159
169
  {
160
- option: :'custom_attributes.enabled',
161
- supported: true,
162
- enabled_fn: method(:enabled?),
170
+ option: :'custom_attributes.enabled',
171
+ supported: true,
172
+ enabled_fn: method(:enabled?),
163
173
  disabled_value: false,
164
- permitted_fn: nil
174
+ permitted_fn: nil
165
175
  }
166
176
  ],
167
177
  "custom_instrumentation_editor" => [
168
178
  {
169
- option: nil,
170
- supported: false,
171
- enabled_fn: nil,
179
+ option: nil,
180
+ supported: false,
181
+ enabled_fn: nil,
172
182
  disabled_value: nil,
173
- permitted_fn: nil
183
+ permitted_fn: nil
174
184
  }
175
185
  ],
176
186
  "message_parameters" => [
177
187
  {
178
- option: :'message_tracer.segment_parameters.enabled',
179
- supported: true,
180
- enabled_fn: method(:enabled?),
188
+ option: :'message_tracer.segment_parameters.enabled',
189
+ supported: true,
190
+ enabled_fn: method(:enabled?),
181
191
  disabled_value: false,
182
- permitted_fn: nil
192
+ permitted_fn: nil
183
193
  }
184
194
  ],
185
195
  "job_arguments" => [
186
196
  {
187
- option: :'resque.capture_params',
188
- supported: true,
189
- enabled_fn: method(:enabled?),
197
+ option: :'resque.capture_params',
198
+ supported: true,
199
+ enabled_fn: method(:enabled?),
190
200
  disabled_value: false,
191
- permitted_fn: nil
201
+ permitted_fn: nil
192
202
  },
193
203
  {
194
- option: :'sidekiq.capture_params',
195
- supported: true,
196
- enabled_fn: method(:enabled?),
204
+ option: :'sidekiq.capture_params',
205
+ supported: true,
206
+ enabled_fn: method(:enabled?),
197
207
  disabled_value: false,
198
- permitted_fn: nil
208
+ permitted_fn: nil
199
209
  }
200
210
  ]
201
211
  }
@@ -211,6 +221,7 @@ module NewRelic
211
221
  security_policies.inject({}) do |settings, (policy_name, policy_settings)|
212
222
  SECURITY_SETTINGS_MAP[policy_name].each do |policy|
213
223
  next unless policy[:supported]
224
+
214
225
  if policy_settings[ENABLED]
215
226
  if policy[:enabled_fn].call(policy[:option])
216
227
  if permitted_fn = policy[:permitted_fn]
@@ -218,15 +229,17 @@ module NewRelic
218
229
  end
219
230
  else
220
231
  config_source = Agent.config.source(policy[:option]).class.name.split(COLON_COLON).last
221
- NewRelic::Agent.logger.info \
232
+ NewRelic::Agent.logger.info( \
222
233
  "Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
223
234
  "Source: #{config_source}"
235
+ )
224
236
  end
225
237
  else
226
- settings[policy[:option]] = policy[:disabled_value]
227
- NewRelic::Agent.logger.info \
238
+ settings[policy[:option]] = policy[:disabled_value]
239
+ NewRelic::Agent.logger.info( \
228
240
  "Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
229
241
  "Source: SecurityPolicySource"
242
+ )
230
243
  end
231
244
  end
232
245
  settings
@@ -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
@@ -33,7 +33,7 @@ module NewRelic
33
33
  "trusted_account_key"
34
34
  ]
35
35
 
36
- def initialize(connect_reply, existing_config={})
36
+ def initialize(connect_reply, existing_config = {})
37
37
  merged_settings = {}
38
38
 
39
39
  merge_top_level_keys(merged_settings, connect_reply)
@@ -76,32 +76,34 @@ module NewRelic
76
76
  end
77
77
 
78
78
  EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES = {
79
- :'analytics_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
79
+ :'transaction_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
80
80
  :'custom_insights_events.max_samples_stored' => 'Supportability/EventHarvest/CustomEventData/HarvestLimit',
81
- :'error_collector.max_event_samples_stored'=> 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
82
- :'span_events.max_samples_stored'=> 'Supportability/EventHarvest/SpanEventData/HarvestLimit',
83
- :event_report_period => 'Supportability/EventHarvest/ReportPeriod'
81
+ :'error_collector.max_event_samples_stored' => 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
82
+ :'application_logging.forwarding.max_samples_stored' => 'Supportability/EventHarvest/LogEventData/HarvestLimit',
83
+ :'span_events.max_samples_stored' => 'Supportability/SpanEvent/Limit',
84
+ :event_report_period => 'Supportability/EventHarvest/ReportPeriod',
85
+ :'event_report_period.span_event_data' => 'Supportability/SpanEvent/ReportPeriod'
84
86
  }
85
87
 
86
88
  def add_event_harvest_config(merged_settings, connect_reply)
87
- return unless event_harvest_config_is_valid connect_reply
89
+ return unless event_harvest_config_is_valid(connect_reply)
88
90
 
89
91
  event_harvest_config = EventHarvestConfig.to_config_hash(connect_reply)
90
92
  EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES.each do |config_key, metric_name|
91
- NewRelic::Agent.record_metric metric_name, event_harvest_config[config_key]
93
+ NewRelic::Agent.record_metric(metric_name, event_harvest_config[config_key])
92
94
  end
93
95
 
94
- merged_settings.merge! event_harvest_config
96
+ merged_settings.merge!(event_harvest_config)
95
97
  end
96
98
 
97
- def event_harvest_config_is_valid connect_reply
99
+ def event_harvest_config_is_valid(connect_reply)
98
100
  event_harvest_config = connect_reply['event_harvest_config']
99
101
 
100
102
  if event_harvest_config.nil? \
101
103
  || event_harvest_config['harvest_limits'].values.min < 0 \
102
104
  || (event_harvest_config['report_period_ms'] / 1000) <= 0
103
- NewRelic::Agent.logger.warn "Invalid event harvest config found " \
104
- "in connect response; using default event report period."
105
+ NewRelic::Agent.logger.warn("Invalid event harvest config found " \
106
+ "in connect response; using default event report period.")
105
107
  false
106
108
  else
107
109
  true
@@ -132,19 +134,19 @@ module NewRelic
132
134
  # do the real enforcement there.
133
135
  def apply_feature_gates(merged_settings, connect_reply, existing_config)
134
136
  gated_features = {
135
- 'transaction_tracer.enabled' => 'collect_traces',
136
- 'slow_sql.enabled' => 'collect_traces',
137
- 'error_collector.enabled' => 'collect_errors',
138
- 'analytics_events.enabled' => 'collect_analytics_events',
137
+ 'transaction_tracer.enabled' => 'collect_traces',
138
+ 'slow_sql.enabled' => 'collect_traces',
139
+ 'error_collector.enabled' => 'collect_errors',
140
+ 'transaction_events.enabled' => 'collect_analytics_events',
139
141
  'custom_insights_events.enabled' => 'collect_custom_events',
140
142
  'error_collector.capture_events' => 'collect_error_events',
141
- 'span_events.enabled' => 'collect_span_events'
143
+ 'span_events.enabled' => 'collect_span_events'
142
144
  }
143
145
  gated_features.each do |config_key, gate_key|
144
146
  if connect_reply.has_key?(gate_key)
145
147
  allowed_by_server = connect_reply[gate_key]
146
- requested_value = ungated_value(config_key, merged_settings, existing_config)
147
- effective_value = (allowed_by_server && requested_value)
148
+ requested_value = ungated_value(config_key, merged_settings, existing_config)
149
+ effective_value = (allowed_by_server && requested_value)
148
150
  merged_settings[config_key] = effective_value
149
151
  end
150
152
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/configuration/dotted_hash'
6
6
 
@@ -11,9 +11,13 @@ module NewRelic
11
11
  attr_accessor :file_path, :failures
12
12
  attr_reader :generated_for_user, :license_key
13
13
 
14
+ # These are configuration options that have a value of a Hash
15
+ # This is used in YamlSource#dot_flattened prevent flattening these values
16
+ CONFIG_WITH_HASH_VALUE = %w[expected_messages ignore_messages]
17
+
14
18
  def initialize(path, env)
15
19
  @path = path
16
- config = {}
20
+ config = {}
17
21
  @failures = []
18
22
 
19
23
  # These are needed in process_erb for populating the newrelic.yml via
@@ -30,7 +34,7 @@ module NewRelic
30
34
  ::NewRelic::Agent.logger.info("Reading configuration from #{path} (#{Dir.pwd})")
31
35
  raw_file = File.read(@file_path)
32
36
  erb_file = process_erb(raw_file)
33
- config = process_yaml(erb_file, env, config, @file_path)
37
+ config = process_yaml(erb_file, env, config, @file_path)
34
38
  rescue ScriptError, StandardError => e
35
39
  log_failure("Failed to read or parse configuration file at #{path}", e)
36
40
  end
@@ -59,8 +63,8 @@ module NewRelic
59
63
  end
60
64
 
61
65
  def warn_missing_config_file(path)
62
- based_on = 'unknown'
63
- source = ::NewRelic::Agent.config.source(:config_path)
66
+ based_on = 'unknown'
67
+ source = ::NewRelic::Agent.config.source(:config_path)
64
68
  candidate_paths = [path]
65
69
 
66
70
  case source
@@ -99,7 +103,12 @@ module NewRelic
99
103
 
100
104
  def process_yaml(file, env, config, path)
101
105
  if file
102
- confighash = YAML.load(file)
106
+ confighash = if YAML.respond_to?(:unsafe_load)
107
+ YAML.unsafe_load(file)
108
+ else
109
+ YAML.load(file)
110
+ end
111
+
103
112
  unless confighash.key?(env)
104
113
  log_failure("Config file at #{path} doesn't include a '#{env}' section!")
105
114
  end
@@ -115,6 +124,8 @@ module NewRelic
115
124
  config['transaction_tracer']['transaction_threshold'].to_s =~ /apdex_f/i
116
125
  # when value is "apdex_f" remove the config and defer to default
117
126
  config['transaction_tracer'].delete('transaction_threshold')
127
+ elsif config['transaction_tracer.transaction_threshold'].to_s =~ /apdex_f/i
128
+ config.delete('transaction_tracer.transaction_threshold')
118
129
  end
119
130
  end
120
131
 
@@ -126,7 +137,7 @@ module NewRelic
126
137
  elsif !config[option].nil? && !is_boolean?(config[option])
127
138
  coerced_value = !!(config[option].to_s =~ /yes|on|true/i)
128
139
  if !coerced_value
129
- log_failure "Unexpected value (#{config[option]}) for '#{option}' in #{@path}"
140
+ log_failure("Unexpected value (#{config[option]}) for '#{option}' in #{@path}")
130
141
  end
131
142
  config[option] = coerced_value
132
143
  end
@@ -141,6 +152,19 @@ module NewRelic
141
152
  ::NewRelic::Agent.logger.error(*messages)
142
153
  messages.each { |message| @failures << message }
143
154
  end
155
+
156
+ def dot_flattened(nested_hash, names = [], result = {})
157
+ nested_hash.each do |key, val|
158
+ next if val.nil?
159
+
160
+ if val.respond_to?(:has_key?) && !CONFIG_WITH_HASH_VALUE.include?(key)
161
+ dot_flattened(val, names + [key], result)
162
+ else
163
+ result[(names + [key]).join('.')] = val
164
+ end
165
+ end
166
+ result
167
+ end
144
168
  end
145
169
  end
146
170
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/configuration/manager'
6
6
  require 'new_relic/agent/configuration/dotted_hash'
@@ -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/environment_report'
6
6
  require 'new_relic/agent/configuration/event_harvest_config'
@@ -8,9 +8,7 @@ require 'new_relic/agent/configuration/event_harvest_config'
8
8
  module NewRelic
9
9
  module Agent
10
10
  module Connect
11
-
12
11
  class RequestBuilder
13
-
14
12
  def initialize(new_relic_service, config, event_harvest_config, environment_report)
15
13
  @service = new_relic_service
16
14
  @config = config
@@ -18,38 +16,40 @@ module NewRelic
18
16
  @environment_report = sanitize_environment_report(environment_report)
19
17
  end
20
18
 
21
-
22
19
  # Initializes the hash of settings that we send to the
23
20
  # server. Returns a literal hash containing the options
24
21
  def connect_payload
25
22
  {
26
- :pid => $$,
27
- :host => local_host,
28
- :display_host => Agent.config[:'process_host.display_name'],
29
- :app_name => Agent.config[:app_name],
30
- :language => 'ruby',
31
- :labels => Agent.config.parsed_labels,
23
+ :pid => $$,
24
+ :host => local_host,
25
+ :display_host => Agent.config[:'process_host.display_name'],
26
+ :app_name => Agent.config[:app_name],
27
+ :language => 'ruby',
28
+ :labels => Agent.config.parsed_labels,
32
29
  :agent_version => NewRelic::VERSION::STRING,
33
- :environment => @environment_report,
34
- :metadata => environment_metadata,
35
- :settings => Agent.config.to_collector_hash,
30
+ :environment => @environment_report,
31
+ :metadata => environment_metadata,
32
+ :settings => Agent.config.to_collector_hash,
36
33
  :high_security => Agent.config[:high_security],
37
- :utilization => UtilizationData.new.to_collector_hash,
38
- :identifier => "ruby:#{local_host}:#{Agent.config[:app_name].sort.join(',')}",
34
+ :utilization => UtilizationData.new.to_collector_hash,
35
+ :identifier => "ruby:#{local_host}:#{Agent.config[:app_name].sort.join(',')}",
39
36
  :event_harvest_config => @event_harvest_config
40
37
  }
41
38
  end
42
39
 
43
40
  # We've seen objects in the environment report (Rails.env in
44
- # particular) that can't seralize to JSON. Cope with that here and
41
+ # particular) that can't serialize to JSON. Cope with that here and
45
42
  # clear out so downstream code doesn't have to check again.
46
43
  def sanitize_environment_report(environment_report)
47
- return [] unless @service.valid_to_marshal?(environment_report)
44
+ return NewRelic::EMPTY_ARRAY unless @service.valid_to_marshal?(environment_report)
45
+
48
46
  environment_report
49
47
  end
50
48
 
51
49
  def environment_metadata
52
- ENV.select {|k, v| k =~ /^NEW_RELIC_METADATA_/}
50
+ env_copy = {}
51
+ ENV.keys.each { |k| env_copy[k] = ENV[k] if k =~ /^NEW_RELIC_METADATA_/ }
52
+ env_copy
53
53
  end
54
54
 
55
55
  def local_host
@@ -1,14 +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.
4
-
3
+ # frozen_string_literal: true
5
4
 
6
5
  module NewRelic
7
6
  module Agent
8
7
  module Connect
9
-
10
8
  class ResponseHandler
11
-
12
9
  def initialize(agent, config)
13
10
  @agent = agent
14
11
  @config = config
@@ -22,7 +19,7 @@ module NewRelic
22
19
  # Can accommodate most arbitrary data - anything extra is
23
20
  # ignored unless we say to do something with it here.
24
21
  def configure_agent(config_data)
25
- return if config_data == nil
22
+ return if config_data.nil?
26
23
 
27
24
  @agent.agent_id = config_data['agent_run_id']
28
25
 
@@ -40,16 +37,16 @@ module NewRelic
40
37
 
41
38
  def add_server_side_config(config_data)
42
39
  if config_data['agent_config']
43
- ::NewRelic::Agent.logger.debug "Using config from server"
40
+ ::NewRelic::Agent.logger.debug("Using config from server")
44
41
  end
45
42
 
46
- ::NewRelic::Agent.logger.debug "Server provided config: #{config_data.inspect}"
43
+ ::NewRelic::Agent.logger.debug("Server provided config: #{config_data.inspect}")
47
44
  server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data, @config)
48
45
  @config.replace_or_add_config(server_config)
49
46
  end
50
47
 
51
48
  def add_security_policy_config(security_policies)
52
- ::NewRelic::Agent.logger.info 'Installing security policies'
49
+ ::NewRelic::Agent.logger.info('Installing security policies')
53
50
  security_policy_source = NewRelic::Agent::Configuration::SecurityPolicySource.new(security_policies)
54
51
  @config.replace_or_add_config(security_policy_source)
55
52
  # drop data collected before applying security policies
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/event_aggregator'
6
6
  require 'new_relic/agent/attribute_processing'
@@ -10,9 +10,9 @@ module NewRelic
10
10
  class CustomEventAggregator < EventAggregator
11
11
  include NewRelic::Coerce
12
12
 
13
- TYPE = 'type'.freeze
14
- TIMESTAMP = 'timestamp'.freeze
15
- PRIORITY = 'priority'.freeze
13
+ TYPE = 'type'.freeze
14
+ TIMESTAMP = 'timestamp'.freeze
15
+ PRIORITY = 'priority'.freeze
16
16
  EVENT_TYPE_REGEX = /^[a-zA-Z0-9:_ ]+$/.freeze
17
17
 
18
18
  named :CustomEventAggregator
@@ -20,7 +20,7 @@ module NewRelic
20
20
  enabled_key :'custom_insights_events.enabled'
21
21
 
22
22
  def record(type, attributes)
23
- unless attributes.is_a? Hash
23
+ unless attributes.is_a?(Hash)
24
24
  raise ArgumentError, "Expected Hash but got #{attributes.class}"
25
25
  end
26
26
 
@@ -46,9 +46,9 @@ module NewRelic
46
46
 
47
47
  def create_event(type, priority, attributes)
48
48
  [
49
- { TYPE => type, TIMESTAMP => Time.now.to_i,
50
- PRIORITY => priority
51
- },
49
+ {TYPE => type,
50
+ TIMESTAMP => Process.clock_gettime(Process::CLOCK_REALTIME).to_i,
51
+ PRIORITY => priority},
52
52
  AttributeProcessing.flatten_and_coerce(attributes)
53
53
  ]
54
54
  end
@@ -57,23 +57,23 @@ module NewRelic
57
57
  @type_strings = Hash.new { |hash, key| hash[key] = key.to_s.freeze }
58
58
  end
59
59
 
60
- def after_harvest metadata
60
+ def after_harvest(metadata)
61
61
  dropped_count = metadata[:seen] - metadata[:captured]
62
62
  note_dropped_events(metadata[:seen], dropped_count)
63
63
  record_supportability_metrics(metadata[:seen], metadata[:captured], dropped_count)
64
64
  end
65
65
 
66
- def note_dropped_events total_count, dropped_count
66
+ def note_dropped_events(total_count, dropped_count)
67
67
  if dropped_count > 0
68
68
  NewRelic::Agent.logger.warn("Dropped #{dropped_count} custom events out of #{total_count}.")
69
69
  end
70
70
  end
71
71
 
72
- def record_supportability_metrics total_count, captured_count, dropped_count
72
+ def record_supportability_metrics(total_count, captured_count, dropped_count)
73
73
  engine = NewRelic::Agent.instance.stats_engine
74
- engine.tl_record_supportability_metric_count("Events/Customer/Seen" , total_count)
75
- engine.tl_record_supportability_metric_count("Events/Customer/Sent" , captured_count)
76
- engine.tl_record_supportability_metric_count("Events/Customer/Dropped", dropped_count)
74
+ engine.tl_record_supportability_metric_count("Events/Customer/Seen", total_count)
75
+ engine.tl_record_supportability_metric_count("Events/Customer/Sent", captured_count)
76
+ engine.tl_record_supportability_metric_count("Events/Customer/Dropped", dropped_count)
77
77
  end
78
78
 
79
79
  def note_dropped_event(type)