newrelic_rpm 3.12.0.288 → 9.10.2

data/lib/new_relic/agent/system_info.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 # This module is intended to provide access to information about the host OS and
 # [virtual] machine. It intentionally does no caching and maintains no state -
@@ -8,68 +8,102 @@
 # the requested information is unavailable.
 
 require 'rbconfig'
+require 'socket'
 
 module NewRelic
   module Agent
     module SystemInfo
+      DOCKER_CGROUPS_V2_PATTERN = %r{.*/docker/containers/([0-9a-f]{64})/.*}.freeze
+
       def self.ruby_os_identifier
         RbConfig::CONFIG['target_os']
       end
 
-      def self.clear_processor_info
-        @processor_info = nil
+      def self.darwin?
+        !!(ruby_os_identifier =~ /darwin/i)
       end
 
-      def self.get_processor_info
-        if @processor_info.nil?
-          case ruby_os_identifier
+      def self.linux?
+        !!(ruby_os_identifier =~ /linux/i)
+      end
 
-          when /darwin/
-            @processor_info = {
-              :num_physical_packages  => sysctl_value('hw.packages').to_i,
-              :num_physical_cores     => sysctl_value('hw.physicalcpu_max').to_i,
-              :num_logical_processors => sysctl_value('hw.logicalcpu_max').to_i
-            }
-            # in case those don't work, try backup values
-            if @processor_info[:num_physical_cores] <= 0
-              @processor_info[:num_physical_cores] = sysctl_value('hw.physicalcpu').to_i
-            end
-            if @processor_info[:num_logical_processors] <= 0
-              @processor_info[:num_logical_processors] = sysctl_value('hw.logicalcpu').to_i
-            end
-            if @processor_info[:num_logical_processors] <= 0
-              @processor_info[:num_logical_processors] = sysctl_value('hw.ncpu').to_i
-            end
+      def self.bsd?
+        !!(ruby_os_identifier =~ /bsd/i)
+      end
 
-          when /linux/
-            cpuinfo = proc_try_read('/proc/cpuinfo')
-            @processor_info = cpuinfo ? parse_cpuinfo(cpuinfo) : {}
+      @processor_info = nil
 
-          when /freebsd/
-            @processor_info = {
-              :num_physical_packages  => nil,
-              :num_physical_cores     => nil,
-              :num_logical_processors => sysctl_value('hw.ncpu').to_i
-            }
-          end
+      def self.ip_addresses
+        Socket.ip_address_list.map(&:ip_address)
+      end
 
-          # give nils for obviously wrong values
-          @processor_info.keys.each do |key|
-            value = @processor_info[key]
-            if value.is_a?(Numeric) && value <= 0
-              @processor_info[key] = nil
-            end
-          end
+      def self.clear_processor_info
+        @processor_info = nil
+      end
+
+      def self.processor_info
+        return @processor_info if @processor_info
+
+        if darwin?
+          processor_info_darwin
+        elsif linux?
+          processor_info_linux
+        elsif bsd?
+          processor_info_bsd
+        else
+          raise "Couldn't determine OS"
         end
+        remove_bad_values
 
         @processor_info
       rescue
-        {}
+        @processor_info = NewRelic::EMPTY_HASH
+      end
+
+      def self.processor_info_darwin
+        @processor_info = {
+          num_physical_packages: sysctl_value('hw.packages'),
+          num_physical_cores: sysctl_value('hw.physicalcpu_max'),
+          num_logical_processors: sysctl_value('hw.logicalcpu_max')
+        }
+        # in case those don't work, try backup values
+        if @processor_info[:num_physical_cores] <= 0
+          @processor_info[:num_physical_cores] = sysctl_value('hw.physicalcpu')
+        end
+        if @processor_info[:num_logical_processors] <= 0
+          @processor_info[:num_logical_processors] = sysctl_value('hw.logicalcpu')
+        end
+        if @processor_info[:num_logical_processors] <= 0
+          @processor_info[:num_logical_processors] = sysctl_value('hw.ncpu')
+        end
+      end
+
+      def self.processor_info_linux
+        cpuinfo = proc_try_read('/proc/cpuinfo')
+        @processor_info = cpuinfo ? parse_cpuinfo(cpuinfo) : NewRelic::EMPTY_HASH
+      end
+
+      def self.processor_info_bsd
+        @processor_info = {
+          num_physical_packages: nil,
+          num_physical_cores: nil,
+          num_logical_processors: sysctl_value('hw.ncpu')
+        }
+      end
+
+      def self.remove_bad_values
+        # give nils for obviously wrong values
+        @processor_info.keys.each do |key|
+          value = @processor_info[key]
+          if value.is_a?(Numeric) && value <= 0
+            @processor_info[key] = nil
+          end
+        end
       end
 
       def self.sysctl_value(name)
         # make sure to redirect stderr so we don't spew if the name is unknown
