newrelic_rpm 6.15.0 → 9.7.1

data/bin/newrelic_rpm

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# executes one of the commands in the new_relic/commands directory
+# pass the name of the command as an argument
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'new_relic/cli/command'
+begin
+  NewRelic::Cli::Command.run
+rescue NewRelic::Cli::Command::CommandFailure => failure
+  STDERR.puts failure.message
+  STDERR.puts failure.options if failure.options
+  exit(1)
+end

data/bin/nrdebug

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'tempfile'
 require 'rbconfig'
 
-def fail(msg, opts={})
+def fail(msg, opts = {})
   $stderr.puts(msg)
   usage() if opts[:usage]
   exit(-1)
@@ -84,7 +84,7 @@ class ProcessDataProvider
 
   def self.for_process(pid)
     case RbConfig::CONFIG['target_os']
-    when /linux/  then LinuxProcessDataProvider.new(pid)
+    when /linux/ then LinuxProcessDataProvider.new(pid)
     when /darwin/ then DarwinProcessDataProvider.new(pid)
     end
   end
@@ -96,11 +96,11 @@ class LinuxProcessDataProvider < ProcessDataProvider
   end
 
   def procline
-    File.read(proc_path('cmdline')).gsub("\000", " ")
+    File.read(proc_path('cmdline')).tr("\000", ' ')
   end
 
   def environment
-    File.read(proc_path('environ')).gsub("\000", "\n")
+    File.read(proc_path('environ')).tr("\000", "\n")
   end
 end
 
@@ -133,8 +133,29 @@ class RubyProcess
     backtrace_file = Tempfile.new('nrdebug_ruby_bt')
     File.chmod(0666, backtrace_file.path)
 
-    backtrace_gathering_code = 'Thread.list.each { |t| bt = t.backtrace rescue nil; puts \"#{t.inspect}\n#{bt && bt.join(\"\n\")}\n\n\" }'
-    gdb_script_body = <<-END
+    body = gdb_script_body(backtrace_file)
+
+    script_file = write_script_file(body)
+
+    gdb_stderr = Tempfile.new('nrdebug_gdb_stderr')
+
+    gdb_cmd = "gdb -batch -x #{script_file.path} 2>#{gdb_stderr.path}"
+    gdb_output = ShellWrapper.execute(gdb_cmd)
+    ruby_backtrace = File.read(backtrace_file.path)
+
+    script_file.close!
+    backtrace_file.close!
+    gdb_stderr.close!
+
+    [gdb_output, ruby_backtrace]
+  end
+
+  private
+
+  def gdb_script_body(backtrace_file)
+    backtrace_gathering_code = 'Thread.list.each { |t| bt = t.backtrace rescue nil; ' \
+      'puts \"#{t.inspect}\n#{bt && bt.join(\"\n\")}\n\n\" }'
+    <<~END
       attach #{pid}
       t a a bt
       call (void)close(1)
@@ -147,45 +168,36 @@ class RubyProcess
       call (void)fflush(0)
       quit
     END
-    Logger.log("Using gdb script:\n#{gdb_script_body}")
+  end
 
+  def write_script_file(body)
+    Logger.log("Using gdb script:\n#{body}")
     script_file = Tempfile.new('nrdebug_gdb_script')
-    script_file.write(gdb_script_body)
+    script_file.write(body)
     script_file.close
-
-    gdb_stderr = Tempfile.new('nrdebug_gdb_stderr')
-
-    gdb_cmd = "gdb -batch -x #{script_file.path} 2>#{gdb_stderr.path}"
-    gdb_output = ShellWrapper.execute(gdb_cmd)
-    ruby_backtrace = File.read(backtrace_file.path)
-
-    script_file.close!
-    backtrace_file.close!
-    gdb_stderr.close!
-
-    [gdb_output, ruby_backtrace]
+    script_file
   end
 end
 
 class ProcessReport
   attr_reader :target, :path
 
-  def initialize(target, path=nil)
+  def initialize(target, path = nil)
     @target = target
     @path = path
   end
 
   def open
     if @path
-      File.open(@path, "w") do |f|
-        yield f
+      File.open(@path, 'w') do |f|
+        yield(f)
       end
     else
-      yield $stdout
+      yield($stdout)
     end
   end
 
