newrelic_rpm 7.0.0 → 8.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (320) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -1
  3. data/.rubocop.yml +1941 -0
  4. data/.yardopts +1 -0
  5. data/Brewfile +10 -0
  6. data/CHANGELOG.md +431 -1
  7. data/CONTRIBUTING.md +32 -5
  8. data/DOCKER.md +167 -0
  9. data/Dockerfile +10 -0
  10. data/Guardfile +8 -8
  11. data/LICENSE +0 -6
  12. data/README.md +20 -18
  13. data/Rakefile +39 -29
  14. data/THIRD_PARTY_NOTICES.md +14 -199
  15. data/bin/mongrel_rpm +8 -9
  16. data/bin/newrelic +1 -1
  17. data/bin/nrdebug +14 -14
  18. data/docker-compose.yml +85 -0
  19. data/init.rb +0 -2
  20. data/lefthook.yml +9 -0
  21. data/lib/new_relic/agent/adaptive_sampler.rb +9 -5
  22. data/lib/new_relic/agent/agent.rb +72 -49
  23. data/lib/new_relic/agent/agent_logger.rb +15 -9
  24. data/lib/new_relic/agent/attribute_filter.rb +31 -31
  25. data/lib/new_relic/agent/attributes.rb +2 -2
  26. data/lib/new_relic/agent/audit_logger.rb +4 -0
  27. data/lib/new_relic/agent/autostart.rb +19 -17
  28. data/lib/new_relic/agent/commands/agent_command.rb +2 -2
  29. data/lib/new_relic/agent/commands/agent_command_router.rb +6 -5
  30. data/lib/new_relic/agent/commands/thread_profiler_session.rb +7 -6
  31. data/lib/new_relic/agent/configuration/default_source.rb +731 -476
  32. data/lib/new_relic/agent/configuration/dotted_hash.rb +3 -3
  33. data/lib/new_relic/agent/configuration/environment_source.rb +5 -4
  34. data/lib/new_relic/agent/configuration/event_harvest_config.rb +39 -16
  35. data/lib/new_relic/agent/configuration/high_security_source.rb +7 -7
  36. data/lib/new_relic/agent/configuration/manager.rb +74 -64
  37. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  38. data/lib/new_relic/agent/configuration/security_policy_source.rb +73 -73
  39. data/lib/new_relic/agent/configuration/server_source.rb +14 -12
  40. data/lib/new_relic/agent/configuration/yaml_source.rb +26 -5
  41. data/lib/new_relic/agent/connect/request_builder.rb +14 -15
  42. data/lib/new_relic/agent/connect/response_handler.rb +0 -3
  43. data/lib/new_relic/agent/custom_event_aggregator.rb +9 -9
  44. data/lib/new_relic/agent/database/explain_plan_helpers.rb +3 -4
  45. data/lib/new_relic/agent/database/obfuscation_helpers.rb +12 -12
  46. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +2 -2
  47. data/lib/new_relic/agent/database.rb +30 -31
  48. data/lib/new_relic/agent/datastores/metric_helper.rb +13 -11
  49. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -3
  50. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +3 -5
  51. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +1 -2
  52. data/lib/new_relic/agent/datastores/mongo.rb +5 -10
  53. data/lib/new_relic/agent/datastores/redis.rb +2 -4
  54. data/lib/new_relic/agent/datastores.rb +7 -9
  55. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +9 -9
  56. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +21 -16
  57. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -12
  58. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +42 -43
  59. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +3 -3
  60. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +41 -43
  61. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +25 -25
  62. data/lib/new_relic/agent/distributed_tracing.rb +17 -18
  63. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  64. data/lib/new_relic/agent/error_collector.rb +65 -50
  65. data/lib/new_relic/agent/error_event_aggregator.rb +1 -1
  66. data/lib/new_relic/agent/error_filter.rb +173 -0
  67. data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
  68. data/lib/new_relic/agent/event_aggregator.rb +1 -1
  69. data/lib/new_relic/agent/event_buffer.rb +6 -7
  70. data/lib/new_relic/agent/event_listener.rb +0 -1
  71. data/lib/new_relic/agent/event_loop.rb +14 -14
  72. data/lib/new_relic/agent/external.rb +1 -34
  73. data/lib/new_relic/agent/guid_generator.rb +2 -9
  74. data/lib/new_relic/agent/harvester.rb +3 -4
  75. data/lib/new_relic/agent/heap.rb +1 -3
  76. data/lib/new_relic/agent/hostname.rb +16 -10
  77. data/lib/new_relic/agent/http_clients/abstract.rb +7 -9
  78. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +1 -5
  79. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
  80. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +3 -3
  81. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
  82. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -3
  83. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +2 -3
  84. data/lib/new_relic/agent/http_clients/uri_util.rb +0 -1
  85. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +2 -3
  86. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +28 -26
  87. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +5 -7
  88. data/lib/new_relic/agent/instrumentation/active_job.rb +12 -5
  89. data/lib/new_relic/agent/instrumentation/active_merchant.rb +17 -3
  90. data/lib/new_relic/agent/instrumentation/active_record.rb +20 -18
  91. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +56 -46
  92. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +28 -25
  93. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +3 -3
  94. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +22 -16
  95. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  96. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  97. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  98. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  99. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  100. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +18 -9
  101. data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -0
  102. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +1 -1
  103. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +8 -9
  104. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +52 -46
  105. data/lib/new_relic/agent/instrumentation/curb/chain.rb +20 -21
  106. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +34 -38
  107. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +10 -11
  108. data/lib/new_relic/agent/instrumentation/data_mapper.rb +22 -10
  109. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +5 -7
  110. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +5 -9
  111. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +23 -4
  112. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -2
  113. data/lib/new_relic/agent/instrumentation/excon.rb +3 -23
  114. data/lib/new_relic/agent/instrumentation/grape/chain.rb +1 -2
  115. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +6 -7
  116. data/lib/new_relic/agent/instrumentation/grape.rb +2 -3
  117. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +2 -3
  118. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +0 -1
  119. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +0 -2
  120. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +2 -2
  121. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +6 -6
  122. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -1
  123. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -3
  124. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  125. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +58 -0
  126. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  127. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  128. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -2
  129. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +5 -1
  130. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +9 -2
  131. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +9 -10
  132. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -6
  133. data/lib/new_relic/agent/instrumentation/mongo.rb +3 -141
  134. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +4 -4
  135. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +3 -4
  136. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -5
  137. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +4 -4
  138. data/lib/new_relic/agent/instrumentation/net_http.rb +7 -2
  139. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +2 -3
  140. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +23 -19
  141. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +3 -2
  142. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +2 -2
  143. data/lib/new_relic/agent/instrumentation/padrino.rb +2 -5
  144. data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -8
  145. data/lib/new_relic/agent/instrumentation/rack/chain.rb +8 -7
  146. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +2 -1
  147. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +4 -5
  148. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +2 -2
  149. data/lib/new_relic/agent/instrumentation/rack.rb +1 -1
  150. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +11 -47
  151. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +2 -2
  152. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +0 -1
  153. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +11 -0
  154. data/lib/new_relic/agent/instrumentation/rake/chain.rb +0 -5
  155. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -6
  156. data/lib/new_relic/agent/instrumentation/rake.rb +1 -1
  157. data/lib/new_relic/agent/instrumentation/redis/chain.rb +6 -6
  158. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +2 -2
  159. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +1 -1
  160. data/lib/new_relic/agent/instrumentation/redis.rb +5 -1
  161. data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -3
  162. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  163. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +9 -7
  164. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -2
  165. data/lib/new_relic/agent/instrumentation/resque.rb +17 -8
  166. data/lib/new_relic/agent/instrumentation/sequel.rb +7 -9
  167. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  168. data/lib/new_relic/agent/instrumentation/sidekiq.rb +22 -1
  169. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +0 -1
  170. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +12 -5
  171. data/lib/new_relic/agent/instrumentation/sinatra.rb +21 -11
  172. data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -1
  173. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  174. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +27 -0
  175. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  176. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  177. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  178. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +40 -0
  179. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  180. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  181. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +4 -4
  182. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +3 -5
  183. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -1
  184. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  185. data/lib/new_relic/agent/javascript_instrumentor.rb +38 -33
  186. data/lib/new_relic/agent/linking_metadata.rb +45 -0
  187. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  188. data/lib/new_relic/agent/log_event_aggregator.rb +234 -0
  189. data/lib/new_relic/agent/log_priority.rb +20 -0
  190. data/lib/new_relic/agent/logging.rb +11 -8
  191. data/lib/new_relic/agent/memory_logger.rb +1 -1
  192. data/lib/new_relic/agent/messaging.rb +46 -62
  193. data/lib/new_relic/agent/method_tracer.rb +145 -144
  194. data/lib/new_relic/agent/method_tracer_helpers.rb +82 -2
  195. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +21 -13
  196. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +2 -2
  197. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +0 -1
  198. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +4 -7
  199. data/lib/new_relic/agent/monitors.rb +1 -2
  200. data/lib/new_relic/agent/new_relic_service/encoders.rb +4 -4
  201. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
  202. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
  203. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -3
  204. data/lib/new_relic/agent/new_relic_service.rb +61 -53
  205. data/lib/new_relic/agent/noticible_error.rb +0 -2
  206. data/lib/new_relic/agent/null_logger.rb +6 -2
  207. data/lib/new_relic/agent/obfuscator.rb +6 -8
  208. data/lib/new_relic/agent/parameter_filtering.rb +16 -8
  209. data/lib/new_relic/agent/payload_metric_mapping.rb +8 -9
  210. data/lib/new_relic/agent/pipe_channel_manager.rb +15 -12
  211. data/lib/new_relic/agent/pipe_service.rb +6 -3
  212. data/lib/new_relic/agent/priority_sampled_buffer.rb +4 -7
  213. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +9 -9
  214. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -12
  215. data/lib/new_relic/agent/rules_engine.rb +2 -2
  216. data/lib/new_relic/agent/sampler.rb +2 -3
  217. data/lib/new_relic/agent/sampler_collection.rb +2 -3
  218. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  219. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +10 -7
  220. data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -3
  221. data/lib/new_relic/agent/samplers/vm_sampler.rb +18 -18
  222. data/lib/new_relic/agent/span_event_aggregator.rb +10 -10
  223. data/lib/new_relic/agent/span_event_primitive.rb +48 -45
  224. data/lib/new_relic/agent/sql_sampler.rb +9 -9
  225. data/lib/new_relic/agent/stats.rb +62 -37
  226. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +7 -9
  227. data/lib/new_relic/agent/stats_engine/stats_hash.rb +8 -9
  228. data/lib/new_relic/agent/stats_engine.rb +7 -7
  229. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -2
  230. data/lib/new_relic/agent/system_info.rb +22 -20
  231. data/lib/new_relic/agent/threading/agent_thread.rb +4 -5
  232. data/lib/new_relic/agent/threading/backtrace_node.rb +6 -9
  233. data/lib/new_relic/agent/threading/backtrace_service.rb +12 -13
  234. data/lib/new_relic/agent/threading/thread_profile.rb +16 -19
  235. data/lib/new_relic/agent/tracer.rb +57 -72
  236. data/lib/new_relic/agent/transaction/abstract_segment.rb +38 -10
  237. data/lib/new_relic/agent/transaction/datastore_segment.rb +7 -6
  238. data/lib/new_relic/agent/transaction/distributed_tracer.rb +8 -9
  239. data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -22
  240. data/lib/new_relic/agent/transaction/external_request_segment.rb +6 -5
  241. data/lib/new_relic/agent/transaction/message_broker_segment.rb +24 -30
  242. data/lib/new_relic/agent/transaction/request_attributes.rb +7 -7
  243. data/lib/new_relic/agent/transaction/segment.rb +6 -3
  244. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +0 -2
  245. data/lib/new_relic/agent/transaction/trace.rb +8 -8
  246. data/lib/new_relic/agent/transaction/trace_context.rb +14 -16
  247. data/lib/new_relic/agent/transaction/trace_node.rb +16 -16
  248. data/lib/new_relic/agent/transaction/tracing.rb +9 -6
  249. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -2
  250. data/lib/new_relic/agent/transaction.rb +132 -119
  251. data/lib/new_relic/agent/transaction_error_primitive.rb +18 -16
  252. data/lib/new_relic/agent/transaction_event_aggregator.rb +7 -8
  253. data/lib/new_relic/agent/transaction_event_primitive.rb +29 -29
  254. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
  255. data/lib/new_relic/agent/transaction_metrics.rb +8 -7
  256. data/lib/new_relic/agent/transaction_sampler.rb +0 -1
  257. data/lib/new_relic/agent/transaction_time_aggregator.rb +11 -11
  258. data/lib/new_relic/agent/utilization/aws.rb +32 -2
  259. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  260. data/lib/new_relic/agent/utilization/vendor.rb +15 -2
  261. data/lib/new_relic/agent/utilization_data.rb +3 -4
  262. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  263. data/lib/new_relic/agent/vm/mri_vm.rb +13 -1
  264. data/lib/new_relic/agent/vm/snapshot.rb +4 -4
  265. data/lib/new_relic/agent/worker_loop.rb +8 -10
  266. data/lib/new_relic/agent.rb +36 -41
  267. data/lib/new_relic/cli/command.rb +15 -17
  268. data/lib/new_relic/cli/commands/deployments.rb +21 -23
  269. data/lib/new_relic/cli/commands/install.rb +6 -10
  270. data/lib/new_relic/coerce.rb +5 -8
  271. data/lib/new_relic/collection_helper.rb +48 -47
  272. data/lib/new_relic/constants.rb +0 -4
  273. data/lib/new_relic/control/class_methods.rb +2 -2
  274. data/lib/new_relic/control/frameworks/external.rb +1 -1
  275. data/lib/new_relic/control/frameworks/rails.rb +5 -6
  276. data/lib/new_relic/control/frameworks/rails3.rb +2 -3
  277. data/lib/new_relic/control/frameworks/ruby.rb +2 -2
  278. data/lib/new_relic/control/frameworks/sinatra.rb +6 -0
  279. data/lib/new_relic/control/instance_methods.rb +4 -5
  280. data/lib/new_relic/control/instrumentation.rb +35 -5
  281. data/lib/new_relic/control/server_methods.rb +2 -3
  282. data/lib/new_relic/control.rb +0 -1
  283. data/lib/new_relic/dependency_detection.rb +7 -9
  284. data/lib/new_relic/environment_report.rb +16 -18
  285. data/lib/new_relic/helper.rb +45 -5
  286. data/lib/new_relic/language_support.rb +20 -2
  287. data/lib/new_relic/latest_changes.rb +2 -2
  288. data/lib/new_relic/local_environment.rb +9 -7
  289. data/lib/new_relic/metric_data.rb +6 -7
  290. data/lib/new_relic/metric_spec.rb +3 -3
  291. data/lib/new_relic/noticed_error.rb +18 -19
  292. data/lib/new_relic/rack/agent_middleware.rb +2 -2
  293. data/lib/new_relic/rack/browser_monitoring.rb +9 -9
  294. data/lib/new_relic/recipes/capistrano3.rb +11 -13
  295. data/lib/new_relic/recipes/capistrano_legacy.rb +11 -14
  296. data/lib/new_relic/supportability_helper.rb +2 -2
  297. data/lib/new_relic/traced_thread.rb +35 -0
  298. data/lib/new_relic/version.rb +5 -16
  299. data/lib/newrelic_rpm.rb +10 -34
  300. data/lib/sequel/extensions/newrelic_instrumentation.rb +4 -7
  301. data/lib/sequel/plugins/newrelic_instrumentation.rb +3 -9
  302. data/lib/tasks/all.rb +2 -2
  303. data/lib/tasks/config.html.erb +14 -25
  304. data/lib/tasks/config.rake +36 -27
  305. data/lib/tasks/multiverse.rb +4 -6
  306. data/lib/tasks/tests.rake +3 -7
  307. data/newrelic.yml +610 -3
  308. data/newrelic_rpm.gemspec +14 -14
  309. data/recipes/newrelic.rb +1 -1
  310. data/test/agent_helper.rb +98 -59
  311. metadata +69 -20
  312. data/ROADMAP.md +0 -24
  313. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  314. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
  315. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  316. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  317. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  318. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  319. data/lib/new_relic/agent/supported_versions.rb +0 -275
  320. data/lib/new_relic/control/frameworks/merb.rb +0 -29