-        `sysctl -n #{name} 2>/dev/null`
+        `sysctl -n #{name} 2>/dev/null`.to_i
       end
 
       def self.parse_cpuinfo(cpuinfo)
@@ -94,36 +128,43 @@ module NewRelic
         end
         cores[[phys_id, core_id]] += 1 if phys_id && core_id
 
-        num_physical_packages  = cores.keys.map(&:first).uniq.size
-        num_physical_cores     = cores.size
-        num_logical_processors = cores.values.reduce(0,:+)
+        num_physical_packages = cores.keys.map(&:first).uniq.size
+        num_physical_cores = cores.size
+        num_logical_processors = cores.values.sum
 
         if num_physical_cores == 0
           num_logical_processors = total_processors
 
+          if total_processors == 0
+            # Likely a malformed file.
+            num_logical_processors = nil
+          end
+
           if total_processors == 1
             # Some older, single-core processors might not list ids,
             # so we'll just mark them all 1.
             num_physical_packages = 1
-            num_physical_cores    = 1
+            num_physical_cores = 1
           else
             # We have no way of knowing how many packages or cores
             # we have, even though we know how many processors there are.
             num_physical_packages = nil
-            num_physical_cores    = nil
+            num_physical_cores = nil
           end
         end
 
         {
-          :num_physical_packages  => num_physical_packages,
-          :num_physical_cores     => num_physical_cores,
+          :num_physical_packages => num_physical_packages,
+          :num_physical_cores => num_physical_cores,
           :num_logical_processors => num_logical_processors
         }
       end
 
-      def self.num_physical_packages ; get_processor_info[:num_physical_packages ] end
-      def self.num_physical_cores    ; get_processor_info[:num_physical_cores    ] end
-      def self.num_logical_processors; get_processor_info[:num_logical_processors] end
+      def self.num_physical_packages; processor_info[:num_physical_packages] end
+
+      def self.num_physical_cores; processor_info[:num_physical_cores] end
+
+      def self.num_logical_processors; processor_info[:num_logical_processors] end
 
       def self.processor_arch
         RbConfig::CONFIG['target_cpu']
@@ -133,8 +174,25 @@ module NewRelic
         proc_try_read('/proc/version')
       end
 
+      # When operating within a Docker container, attempt to obtain the
+      # container id.
+      #
+      # First look for `/proc/self/mountinfo` to exist on disk to signify
+      # cgroups v2. If that file exists, read it and expect it to contain one
+      # or more "/docker/containers/<container_id>/" lines from which the
+      # container id can be gleaned.
+      #
+      # Next look for `/proc/self/cgroup` to exist on disk to signify cgroup v1.
+      # If that file exists, read it and parse the "cpu" group info in the hope
+      # of finding a 64 character container id value.
+      #
+      # For non-cgroups based containers, use a `nil` value for the container
+      # id without generating any warnings or errors.
       def self.docker_container_id
-        return unless ruby_os_identifier =~ /linux/
+        return unless ruby_os_identifier.include?('linux')
+
+        cgroupsv2_based_id = docker_container_id_for_cgroupsv2
+        return cgroupsv2_based_id if cgroupsv2_based_id
 
         cgroup_info = proc_try_read('/proc/self/cgroup')
         return unless cgroup_info
@@ -142,23 +200,47 @@ module NewRelic
         parse_docker_container_id(cgroup_info)
       end
 
+      def self.docker_container_id_for_cgroupsv2
+        mountinfo = proc_try_read('/proc/self/mountinfo')
+        return unless mountinfo
+
+        Regexp.last_match(1) if mountinfo =~ DOCKER_CGROUPS_V2_PATTERN
+      end
+
       def self.parse_docker_container_id(cgroup_info)
         cpu_cgroup = parse_cgroup_ids(cgroup_info)['cpu']
         return unless cpu_cgroup
 
-        case cpu_cgroup
+        container_id = case cpu_cgroup
         # docker native driver w/out systemd (fs)
-        when %r{^/docker/([0-9a-f]+)$}                      then $1
+        when /[0-9a-f]{64,}/
+          if $&.length == 64
+            $&
+          else # container ID is too long
+            ::NewRelic::Agent.logger.debug("Ignoring docker ID of invalid length: '#{cpu_cgroup}'")
+            return
+          end
         # docker native driver with systemd
