newrelic_rpm 8.8.0 → 8.9.0

data/lib/new_relic/agent/monitors/cross_app_monitor.rb

@@ -100,7 +100,7 @@ module NewRelic
 
         def decoded_id(request)
           encoded_id = request[NEWRELIC_ID_HEADER_KEY]
-          return "" if encoded_id.nil? || encoded_id.empty?
+          return NewRelic::EMPTY_STR if encoded_id.nil? || encoded_id.empty?
 
           obfuscator.deobfuscate(encoded_id)
         end

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -185,7 +185,12 @@ module NewRelic
                   merge_data_from_pipe(pipe) unless pipe == wake.out
                 end
 
-                wake.out.read(1) if ready_pipes.include?(wake.out)
+                begin
+                  wake.out.read_nonblock(1) if ready_pipes.include?(wake.out)
+                rescue IO::WaitReadable
+                  NewRelic::Agent.logger.error 'Issue while reading from the ready pipe'
+                  NewRelic::Agent.logger.error "Ready pipes: #{ready_pipes.map(&:to_s)}, wake.out pipe: #{wake.out}"
+                end
               end
 
               break unless should_keep_listening?

data/lib/new_relic/agent/pipe_service.rb

@@ -24,7 +24,7 @@ module NewRelic
       end
 
       def get_agent_commands
-        []
+        NewRelic::EMPTY_ARRAY
       end
 
       def analytic_event_data(events)

data/lib/new_relic/agent/samplers/delayed_job_sampler.rb

@@ -87,7 +87,7 @@ module NewRelic
           all_count = 0
           queue_counts(column_name).each do |column_val, count|
             all_count += count
-            column_val = "default" if column_val.nil? || column_val == ""
+            column_val = "default" if column_val.nil? || column_val == NewRelic::EMPTY_STR
             metric = "Workers/DelayedJob/queue_length/#{metric_node}/#{column_val}"
             NewRelic::Agent.record_metric(metric, count)
           end

data/lib/new_relic/agent/sql_sampler.rb

@@ -196,7 +196,7 @@ module NewRelic
       end
 
       def harvest!
-        return [] unless enabled?
+        return NewRelic::EMPTY_ARRAY unless enabled?
 
         slowest = []
         @samples_lock.synchronize do

data/lib/new_relic/agent/system_info.rb

@@ -39,54 +39,69 @@ module NewRelic
         @processor_info = nil
       end
 
-      def self.get_processor_info
-        if @processor_info.nil?
-          if 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
-
-          elsif linux?
-            cpuinfo = proc_try_read('/proc/cpuinfo')
-            @processor_info = cpuinfo ? parse_cpuinfo(cpuinfo) : {}
+      def self.processor_info
+        return @processor_info if @processor_info
 
-          elsif bsd?
-            @processor_info = {
-              :num_physical_packages => nil,
-              :num_physical_cores => nil,
-              :num_logical_processors => sysctl_value('hw.ncpu').to_i
-            }
-          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
+        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)
@@ -143,11 +158,11 @@ module NewRelic
         }
       end
 
-      def self.num_physical_packages; get_processor_info[:num_physical_packages] end
+      def self.num_physical_packages; processor_info[:num_physical_packages] end
 
-      def self.num_physical_cores; get_processor_info[:num_physical_cores] end
+      def self.num_physical_cores; processor_info[:num_physical_cores] end
 
-      def self.num_logical_processors; get_processor_info[:num_logical_processors] end
+      def self.num_logical_processors; processor_info[:num_logical_processors] end
 
       def self.processor_arch
         RbConfig::CONFIG['target_cpu']
@@ -243,12 +258,12 @@ module NewRelic
 
       def self.ram_in_mib
         if darwin?