-  def section(f, name=nil)
+  def section(f, name = nil)
     content = begin
       yield
     rescue StandardError => e
@@ -200,67 +212,78 @@ class ProcessReport
 
   def generate
     open do |f|
-      section(f, "Time")        { Time.now }
-      section(f, "PID")         { @target.pid }
-      section(f, "Command")     { @target.procline }
-      section(f, "RSS")         { @target.rss }
-      section(f, "CPU")         { @target.cpu }
-      section(f, "Parent PID")  { @target.ppid }
-      section(f, "OS")          { ShellWrapper.execute('uname -a') }
-      section(f, "Environment") { @target.environment }
+      add_environment_sections(f)
 
       section(f) do
         c_backtraces, ruby_backtraces = @target.gather_backtraces
-        if c_backtraces.match(/could not attach/i)
-          fail("Failed to attach to target process. Please try again with sudo.")
+        if /could not attach/i.match?(c_backtraces)
+          fail('Failed to attach to target process. Please try again with sudo.')
         end
-        section(f, "C Backtraces")   { c_backtraces }
-        section(f, "Ruby Backtrace(s)") { ruby_backtraces }
+
+        section(f, 'C Backtraces') { c_backtraces }
+        section(f, 'Ruby Backtrace(s)') { ruby_backtraces }
       end
 
-      section(f, "Open files") { @target.open_files }
-      section(f, "Log") do
-        commands = Logger.messages.map { |(_,msg)| msg }
+      section(f, 'Open files') { @target.open_files }
+      section(f, 'Log') do
+        commands = Logger.messages.map { |(_, msg)| msg }
         commands.join("\n")
       end
     end
   end
+
+  private
+
+  def add_environment_sections(handle)
+    section(handle, 'Time') { Time.now }
+    section(handle, 'PID') { @target.pid }
+    section(handle, 'Command') { @target.procline }
+    section(handle, 'RSS') { @target.rss }
+    section(handle, 'CPU') { @target.cpu }
+    section(handle, 'Parent PID') { @target.ppid }
+    section(handle, 'OS') { ShellWrapper.execute('uname -a') }
+    section(handle, 'Environment') { @target.environment }
+  end
 end
 
 def prompt_for_confirmation(target_pid, target_cmd)
-  puts "Are you sure you want to attach to PID #{target_pid} ('#{target_cmd}')}?"
-  puts ''
-  puts '************************** !WARNING! **************************'
-  puts "Extracting debug information from this process may cause it to CRASH OR HANG."
-  puts ''
-  puts "It is highly recommended that you only run this script against processes that"
-  puts "are already unresponsive."
-  puts ''
-  puts "Additionally, the output may contain sensitive information from the program's"
-  puts "command line arguments, environment, or open file list. Please examine the"
-  puts "output before sharing it."
-  puts '************************** !WARNING! **************************'
-  puts ''
-  puts "To continue, type 'continue':"
-
-  until ($stdin.gets.strip == 'continue') do
+  puts <<~PROMPT
+    Are you sure you want to attach to PID #{target_pid} ('#{target_cmd}')}?
+
+    ************************** !WARNING! **************************
+    Extracting debug information from this process may cause it to CRASH OR HANG.
+
+    It is highly recommended that you only run this script against processes that
+    are already unresponsive.
+
+    Additionally, the output may contain sensitive information from the program's
+    command line arguments, environment, or open file list. Please examine the
+    output before sharing it.
+    ************************** !WARNING! **************************
+
+    To continue, type 'continue':
+  PROMPT
+
+  until $stdin.gets.strip == 'continue'
     puts "Please type 'continue' to continue, or ctrl-c to abort."
   end
 end
 
 target_pid = ARGV[0]
-fail("Please provide a PID for the target process", :usage => true) unless target_pid
+fail('Please provide a PID for the target process', :usage => true) unless target_pid
 
 gdb_path = `which gdb`
-fail("Could not find gdb, please ensure it is installed and in your PATH") if gdb_path.empty?
+fail('Could not find gdb, please ensure it is installed and in your PATH') if gdb_path.empty?
 
 target = RubyProcess.new(target_pid)
 if !target.attachable?