-        when %r{^/system\.slice/docker-([0-9a-f]+)\.scope$} then $1
-        # docker lxc driver
-        when %r{^/lxc/([0-9a-f]+)$}                         then $1
-        # not in any cgroup
-        when '/'                                            then nil
+        when '/' then nil
         # in a cgroup, but we don't recognize its format
+        when /docker\/.*[^0-9a-f]/
+          ::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id has invalid characters: '#{cpu_cgroup}'")
+          return
+        when /docker/
+          ::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
+          ::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
+          return
         else
           ::NewRelic::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
+          return
+        end
+
+        if container_id && container_id.size != 64
+          ::NewRelic::Agent.logger.debug("Found docker container_id with invalid length: #{container_id}")
+          ::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
           nil
+        else
+          container_id
         end
       end
 
@@ -168,6 +250,7 @@ module NewRelic
         cgroup_info.split("\n").each do |line|
           parts = line.split(':')
           next unless parts.size == 3
+
           _, subsystems, cgroup_id = parts
           subsystems = subsystems.split(',')
           subsystems.each do |subsystem|
@@ -184,7 +267,8 @@ module NewRelic
       # for details on why we do it this way.
       def self.proc_try_read(path)
         return nil unless File.exist?(path)
-        content = ''
+
+        content = +''
         File.open(path) do |f|
           loop do
             begin
@@ -199,6 +283,64 @@ module NewRelic
         end
         content
       end
+
+      def self.ram_in_mib
+        if darwin?
+          (sysctl_value('hw.memsize') / (1024**2))
+        elsif linux?
+          meminfo = proc_try_read('/proc/meminfo')
+          parse_linux_meminfo_in_mib(meminfo)
+        elsif bsd?
+          (sysctl_value('hw.realmem') / (1024**2))
+        else
+          ::NewRelic::Agent.logger.debug("Unable to determine ram_in_mib for host os: #{ruby_os_identifier}")
+          nil
+        end
+      end
+
+      def self.parse_linux_meminfo_in_mib(meminfo)
+        if meminfo && mem_total = meminfo[/MemTotal:\s*(\d*)\skB/, 1]
+          (mem_total.to_i / 1024).to_i
+        else
+          ::NewRelic::Agent.logger.debug("Failed to parse MemTotal from /proc/meminfo: #{meminfo}")
+          nil
+        end
+      end
+
+      def self.boot_id
+        return nil unless linux?
+
+        if bid = proc_try_read('/proc/sys/kernel/random/boot_id')
+          bid.chomp!
+
+          if bid.ascii_only?
+            if bid.empty?
+              ::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
+              ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
+              nil
+
+            elsif bid.bytesize == 36
+              bid
+
+            else
+              ::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
+              ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
+              bid[0, 128]
+
+            end
+          else
+            ::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
+            ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
+            nil
+
+          end
+        else
+          ::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
+          ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
+          nil
+
+        end
+      end
     end
   end
 end

data/lib/new_relic/agent/threading/agent_thread.rb

@@ -1,28 +1,30 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
     module Threading
       class AgentThread
-
         def self.create(label, &blk)
-          ::NewRelic::Agent.logger.debug("Creating New Relic thread: #{label}")
-          wrapped_blk = Proc.new do
+          ::NewRelic::Agent.logger.debug("Creating AgentThread: #{label}")
+          wrapped_blk = proc do
+            if (txn = ::NewRelic::ThreadLocalStorage[:newrelic_tracer_state]&.current_transaction)
+              ::NewRelic::Agent.logger.warn("AgentThread created with current transaction #{txn.best_name}")
+            end
             begin
-              blk.call
+              yield
             rescue => e
-              ::NewRelic::Agent.logger.error("Thread #{label} exited with error", e)
+              ::NewRelic::Agent.logger.error("AgentThread #{label} exited with error", e)
             rescue Exception => e
-              ::NewRelic::Agent.logger.error("Thread #{label} exited with exception. Re-raising in case of interupt.", e)
+              ::NewRelic::Agent.logger.error("AgentThread #{label} exited with exception. Re-raising in case of interrupt.", e)
               raise
             ensure
-              ::NewRelic::Agent.logger.debug("Exiting New Relic thread: #{label}")
+              ::NewRelic::Agent.logger.debug("Exiting AgentThread: #{label}")
             end
           end
-
-          thread = backing_thread_class.new(&wrapped_blk)
+          thread = nil
+          NewRelic::Agent.disable_all_tracing { thread = backing_thread_class.new(&wrapped_blk) }
           thread[:newrelic_label] = label
           thread
         end
@@ -33,14 +35,16 @@ module NewRelic
           backing_thread_class.list
         end
 