-          (sysctl_value('hw.memsize').to_i / (1024**2)).to_i
+          (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').to_i / (1024**2)).to_i
+          (sysctl_value('hw.realmem') / (1024**2))
         else
           ::NewRelic::Agent.logger.debug("Unable to determine ram_in_mib for host os: #{ruby_os_identifier}")
           nil

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

@@ -122,8 +122,8 @@ module NewRelic
         end
 
         def to_log_description
-          "#<ThreadProfile:#{object_id} "\
-            "@profile_id: #{profile_id} "\
+          "#<ThreadProfile:#{object_id} " \
+            "@profile_id: #{profile_id} " \
             "@command_arguments=#{@command_arguments.inspect}>"
         end
       end

data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb

@@ -9,7 +9,7 @@ module NewRelic
         attr_reader :samples
 
         SINGLE_BUFFER_MAX = 20
-        NO_SAMPLES = [].freeze
+        NO_SAMPLES = NewRelic::EMPTY_ARRAY
 
         def initialize
           @samples = []

data/lib/new_relic/agent/transaction_sampler.rb

@@ -67,7 +67,7 @@ module NewRelic
 
       # Gather transaction traces that we'd like to transmit to the server.
       def harvest!
-        return [] unless enabled?
+        return NewRelic::EMPTY_ARRAY unless enabled?
 
         samples = @samples_lock.synchronize do
           @last_sample = nil

data/lib/new_relic/agent.rb

@@ -758,7 +758,7 @@ module NewRelic
     def browser_timing_header(nonce = nil)
       record_api_supportability_metric(:browser_timing_header)
 
-      return "" unless agent
+      return EMPTY_STR unless agent
       agent.javascript_instrumentor.browser_timing_header(nonce)
     end
 

data/lib/new_relic/coerce.rb

@@ -43,7 +43,7 @@ module NewRelic
       String(value)
     rescue => error
       log_failure(value.class, String, context, error)
-      ""
+      EMPTY_STR
     end
 
     def scalar(val)

data/lib/new_relic/collection_helper.rb

@@ -46,7 +46,7 @@ module NewRelic
     def truncate(string, len = DEFAULT_TRUNCATION_SIZE)
       case string
       when Symbol then string
-      when nil then ""
+      when nil then EMPTY_STR
       when String
         real_string = flatten(string)
         if real_string.size > len

data/lib/new_relic/dependency_detection.rb

@@ -156,8 +156,8 @@ module DependencyDetection
 
       ::NewRelic::Agent.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}")
       ::NewRelic::Agent.logger.debug \
-        "[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release." \
-        " Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`"
+        "[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release. " \
+        "Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`"
 
       return true
     end

data/lib/new_relic/local_environment.rb

@@ -26,7 +26,7 @@ module NewRelic
   #
   # If the environment can't be determined, it will be set to nil.
   #
-  # NewRelic::LocalEnvironment should be accessed through NewRelic::Control#env (via the NewRelic::Control singleton).
+  # NewRelic::LocalEnvironment should be accessed through NewRelic::Control#local_env (via the NewRelic::Control singleton).
   class LocalEnvironment
     def discovered_dispatcher
       discover_dispatcher unless @discovered_dispatcher

data/lib/new_relic/metric_data.rb

@@ -33,7 +33,7 @@ module NewRelic
     end
 
     def hash
-      metric_spec.hash ^ stats.hash
+      [metric_spec, stats].hash
     end
 
     def to_json(*a)

data/lib/new_relic/metric_spec.rb

@@ -39,7 +39,7 @@ class NewRelic::MetricSpec
   end
 
   def hash
-    @name.hash ^ @scope.hash
+    [@name, @scope].hash
   end
 
   def to_s

data/lib/new_relic/rack/browser_monitoring.rb

@@ -34,7 +34,7 @@ module NewRelic::Rack
       (status, headers, response) = result
 
       js_to_inject = NewRelic::Agent.browser_timing_header
-      if (js_to_inject != "") && should_instrument?(env, status, headers)
+      if (js_to_inject != NewRelic::EMPTY_STR) && should_instrument?(env, status, headers)
         response_string = autoinstrument_source(response, headers, js_to_inject)
         if headers.key?(CONTENT_LENGTH)
           content_length = response_string ? response_string.bytesize : 0

data/lib/new_relic/version.rb