@@ -1,8 +1,8 @@
1
1
  # Third Party Notices
2
2
 
3
- The New Relic Ruby Agent uses source code from third party libraries which carry
4
- their own copyright notices and license terms. These notices are provided
5
- below.
3
+ The New Relic Ruby agent may make use of source code from third party libraries
4
+ which carry their own copyright notices and license terms. Any such content will
5
+ be provided below.
6
6
 
7
7
  In the event that a required notice is missing or incorrect, please notify us
8
8
  by e-mailing [open-source@newrelic.com](mailto:open-source@newrelic.com).
@@ -11,203 +11,18 @@ For any licenses that require the disclosure of source
11
11
  code, the source code can be found at:
12
12
  [https://github.com/newrelic/newrelic-ruby-agent](https://github.com/newrelic/newrelic-ruby-agent).
13
13
 
14
- ## Content
15
14
 
16
- * [symantec](#symantec)
15
+ ## Current Notices and Terms
17
16
 
18
- ### symantec
17
+ As of version 7.0 (released April 23, 2021), the New Relic Ruby agent does not
18
+ include any third party software with its distribution.
19
19
 
20
- This product includes certificates from Symantec which are used under the
21
- following license (https://docs.broadcom.com/doc/root-certificate-license-agreement-en):
20
+ The Ruby agent team leverages a variety of open source third party software for
21
+ the development of the agent but not distributed with the agent. Some of these
22
+ software packages are referenced as development dependencies in the agent's
23
+ [newrelic_rpm.gemspec](newrelic_rpm.gemspec) file. We are grateful
24
+ to the maintainers and contributors for all of these packages.
22
25
 
23
- ```
24
- ROOT CERTIFICATE LICENSE AGREEMENT
25
- SYMANTEC CORPORATION AND/OR ITS AFFILIATES (“SYMANTEC”) IS WILLING TO PROVIDE THE
26
- ROOT CERTIFICATES TO YOU AS THE INDIVIDUAL, THE COMPANY, OR THE LEGAL ENTITY THAT
27
- WILL BE UTILIZING THE ROOT CERTIFICATES (REFERENCED BELOW AS “YOU” OR “YOUR”)
28
- ONLY ON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS OF THIS AGREEMENT
29
- (“AGREEMENT”). READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY
30
- BEFORE USING THE ROOT CERTIFICATES. THIS IS A LEGAL AND ENFORCEABLE CONTRACT
31
- BETWEEN YOU AND SYMANTEC. BY USING THE ROOT CERTIFICATES, YOU AGREE TO THE
32
- TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THESE TERMS AND
33
- CONDITIONS, MAKE NO FURTHER USE OF THE ROOT CERTIFICATES. UNLESS OTHERWISE
34
- DEFINED HEREIN, CAPITALIZED TERMS WILL HAVE THE MEANING GIVEN IN THE “DEFINITIONS”
35
- SECTION OF THIS AGREEMENT AND SUCH CAPITALIZED TERMS MAY BE USED IN THE
36
- SINGULAR OR IN THE PLURAL, AS THE CONTEXT REQUIRES.
37
-
38
- ROOT CERTIFICATE TERMS AND CONDITIONS
39
- 1. DEFINITIONS.
40
- "Certificate" means an electronic file that, at least, states a name or identifies the issuing Certificate
41
- Authority, identifies the subscriber, contains the subscriber's public key, identifies the Certificate's
42
- operational period, contains a Certificate serial number, and contains a digital signature of the issuing
43
- Certificate Authority.
44
- “Certificate Authority” or “CA” means a person or entity authorized to issue, suspend, or revoke
45
- Certificates.
46
- “Intermediate CA” means a CA Certificate signed by a Root Certificate Intermediate that issues
47
- Certificates either to end-entities or other Certificate Authorities, but not to both.
48
- "Products" means all versions of Your product or service with which the Root Certificates are incorporated
49
- (including successor products and services or any major or minor upgrades thereto).
50
- "Root Certificate" means a self-signed Certificate issued by a top-level Certificate Authority to itself, which
51
- includes such Certificate Authority's public key. The Root Certificates and Root Certificate files to be
52
- provided by Company to Customer pursuant to this Agreement are available for download at
53
- https://www.verisign.com/support/roots.html, https://www.thawte.com/roots/index.html or
54
- https://www.geotrust.com/resources/rootcertificates/index.html.
55
- 2. LICENSE. During the term of this Agreement, Symantec grants You a royalty-free, non-exclusive, nontransferable license to (a) use the Root Certificate for the purposes of testing (without the right to modify);
56
- (b) make copies of Root Certificates only in order to embed and incorporate them, unmodified and in full,
57
- as roots in Your Products; (c) distribute the Root Certificates as embedded and incorporated in such
58
- Products; and (d) use the relevant logos and trademarks of Symantec in Your marketing materials,
59
- advertisements, product data sheets, product packaging and websites solely conjunction with the
60
- distribution of the Root Certificates in accordance with Symantec’s published guidelines for such usage.
61
- You shall not have the right to further distribute the Root Certificates other than as described herein
62
- without an additional license grant, in a separate writing, from Symantec.
63
- 3. RESTRICTIONS. You may not: (a) modify or create any derivative works of Root Certificates; (b)
64
- assign, sublicense, sell, rent, or lease Symantec's root keys or Root Certificates; (c) use such Root
65
- Certificates except as expressly permitted under this Agreement; (d) remove or alter any trademark, logo,
66
- copyright, or other proprietary notices, legends, symbols, or labels provided in the Root Certificates; or (e)
67
- certify, or cause a third party to certify, the public key contained in the Root Certificates by issuing or
68
- creating a Certificate containing such public key.
69
- 4. CUSTOMER’S OBLIGATIONS.
70
- 4.1. During the term of this Agreement, You shall use commercially reasonable efforts regularly check the
71
- applicable Symantec URL for updates to the Root Certificates and update Root Certificates embedded
72
- into Your Products with the most currently available Root Certificates, unmodified and in full, or as a patch
73
- or update. If Symantec updates its Root Certificates,, You shall use commercially reasonable efforts to (i)
74
- discontinue all copying and use of the Root Certificates which have been replaced, and (ii) to use
75
- Symantec’s then-current Root Certificates. Any updates to the Root Certificates are incorporated into and
76
- subject to the terms of this Agreement.
77
- 4.2. You shall appoint at least one (1) individual as the administrative contact designated to address any
78
- Root Certificate issues and shall provide the contact information for such individual to dl-tssroot@symantec.com.
79
- 4.3 In the event You become aware of or suspect any event that diminishes the integrity of Symantec's
80
- data or public key system ("Compromise"), You shall immediately notify Symantec at dl-tss-
81
- root@symantec.com of such Compromise, and take reasonable steps to assist and cooperate with
82
- Symantec to remedy the Compromise.
83
- 4.4 In the event that Symantec modifies these terms of use for the Root certificates for all end users,
84
- Symantec shall post the modified terms for the Agreement on the applicable URL and may post the
85
- modified terms on the Symantec corporate website. You shall be responsible for regularly checking the
86
- applicable URL for modifications to this Agreement. Such modifications shall be effective and binding on
87
- Customer within thirty (30) days of Symantec’s posting such modifications to its website. If you do not
88
- accept the modified Agreement, discontinue use of the Root Certificates and this Agreement will be
89
- deemed as terminated.
90
- 5. CONFIDENTIALITY.
91
- 5.1. Confidential Information. "Confidential Information" means the root private keys corresponding to the
92
- public key in a Root Certificate, and any confidential, trade secret, or other proprietary information
93
- disclosed by a party to the other party under this Agreement, except for Information that: (i) is public
94
- knowledge at the time of disclosure, (ii) was known by the receiving party before disclosure by the
95
- disclosing party, or becomes public knowledge or otherwise known to the receiving party after such
96
- disclosure, other than by breach of a confidentiality obligation, or (iii) is independently developed by the
97
- receiving party by persons without access to Confidential Information of the disclosing party.
98
- 5.2. Protection of Confidential Information. The receiving party shall: (i) not disclose the Confidential
99
- information to any third party, (ii) not use the Confidential Information except for purposes of performing
100
- this Agreement, and (iii) take steps consistent with its protection of its own confidential and proprietary
101
- information (but in no event exercise less than reasonable care) to prevent unauthorized disclosure of the
102
- Confidential Information. Each party acknowledges that breach of this Section 5 may cause irreparable
103
- harm to the disclosing party entitling the disclosing party to injunctive relief, among other remedies.
104
- 5.3. Mutual Cooperation. Each party will notify and cooperate with the other party in enforcing the
105
- disclosing party's rights if such party becomes aware of a threatened or actual violation of the
106
- confidentiality requirements of this Section 5. Each party shall have confidentiality agreements with its
107
- employees, agents or independent contractors sufficient in scope to fulfill its confidentiality obligations
108
- under this Agreement.
109
- 6. INTELLECTUAL PROPERTY. You acknowledge that Symantec, including its wholly owned
110
- subsidiaries, retains all intellectual property rights and title (including any patent, copyright, trademark,
111
- trade secret, and other rights) in and to the Root Certificates, the public and private keys corresponding to
112
- such Root Certificates ("Symantec Intellectual Property"). This Agreement does not give You any
113
- intellectual property rights in the Symantec intellectual property except for the license granted in Section
114
- 2. To the extent You use Symantec's trademarks or logos as permitted herein, You agree to comply with
115
- all usage requirements set forth in the then current version of Symantec's Logo and Trademark Usage
116
- Guide (http://www.symantec.com/about/profile/policies/trademarks.jsp) and any other guides and
117
- procedures of Symantec.
118
- 7. NO WARRANTIES. THE ROOT CERTIFICATES, INCLUDING UPDATES, ARE PROVIDED "AS IS"
119
- WITHOUT ANY WARRANTY WHATSOEVER. SYMANTEC HEREBY DISCLAIMS ALL WARRANTIES,
120
- WHETHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING WITHOUT LIMITATION, ANY
121
- IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
122
- NONINFRINGEMENT OF THIRD PARTY RIGHTS.
123
- 8. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY WILL
124
- SYMANTEC OR ITS LICENSORS BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
125
- CONSEQUENTIAL, INDIRECT, SPECIAL, INCIDENTAL, OR EXEMPLARY DAMAGES, WHETHER
126
- FORESEEABLE OR UNFORESEEABLE, EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE
127
- POSSIBILITY OF SUCH DAMAGES. YOU WILL TAKE REASONABLE MEASURES TO INSURE THAT
128
- THE TERMS AND CONDITIONS SET FORTH IN THE PRECEDING SENTENCE OF THIS SECTION 8
129
- ARE INCORPORATED INTO ANY AGREEMENT BETWEEN YOU AND YOUR CUSTOMERS OR
130
- LICENSEES. SYMANTEC SHALL NOT BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
131
- DAMAGES CAUSED BY YOUR OR A THIRD PARTY’S CONTINUED USE OF ANY OUTDATED
132
- ROOTS FOR WHICH AN UPDATED VERSION IS MADE AVAILABLE BY SYMANTEC. FURTHER,
133
- UNDER NO CIRCUMSTANCES WILL SYMANTEC'S LIABILITY FOR ANY ACTION OR CLAIM EXCEED
134
- USD$1,000, REGARDLESS OF WHETHER SUCH ACTION OR CLAIM IS BASED IN CONTRACT,
135
- TORT, STRICT LIABILITY, OR OTHERWISE.
136
- 9. TERM AND TERMINATION.
137
- 9.1. Term. This Agreement shall become effective as of the earlier of, Your first use of the Root
138
- Certificates, and shall remain in effect until the earlier of (i) Your discontinued use of the Root Certificates;
139
- (ii) termination by either party under the terms of Section 9.2, below; or (iii) Symantec’s notice to You that
140
- Symantec is no longer providing Root Certificates for use.
141
- 9.2. Termination for Default/Insolvency. Either party shall be entitled to terminate this Agreement in the
142
- event of a failure by the other party to perform any of its material obligations under this Agreement if such
143
- breach is not cured within thirty (30) days after receipt of written notice thereof from the non-defaulting
144
- party or within forty-eight (48) hours after receipt of such written notice if a breach by You may
145
- compromise the security of the Symantec Trust Network or other system. This Agreement shall terminate
146
- upon the election of and notice from a party to the other if the other party is adjudged insolvent or
147
- bankrupt, or the institution of any proceedings by or against the other party seeking relief, reorganization,
148
- or arrangement under any laws relating to insolvency, or any assignment for the benefit of creditors, or
149
- the appointment of a receiver, liquidator, or trustee of any of the other party's property or assets, or the
150
- liquidation, dissolution, or winding up of the other party's business.
151
- 9.3. Effect of Expiration or Termination. Upon expiration or termination of this Agreement, except for a
152
- breach by You, You may continue to distribute the current version of Your Products which incorporate the
153
- Root Certificates. Any updates or upgrades thereto may not include the Root Certificates and You shall
154
- stop making copies of Root Certificates, shall stop including Root Certificates in Your Products, and shall
155
- stop using Symantec’s logos and trademarks. The provisions of Sections 3, 4.3, 5, 6, 7, 8, 9.3, and 10
156
- shall survive termination of this Agreement.
157
- 10. GENERAL.
158
- 10.1. Governing Laws. This Agreement and any disputes relating to the services provided hereunder shall
159
- be governed and interpreted according to each of the following laws, respectively, without regard to its
160
- conflicts of law provisions: (a) the laws of the State of California, if You are located in North America or
161
- Latin America; or (b) the law of England, if You are located in Europe, Middle East or Africa; or (c) the
162
- laws of Singapore, if You are located in Asia Pacific including Japan. The United Nations Convention on
163
- Contracts for the International Sale of Goods shall not apply to this Agreement.
164
- 10.2. Binding Upon Successors; Assignment. This Agreement shall be binding upon, and inure to the
165
- benefit of, the successors, executors, heirs, representatives, administrators, and assigns of the parties
166
- hereto. Notwithstanding the foregoing, You may not assign Your rights or obligations under this
167
- Agreement without the prior written consent of Symantec. Any such purported assignment of this
168
- Agreement without obtaining written consent shall be void and of no effect.
169
- 10.3. Severability; Enforcement; No Waiver. The unenforceability of any provision or provisions of this
170
- Agreement shall not impair the enforceability of any other part of this Agreement. If any provision of this
171
- Agreement shall be deemed invalid or unenforceable, in whole or in part, this Agreement shall be deemed
172
- amended to delete or modify, as necessary, the invalid or unenforceable provision to render it valid,
173
- enforceable, and, insofar as possible, consistent with the original intent of the parties. The failure of a
174
- party, at any time or from time to time, to require performance of any obligations of the other party
175
- hereunder shall not be deemed a waiver and shall not affect its right to enforce any provision of this
176
- Agreement at a subsequent time.
177
- 10.4. Entire Agreement; Amendments; Waivers. This Agreement constitutes the entire understanding and
178
- agreement of the parties, whether written or oral, with respect to the subject matter hereof and supersede
179
- all prior and contemporaneous agreements or understandings between the parties. Any term or provision
180
- of this Agreement may be amended, and the observance of any term of this Agreement may be waived,
181
- only by writing signed by the parties to be bound thereby.
182
- 10.5. Compliance with Law, Export Requirements and Foreign Reshipment Liability. Each party shall
183
- comply with all applicable federal, state and local laws and regulations in connection with its performance
184
- under this Agreement. Services, including documentation, may include controlled technology or technical
185
- data (collectively “Controlled Technology”) that is subject to the U.S. Export Administration Regulations
186
- (EAR), and diversion contrary to U.S. law is prohibited. You agree to comply with all relevant laws
187
- including the U.S. EAR and the laws of any country from which Controlled Technology is exported. All
188
- Controlled Technology is prohibited for export or re-export to Cuba, North Korea, Iran, Sudan and Syria
189
- and to any country or its nationals subject to relevant embargo or sanction or to any entity or person for
190
- which an export license is required per any relevant restricted party list, without first obtaining a license.
191
- Furthermore, You hereby agree that You will not use or allow use of Controlled Technology in connection
192
- with chemical, biological, or nuclear weapons, or missiles, drones or space launch vehicles capable of
193
- delivering such weapons. Symantec shall have the right to suspend performance of any of its obligations
194
- under this Agreement, without any prior notice being required and without any liability to Customer, if You
195
- fail to comply with this provision.
196
- 10.6. Notices. You will make all notices, demands or requests to Symantec with respect to this Agreement
197
- in writing to the "Contact" address listed on the website from where you downloaded the Root Certificates,
198
- with a copy to: General Counsel – Legal Department, Symantec Corporation, 350 Ellis Street, Mountain
199
- View, California 94043, USA. Notices shall be effective on the date received (unless the notice specifies a
200
- later date) only if it is sent by a courier service that confirms delivery in writing or if sent by certified or
201
- registered mail, postage prepaid, return receipt requested. Symantec may post notices and updates
202
- regarding the Agreement or the Root Certificates at the URL provided to You for the Root Certificates.
203
- You shall be responsible for regularly checking the applicable URL for notices from Symantec regarding
204
- the Agreement or the Root Certificates. No notices, demands, or requests to Symantec with respect to
205
- this Agreement may be delivered by electronic mail. You shall immediately notify Symantec of any legal
206
- notices served on You that might affect Symantec, and shall promptly forward the original or a copy of
207
- such notice to Symantec.
208
- 10.7. Independent Parties. The relationship between You and Symantec is that of independent
209
- contractors. Neither party nor its employees, consultants, contractors, or agents are agents, employees,
210
- or joint venturers of the other party, nor do they have any authority to bind the other party by contract or
211
- otherwise to any obligation.
212
- Root Certificate License Agreement v3.0 (January 2014)
213
- ```
26
+ For versions older than 7.0, please consult the `THIRD_PARTY_NOTICES.md`
27
+ document distributed with the agent. Any version of the agent not containing
28
+ that document are not thought to include any third party software.
data/bin/mongrel_rpm CHANGED
@@ -5,14 +5,14 @@ require 'rack/handler/mongrel'
5
5
  require 'optparse'
6
6
 
7
7
  port = 3000
8
- options = { }
8
+ options = {}
9
9
  appname = nil
10
10
  OptionParser.new do |opts|
11
11
  opts.banner = "Usage: #{File.basename($0)} [options] [app_name]"
12
- opts.on("-p", "--port=port", Integer, "default: #{port}") { | port | }
13
- opts.on("--[no-]logging", "turn off request logging" ) { | l | options[:logging] = l }
14
- opts.on("--license=license_key", "override license key" ) { | l | options[:license_key] = l }
15
- opts.on("--install", "install a newrelic.yml template" ) { | l | options[:install] = true }
12
+ opts.on("-p", "--port=port", Integer, "default: #{port}") { |port| }
13
+ opts.on("--[no-]logging", "turn off request logging") { |l| options[:logging] = l }
14
+ opts.on("--license=license_key", "override license key") { |l| options[:license_key] = l }
15
+ opts.on("--install", "install a newrelic.yml template") { |l| options[:install] = true }
16
16
  opts.separator ""
17
17
  opts.separator "app_name is the name of the application where the metrics will be stored"
18
18
  opts.separator ""
@@ -26,8 +26,7 @@ ru_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "new_r
26
26
  rackup_code = File.read ru_file
27
27
  builder = Rack::Builder.new { eval rackup_code, binding, ru_file }
28
28
 
29
- options = { :Host => '127.0.0.1', :Port => port }
30
- Rack::Handler::Mongrel.run(builder.to_app, options) do | server |
31
- NewRelic::Agent.logger.info "Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}"
29
+ options = {:Host => '127.0.0.1', :Port => port}
30
+ Rack::Handler::Mongrel.run(builder.to_app, options) do |server|
31
+ NewRelic::Agent.logger.info "Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}"
32
32
  end
33
-
data/bin/newrelic CHANGED
@@ -2,7 +2,7 @@
2
2
  # executes one of the commands in the new_relic/commands directory
3
3
  # pass the name of the command as an argument
4
4
 
5
- $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..','lib'))
5
+ $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
6
6
  require 'new_relic/cli/command'
7
7
  begin
8
8
  NewRelic::Cli::Command.run
data/bin/nrdebug CHANGED
@@ -7,7 +7,7 @@
7
7
  require 'tempfile'
8
8
  require 'rbconfig'
9
9
 
10
- def fail(msg, opts={})
10
+ def fail(msg, opts = {})
11
11
  $stderr.puts(msg)
12
12
  usage() if opts[:usage]
13
13
  exit(-1)
@@ -84,7 +84,7 @@ class ProcessDataProvider
84
84
 
85
85
  def self.for_process(pid)
86
86
  case RbConfig::CONFIG['target_os']
87
- when /linux/ then LinuxProcessDataProvider.new(pid)
87
+ when /linux/ then LinuxProcessDataProvider.new(pid)
88
88
  when /darwin/ then DarwinProcessDataProvider.new(pid)
89
89
  end
90
90
  end
@@ -170,7 +170,7 @@ end
170
170
  class ProcessReport
171
171
  attr_reader :target, :path
172
172
 
173
- def initialize(target, path=nil)
173
+ def initialize(target, path = nil)
174
174
  @target = target
175
175
  @path = path
176
176
  end
@@ -185,7 +185,7 @@ class ProcessReport
185
185
  end
186
186
  end
187
187
 
188
- def section(f, name=nil)
188
+ def section(f, name = nil)
189
189
  content = begin
190
190
  yield
191
191
  rescue StandardError => e
@@ -200,13 +200,13 @@ class ProcessReport
200
200
 
201
201
  def generate
202
202
  open do |f|
203
- section(f, "Time") { Time.now }
204
- section(f, "PID") { @target.pid }
205
- section(f, "Command") { @target.procline }
206
- section(f, "RSS") { @target.rss }
207
- section(f, "CPU") { @target.cpu }
208
- section(f, "Parent PID") { @target.ppid }
209
- section(f, "OS") { ShellWrapper.execute('uname -a') }
203
+ section(f, "Time") { Time.now }
204
+ section(f, "PID") { @target.pid }
205
+ section(f, "Command") { @target.procline }
206
+ section(f, "RSS") { @target.rss }
207
+ section(f, "CPU") { @target.cpu }
208
+ section(f, "Parent PID") { @target.ppid }
209
+ section(f, "OS") { ShellWrapper.execute('uname -a') }
210
210
  section(f, "Environment") { @target.environment }
211
211
 
212
212
  section(f) do
@@ -214,13 +214,13 @@ class ProcessReport
214
214
  if c_backtraces.match(/could not attach/i)
215
215
  fail("Failed to attach to target process. Please try again with sudo.")
216
216
  end
217
- section(f, "C Backtraces") { c_backtraces }
217
+ section(f, "C Backtraces") { c_backtraces }
218
218
  section(f, "Ruby Backtrace(s)") { ruby_backtraces }
219
219
  end
220
220
 
221
221
  section(f, "Open files") { @target.open_files }
222
222
  section(f, "Log") do
223
- commands = Logger.messages.map { |(_,msg)| msg }
223
+ commands = Logger.messages.map { |(_, msg)| msg }
224
224
  commands.join("\n")
225
225
  end
226
226
  end
@@ -243,7 +243,7 @@ def prompt_for_confirmation(target_pid, target_cmd)
243
243
  puts ''
244
244
  puts "To continue, type 'continue':"
245
245
 
246
- until ($stdin.gets.strip == 'continue') do
246
+ until $stdin.gets.strip == 'continue'
247
247
  puts "Please type 'continue' to continue, or ctrl-c to abort."
248
248
  end
249
249
  end
@@ -0,0 +1,85 @@
1
+ version: "3.9"
2
+ services:
3
+ mysql:
4
+ image: mysql:5.7
5
+ restart: always
6
+ environment:
7
+ MYSQL_ROOT_PASSWORD: mysql_root_password
8
+ MYSQL_DATABASE: app
9
+ expose:
10
+ - "3306"
11
+ volumes:
12
+ - mysql:/var/lib/mysql
13
+ rabbitmq:
14
+ image: rabbitmq:3.9.12
15
+ restart: always
16
+ environment:
17
+ RABBITMQ_NODENAME: rabbit
18
+ expose:
19
+ - "5672"
20
+ - "15672"
21
+ - "25672"
22
+ - "4369"
23
+ memcached:
24
+ image: memcached:1.6.12
25
+ restart: always
26
+ expose:
27
+ - "11211"
28
+ mongodb:
29
+ image: mongo:5.0.4
30
+ restart: always
31
+ volumes:
32
+ - /data/db
33
+ expose:
34
+ - "27017"
35
+ postgres:
36
+ image: postgres:14.2
37
+ restart: always
38
+ environment:
39
+ POSTGRES_USER: admin
40
+ POSTGRES_PASSWORD: postgres_password
41
+ volumes:
42
+ - postgres:/var/lib/postgresql/data
43
+ expose:
44
+ - "5432"
45
+ redis:
46
+ image: redis:6.2.6
47
+ restart: always
48
+ volumes:
49
+ - /var/lib/redis
50
+ expose:
51
+ - "6379"
52
+ app:
53
+ build:
54
+ context: .
55
+ args:
56
+ - ruby_version=${RUBY_VERSION:-3.1}
57
+ image: newrelic_rpm
58
+ tty: true
59
+ stdin_open: true
60
+ environment:
61
+ MYSQL_USERNAME: root
62
+ MYSQL_PASSWORD: mysql_root_password
63
+ DATABASE_NAME: app
64
+ MYSQL_HOST: mysql
65
+ POSTGRES_USERNAME: admin
66
+ POSTGRES_PASSWORD: postgres_password
67
+ command: ["irb"]
68
+ volumes:
69
+ - ".:/usr/src/app"
70
+ depends_on:
71
+ - mysql
72
+ - memcached
73
+ - mongodb
74
+ - postgres
75
+ - rabbitmq
76
+ - redis
77
+ sysctls:
78
+ - "net.ipv6.conf.all.disable_ipv6=0"
79
+ volumes:
80
+ mongodb:
81
+ driver: local
82
+ mysql:
83
+ driver: local
84
+ postgres:
85
+ driver: local
data/init.rb CHANGED
@@ -18,7 +18,6 @@ require 'new_relic/control'
18
18
  # We need it to add dev mode routes after initialization finished.
19
19
 
20
20
  begin
21
-
22
21
  current_config = if defined?(config)
23
22
  config
24
23
  elsif defined?(Rails.configuration)
@@ -26,7 +25,6 @@ begin
26
25
  end
27
26
 
28
27
  NewRelic::Control.instance.init_plugin :config => current_config
29
-
30
28
  rescue => e
31
29
  ::NewRelic::Agent.logger.error "Error initializing New Relic plugin. Agent is disabled.", e
32
30
  end
data/lefthook.yml ADDED
@@ -0,0 +1,9 @@
1
+ # Lefthook (https://github.com/evilmartians/lefthook) is a git hooks manager
2
+ # Install it on your machine by running `gem install lefthook`
3
+ pre-commit:
4
+ parallel: true
5
+ commands:
6
+ rubocop:
7
+ files: git diff --name-only --staged
8
+ glob: "*.rb"
9
+ run: rubocop --force-exclusion {files}
@@ -5,7 +5,6 @@
5
5
  module NewRelic
6
6
  module Agent
7
7
  class AdaptiveSampler
8
-
9
8
  def initialize target_samples = 10, period_duration = 60
10
9
  @target = target_samples
11
10
  @seen = 0
@@ -13,7 +12,7 @@ module NewRelic
13
12
  @sampled_count = 0
14
13
  @period_duration = period_duration
15
14
  @first_period = true
16
- @period_start = Time.now.to_f
15
+ @period_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
17
16
  @lock = Mutex.new
18
17
  register_config_callbacks
19
18
  end
@@ -29,7 +28,8 @@ module NewRelic
29
28
  elsif @sampled_count < @target
30
29
  rand(@seen_last) < @target
31
30
  else
32
- rand(@seen) < (@target ** (@target / @sampled_count) - @target ** 0.5)
31
+ # you've met the target and need to exponentially back off
32
+ rand(@seen) < exponential_backoff
33
33
  end
34
34
 
35
35
  @sampled_count += 1 if sampled
@@ -39,6 +39,10 @@ module NewRelic
39
39
  end
40
40
  end
41
41
 
42
+ def exponential_backoff
43
+ @target**(@target.to_f / @sampled_count) - @target**0.5
44
+ end
45
+
42
46
  def stats
43
47
  @lock.synchronize do
44
48
  {
@@ -53,11 +57,11 @@ module NewRelic
53
57
  private
54
58
 
55
59
  def reset_if_period_expired!
56
- now = Time.now.to_f
60
+ now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
57
61
  return unless @period_start + @period_duration <= now
58
62
 
59
63
  elapsed_periods = Integer((now - @period_start) / @period_duration)
60
- @period_start = @period_start + elapsed_periods * @period_duration
64
+ @period_start += elapsed_periods * @period_duration
61
65
 
62
66
  @first_period = false
63
67
  @seen_last = elapsed_periods > 1 ? 0 : @seen