-        def self.bucket_thread(thread, profile_agent_code) #THREAD_LOCAL_ACCESS
+        def self.bucket_thread(thread, profile_agent_code) # THREAD_LOCAL_ACCESS
           if thread.key?(:newrelic_label)
             profile_agent_code ? :agent : :ignore
           else
-            state = TransactionState.tl_state_for(thread)
-            if state.in_background_transaction?
+            state = Tracer.state_for(thread)
+            txn = state.current_transaction
+
+            if txn && !txn.recording_web_transaction?
               :background
-            elsif state.in_web_transaction?
+            elsif txn&.recording_web_transaction?
               :request
             else
               :other
@@ -55,6 +59,7 @@ module NewRelic
             ::NewRelic::Agent.logger.debug("Failed to backtrace #{thread.inspect}: #{e.class.name}: #{e.to_s}")
           end
           return nil unless bt
+
           bt.reject! { |t| t.include?('/newrelic_rpm-') } unless profile_agent_code
           bt
         end

data/lib/new_relic/agent/threading/backtrace_node.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -13,12 +13,12 @@ module NewRelic
 
         def initialize
           @children = []
-          @depth    = 0
+          @depth = 0
         end
 
         def add_child_unless_present(child)
           child.depth = @depth + 1
-          @children << child unless @children.include? child
+          @children << child unless @children.include?(child)
         end
 
         def add_child(child)
@@ -31,7 +31,6 @@ module NewRelic
         end
       end
 
-
       class BacktraceRoot < BacktraceBase
         attr_reader :flattened
 
@@ -71,16 +70,15 @@ module NewRelic
         end
 
         def dump_string
-          result = "#<BacktraceRoot:#{object_id}>"
+          result = +"#<BacktraceRoot:#{object_id}>"
           child_results = @children.map { |c| c.dump_string(2) }.join("\n")
           result << "\n" unless child_results.empty?
           result << child_results
         end
       end
 
-
       class BacktraceNode < BacktraceBase
-        attr_reader   :file, :method, :line_no, :raw_line, :as_array
+        attr_reader :file, :method, :line_no, :raw_line, :as_array
         attr_accessor :runnable_count, :depth
 
         def initialize(line)
@@ -92,8 +90,8 @@ module NewRelic
 
         def ==(other)
           (
-            @raw_line       == other.raw_line &&
-            @depth          == other.depth    &&
+            @raw_line == other.raw_line &&
+            @depth == other.depth &&
             @runnable_count == other.runnable_count
           )
         end
@@ -115,10 +113,12 @@ module NewRelic
           @as_array << child_arrays
         end
 
-        def dump_string(indent=0)
+        def dump_string(indent = 0)
           @file, @method, @line_no = parse_backtrace_frame(@raw_line)
-          result = "#{" " * indent}#<BacktraceNode:#{object_id} [#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
-          child_results = @children.map { |c| c.dump_string(indent+2) }.join("\n")
+          indentation = ' ' * indent
+          result = +"#{indentation}#<BacktraceNode:#{object_id} ) + \
+                              [#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
+          child_results = @children.map { |c| c.dump_string(indent + 2) }.join("\n")
           result << "\n" unless child_results.empty?
           result << child_results
         end
@@ -129,7 +129,6 @@ module NewRelic
           [$1, $4, $3] # sic
         end
       end
-
     end
   end
 end

data/lib/new_relic/agent/threading/backtrace_service.rb

@@ -1,15 +1,15 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
     module Threading
       class BacktraceService
-        ALL_TRANSACTIONS = "**ALL**".freeze
+        ALL_TRANSACTIONS = '**ALL**'.freeze
 
         def self.is_supported?
-          RUBY_VERSION >= "1.9.2" && !is_resque?
+          !is_resque?
         end
 
         # Because of Resque's forking, we don't poll thread backtraces for it.
@@ -20,12 +20,13 @@ module NewRelic
         end
 
         attr_reader :worker_loop, :buffer, :effective_polling_period,
-                    :overhead_percent_threshold
+          :overhead_percent_threshold
         attr_accessor :worker_thread, :profile_agent_code
 
-        def initialize(event_listener=nil)
+        def initialize(event_listener = nil)
           @profiles = {}
           @buffer = {}
+          @last_poll = nil
 
           # synchronizes access to @profiles and @buffer above
           @lock = Mutex.new
@@ -35,14 +36,12 @@ module NewRelic
           @worker_loop = NewRelic::Agent::WorkerLoop.new
 
           # Memoize overhead % to avoid getting stale OR looked up every poll