-  fail("You do not appear to have permissions to attach to the target process.\nPlease check the process owner and try again with sudo if necessary")
+  fail("You do not appear to have permissions to attach to the target process.\nPlease check the process owner " \
+    'and try again with sudo if necessary')
 end
 if !target.alive?
   fail("Could not find process with PID #{target_pid}")
 end
+
 target_cmd = target.procline
 
 prompt_for_confirmation(target_pid, target_cmd)
@@ -275,5 +298,5 @@ report.generate
 
 puts "Generated '#{report_filename}'"
 puts ''
-puts "Please examine the output file for potentially sensitive information and"
-puts "remove it before sharing this file with anyone."
+puts 'Please examine the output file for potentially sensitive information and'
+puts 'remove it before sharing this file with anyone.'

data/init.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
-# This is the initialization for the New Relic Ruby Agent when used as
+# This is the initialization for the New Relic Ruby agent when used as
 # a plugin
 require 'new_relic/control'
 
@@ -12,21 +12,19 @@ require 'new_relic/control'
 # If you can't find any log files and you don't see anything in your
 # application log files please visit support.newrelic.com.
 
-# Initializer for the NewRelic Ruby Agent
+# Initializer for the New Relic Ruby agent
 
-# After verison 2.0 of Rails we can access the configuration directly.
+# After version 2.0 of Rails we can access the configuration directly.
 # We need it to add dev mode routes after initialization finished.
 
 begin
-
   current_config = if defined?(config)
     config
   elsif defined?(Rails.configuration)
     Rails.configuration
   end
 
-  NewRelic::Control.instance.init_plugin :config => current_config
-
+  NewRelic::Control.instance.init_plugin(:config => current_config)
 rescue => e
-  ::NewRelic::Agent.logger.error "Error initializing New Relic plugin. Agent is disabled.", e
+  NewRelic::Agent.logger.error('Error initializing New Relic plugin. Agent is disabled.', e)
 end

data/install.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
-if __FILE__ == $0 || $0 =~ /script\/plugin/ || File.basename($0) == 'rake'
+if __FILE__ == $0 || $0.include?('script/plugin') || File.basename($0) == 'rake'
   $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
   require 'new_relic/cli/command'
   begin

data/lib/new_relic/agent/adaptive_sampler.rb

@@ -1,19 +1,18 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
     class AdaptiveSampler
-
-      def initialize target_samples = 10, period_duration = 60
+      def initialize(target_samples = 10, period_duration = 60)
         @target = target_samples
         @seen = 0
         @seen_last = 0
         @sampled_count = 0
         @period_duration = period_duration
         @first_period = true
-        @period_start = Time.now.to_f
+        @period_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @lock = Mutex.new
         register_config_callbacks
       end
@@ -29,7 +28,8 @@ module NewRelic
           elsif @sampled_count < @target
             rand(@seen_last) < @target
           else
-            rand(@seen) < (@target ** (@target / @sampled_count) - @target ** 0.5)
+            # you've met the target and need to exponentially back off
+            rand(@seen) < exponential_backoff
           end
 
           @sampled_count += 1 if sampled
@@ -39,6 +39,10 @@ module NewRelic
         end
       end
 
+      def exponential_backoff
+        @target**(@target.to_f / @sampled_count) - @target**0.5
+      end
+
       def stats
         @lock.synchronize do
           {
@@ -53,11 +57,11 @@ module NewRelic
       private
 
       def reset_if_period_expired!
-        now = Time.now.to_f
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         return unless @period_start + @period_duration <= now
 
         elapsed_periods = Integer((now - @period_start) / @period_duration)
-        @period_start = @period_start + elapsed_periods * @period_duration
+        @period_start += elapsed_periods * @period_duration
 
         @first_period = false
         @seen_last = elapsed_periods > 1 ? 0 : @seen
@@ -80,7 +84,7 @@ module NewRelic
             end
           end
           if target_changed
-            NewRelic::Agent.logger.debug "Sampling target set to: #{target}"
+            NewRelic::Agent.logger.debug("Sampling target set to: #{target}")
           end
         end
       end
@@ -95,7 +99,7 @@ module NewRelic
             end
           end
           if period_changed
-            NewRelic::Agent.logger.debug "Sampling period set to: #{period_duration}"
+            NewRelic::Agent.logger.debug("Sampling period set to: #{period_duration}")
           end
         end
       end