@@ -6,7 +6,7 @@
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 8
-    MINOR = 8
+    MINOR = 9
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"

data/lib/tasks/config.rake

@@ -1,3 +1,7 @@
+# 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.
+
 namespace :newrelic do
   namespace :config do
     desc "Describe available New Relic configuration settings."

data/lib/tasks/coverage_report.rake

@@ -0,0 +1,22 @@
+# 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.
+
+namespace :coverage do
+  desc "Collates all result sets generated by the different test runners"
+  task :report do
+    require 'simplecov'
+    require 'simplecov_json_formatter'
+    unless ENV['CI']
+      puts 'This task is intended to be run only on the CI.'
+      return
+    end
+    SimpleCov.collate Dir["coverage*/.resultset.json"] do
+      formatter SimpleCov::Formatter::MultiFormatter.new([
+        SimpleCov::Formatter::JSONFormatter,
+        SimpleCov::Formatter::HTMLFormatter
+      ])
+      refuse_coverage_drop
+    end
+  end
+end

data/lib/tasks/install.rake

@@ -1,3 +1,7 @@
+# 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.
+
 namespace :newrelic do
   desc "Install a default config/newrelic.yml file"
   task :install do

data/lib/tasks/multiverse.rake

@@ -1,2 +1,6 @@
+# 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.
+
 # Guts of task are in a .rb file to allow requiring from external gems
 require "#{File.join(File.dirname(__FILE__))}/multiverse"

data/lib/tasks/tests.rake

@@ -1,3 +1,7 @@
+# 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.
+
 begin
   require 'rake/testtask'
 rescue LoadError
@@ -31,7 +35,6 @@ if defined? Rake::TestTask
       t.libs << "#{agent_home}/test"
       t.libs << "#{agent_home}/lib"
       t.pattern = Array(file_pattern)
-      t.verbose = true
     end
   end
 end

data/newrelic.yml

@@ -91,7 +91,7 @@ common: &default_settings
 # backport_fast_active_record_connection_lookup: false
 
 # If true, the agent captures attributes from browser monitoring.
-# browser_monitoring_attributes.enabled: false
+# browser_monitoring.attributes.enabled: false
 
 # Prefix of attributes to exclude from browser monitoring. Allows * as wildcard
 # at end.

data/newrelic_rpm.gemspec

@@ -45,7 +45,6 @@ https://github.com/newrelic/newrelic-ruby-agent/
 
   s.homepage = "https://github.com/newrelic/rpm"
   s.require_paths = ["lib"]
-  s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
   s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'rb-inotify', '0.9.10' # locked to support < Ruby 2.3 (and listen 3.0.8)
@@ -61,4 +60,8 @@ https://github.com/newrelic/newrelic-ruby-agent/
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-performance'
+  if RUBY_VERSION >= '2.7.0'
+    s.add_development_dependency 'simplecov'
+    s.add_development_dependency 'simplecov_json_formatter'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.8.0
+  version: 8.9.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -209,6 +209,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov_json_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -233,6 +261,7 @@ files:
 - ".gitignore"
 - ".project"
 - ".rubocop.yml"
+- ".simplecov"
 - ".yardopts"
 - Brewfile
 - CHANGELOG.md
@@ -258,6 +287,10 @@ files:
 - lib/new_relic/agent.rb
 - lib/new_relic/agent/adaptive_sampler.rb
 - lib/new_relic/agent/agent.rb
+- lib/new_relic/agent/agent/shutdown.rb
+- lib/new_relic/agent/agent/special_startup.rb
+- lib/new_relic/agent/agent/start_worker_thread.rb
+- lib/new_relic/agent/agent/startup.rb
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
 - lib/new_relic/agent/attribute_processing.rb
@@ -586,6 +619,7 @@ files:
 - lib/tasks/config.html.erb
 - lib/tasks/config.rake
 - lib/tasks/config.text.erb
+- lib/tasks/coverage_report.rake
 - lib/tasks/install.rake
 - lib/tasks/multiverse.rake
 - lib/tasks/multiverse.rb