-          @overhead_percent_threshold = NewRelic::Agent.config[:'xray_session.max_profile_overhead']
-          NewRelic::Agent.config.register_callback(:'xray_session.max_profile_overhead') do |new_value|
+          @overhead_percent_threshold = NewRelic::Agent.config[:'thread_profiler.max_profile_overhead']
+          NewRelic::Agent.config.register_callback(:'thread_profiler.max_profile_overhead') do |new_value|
             @overhead_percent_threshold = new_value
           end
 
-          if event_listener
-            event_listener.subscribe(:transaction_finished, &method(:on_transaction_finished))
-          end
+          event_listener&.subscribe(:transaction_finished, &method(:on_transaction_finished))
         end
 
         # Public interface
@@ -51,7 +50,7 @@ module NewRelic
           @running
         end
 
-        def subscribe(transaction_name, command_arguments={})
+        def subscribe(transaction_name, command_arguments = {})
           if self.class.is_resque?
             NewRelic::Agent.logger.info("Backtracing threads on Resque is not supported, so not subscribing transaction '#{transaction_name}'")
             return
@@ -104,7 +103,7 @@ module NewRelic
           @lock.synchronize do
             if @profiles[transaction_name]
               profile = @profiles.delete(transaction_name)
-              profile.finished_at = Time.now
+              profile.finished_at = Process.clock_gettime(Process::CLOCK_REALTIME)
               @profiles[transaction_name] = ThreadProfile.new(profile.command_arguments)
               profile
             end
@@ -112,11 +111,11 @@ module NewRelic
         end
 
         def on_transaction_finished(payload)
-          name     = payload[:name]
-          start    = payload[:start_timestamp]
+          name = payload[:name]
+          start = payload[:start_timestamp]
           duration = payload[:duration]
-          thread   = payload[:thread] || Thread.current
-          bucket   = payload[:bucket]
+          thread = payload[:thread] || Thread.current
+          bucket = payload[:bucket]
           @lock.synchronize do
             backtraces = @buffer.delete(thread)
             if backtraces && @profiles.has_key?(name)
@@ -150,6 +149,7 @@ module NewRelic
         # This method is expected to be called with @lock held
         def stop
           return unless @running
+
           @running = false
           self.worker_loop.stop
 
@@ -162,7 +162,7 @@ module NewRelic
         end
 
         def poll
-          poll_start = Time.now
+          poll_start = Process.clock_gettime(Process::CLOCK_REALTIME)
 
           @lock.synchronize do
             AgentThread.list.each do |thread|
@@ -172,7 +172,7 @@ module NewRelic
             @buffer.delete_if { |thread, _| !thread.alive? }
           end
 
-          end_time = Time.now
+          end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
           adjust_polling_time(end_time, poll_start)
           record_supportability_metrics(end_time, poll_start)
         end
@@ -196,7 +196,7 @@ module NewRelic
         # This method is expected to be called with @lock held
         def watching_for_transaction?
           @profiles.size > 1 ||
-          (@profiles.size == 1 && @profiles[ALL_TRANSACTIONS].nil?)
+            (@profiles.size == 1 && @profiles[ALL_TRANSACTIONS].nil?)
         end
 
         def allowed_bucket?(bucket)
@@ -212,16 +212,14 @@ module NewRelic
             if @buffer[thread].length < MAX_BUFFER_LENGTH
               @buffer[thread] << [timestamp, backtrace]
             else
-              NewRelic::Agent.increment_metric('Supportability/XraySessions/DroppedBacktraces')
+              NewRelic::Agent.increment_metric('Supportability/ThreadProfiler/DroppedBacktraces')
             end
           end
         end
 
         # This method is expected to be called with @lock held.
         def aggregate_global_backtrace(backtrace, bucket, thread)
-          if @profiles[ALL_TRANSACTIONS]
-            @profiles[ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
-          end
+          @profiles[ALL_TRANSACTIONS]&.aggregate(backtrace, bucket, thread)
         end
 
         # This method is expected to be called with @lock held.
@@ -229,7 +227,7 @@ module NewRelic
           bucket = AgentThread.bucket_thread(thread, @profile_agent_code)
 
           if need_backtrace?(bucket)
-            timestamp = Time.now.to_f
+            timestamp = Process.clock_gettime(Process::CLOCK_REALTIME)
             backtrace = AgentThread.scrub_backtrace(thread, @profile_agent_code)
             aggregate_global_backtrace(backtrace, bucket, thread)
             buffer_backtrace_for_thread(thread, timestamp, backtrace, bucket)
@@ -276,7 +274,6 @@ module NewRelic
           end
           @last_poll = poll_start
         end
-
       end
     end
   end