newrelic_rpm 3.18.1.330 → 4.0.0.332

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -243,9 +243,7 @@ module NewRelic
         end
 
         def unmarshal(data)
-          NewRelic::LanguageSupport.with_cautious_gc do
-            Marshal.load(data)
-          end
+          Marshal.load(data)
         rescue StandardError => e
           ::NewRelic::Agent.logger.error "Failure unmarshalling message from Resque child process", e
           ::NewRelic::Agent.logger.debug Base64.encode64(data)

data/lib/new_relic/agent/pipe_service.rb

@@ -71,9 +71,7 @@ module NewRelic
       private
 
       def marshal_payload(data)
-        NewRelic::LanguageSupport.with_cautious_gc do
-          Marshal.dump(data)
-        end
+        Marshal.dump(data)
       end
 
       def write_to_pipe(endpoint, data)

data/lib/new_relic/agent/rules_engine.rb

@@ -50,23 +50,8 @@ module NewRelic
       # When multiple rules share the same prefix,
       # only apply the rule with the last instance of the prefix.
       # Note that the incoming rules are in reverse order to facilitate this.
-      if NewRelic::LanguageSupport.uniq_accepts_block?
-        def self.reject_rules_with_duplicate_prefixes!(rules)
-          rules.uniq! { |rule| rule.prefix }
-        end
-      else
-        def self.reject_rules_with_duplicate_prefixes!(rules)
-          unique_rules = {}
-
-          rules.reject! do |rule|
-            if unique_rules[rule.prefix]
-              true
-            else
-              unique_rules[rule.prefix] = rule
-              false
-            end
-          end
-        end
+      def self.reject_rules_with_duplicate_prefixes!(rules)
+        rules.uniq! { |rule| rule.prefix }
       end
 
       def initialize(rules=[], segment_term_rules=[])

data/lib/new_relic/agent/stats_engine.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/stats_engine/metric_stats'
-require 'new_relic/agent/stats_engine/samplers'
 require 'new_relic/agent/stats_engine/gc_profiler'
 require 'new_relic/agent/stats_engine/stats_hash'
 
@@ -12,7 +11,6 @@ module NewRelic
     # This class handles all the statistics gathering for the agent
     class StatsEngine
       include MetricStats
-      include Samplers
 
       attr_accessor :metric_rules
 

data/lib/new_relic/agent/stats_engine/metric_stats.rb

@@ -108,49 +108,6 @@ module NewRelic
           end
         end
 
-        # This method is deprecated and not thread safe, and should not be used
-        # by any new client code.
-        #
-        # Lookup the Stats object for a given unscoped metric, returning a new
-        # Stats object if one did not exist previously.
-        #
-        # @api public
-        # @deprecated Use {::NewRelic::Agent.record_metric} instead.
-        #
-        def get_stats_no_scope(metric_name)
-          get_stats(metric_name, false)
-        end
-
-        # This method is deprecated and not thread safe, and should not be used
-        # by any new client code. Use NewRelic::Agent.record_metric instead.
-        #
-        # If scoped_metric_only is true, only a scoped metric is created (used
-        # by rendering metrics which by definition are per controller only)
-        # Leaving second, unused parameter for compatibility
-        #
-        # @api public
-        # @deprecated Use {::NewRelic::Agent.record_metric} instead.
-        #
-        def get_stats(metric_name, _ = true, scoped_metric_only = false, scope = nil)
-          stats = nil
-          with_stats_lock do
-            if scoped_metric_only
-              stats = @stats_hash[NewRelic::MetricSpec.new(metric_name, scope)]
-            else
-              unscoped_spec = NewRelic::MetricSpec.new(metric_name)
-              unscoped_stats = @stats_hash[unscoped_spec]
-              if scope && scope != metric_name
-                scoped_spec = NewRelic::MetricSpec.new(metric_name, scope)
-                scoped_stats = @stats_hash[scoped_spec]
-                stats = NewRelic::Agent::ChainedStats.new(scoped_stats, unscoped_stats)
-              else
-                stats = unscoped_stats
-              end
-            end
-          end
-          stats
-        end
-
         # Helper for recording a straight value into the count
         def tl_record_supportability_metric_count(metric, value)
           real_name = "Supportability/#{metric}"
@@ -167,11 +124,6 @@ module NewRelic
           end
         end
 
-        # Renamed to reset!, here for backwards compatibility with 3rd-party
-        # gems (though this really isn't part of the public API).
-        # @deprecated
-        def reset_stats; reset!; end
-
         # merge data from previous harvests into this stats engine
         def merge!(other_stats_hash)
           with_stats_lock do

data/lib/new_relic/agent/supported_versions.rb

@@ -11,30 +11,22 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "~> 2.1.0", "~> 2.2.0", "~> 2.3.0"],
-        :experimental=> ["2.4.0-preview3"],
+        :supported   => ["2.0.0", "~> 2.1.0", "~> 2.2.0", "~> 2.3.0", "~> 2.4.0"],
+        :deprecated  => ["1.8.6", "1.8.7", "1.9.2", "1.9.3"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
-        :notes       => [
-          "1.8.7 includes support for Ruby Enterprise Edition (REE).",
-          "1.8.7 & REE require the 'json' gem to be present in your Gemfile/operating environment.",
-          "Last supported agent on 1.8.6 was 3.6.8.168."]
+        :notes       => ["Last supported agent for 1.8.7, 1.9.2, and 1.9.3 was 3.18.0.329.",
+                         "Last supported agent on 1.8.6 was 3.6.8.168."]
       },
       :jruby =>
       {
         :type        => :ruby,
         :name        => "JRuby",
-        :supported   => ["~> 1.7.0", "~> 9.0", "~> 9.1"],
+        :supported   => ["~> 9.0", "~> 9.1"],
+        :deprecated  => ["~> 1.7.0"],
         :url         => "http://jruby.org",
-        :feed        => "http://jruby.org/atom.xml"
-      },
-      :rbx =>
-      {
-        :type        => :ruby,
-        :name        => "Rubinius",
-        :supported   => ["~> 2.2.1"],
-        :url         => "http://rubini.us",
-        :feed        => "http://rubini.us/feed/atom.xml"
+        :feed        => "http://jruby.org/atom.xml",
+        :notes       => ["Last supported agent for ~> 1.7.0 was 3.18.0.329."]
       },
 
       # App servers
@@ -86,11 +78,12 @@ module NewRelic
       :rails =>
       {
         :type        => :web,
-        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~> 5.0.0"],
-        :deprecated  => ["~>2.0.0"],
+        :supported   => ["~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~> 5.0.0"],
+        :deprecated  => ["~>2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0"],
         :url         => "https://rubygems.org/gems/rails",
         :feed        => "https://rubygems.org/gems/rails/versions.atom",
-        :notes       => ["Last supported agent for 2.0.x was 3.6.8.168"]
+        :notes       => ["Last supported agent for ~>2.1.0, ~>2.2.0, and ~>2.3.0 was 3.18.0.329.",
+                         "Last supported agent for 2.0.x was 3.6.8.168."]
       },
       :sinatra =>
       {

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

@@ -9,7 +9,7 @@ module NewRelic
         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.

data/lib/new_relic/agent/transaction.rb

@@ -864,9 +864,6 @@ module NewRelic
         attributes.merge_custom_attributes(p)
       end
 
-      alias_method :set_user_attributes, :add_custom_attributes
-      alias_method :add_custom_parameters, :add_custom_attributes
-
       def recording_web_transaction?
         web_category?(@category)
       end

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

@@ -14,8 +14,6 @@ module NewRelic
 
         EMPTY_HASH = {}.freeze
 
-        CAN_BYTESLICE = String.instance_methods.include?(:byteslice)
-
         def initialize(filter)
           @filter = filter
 
@@ -148,15 +146,8 @@ module NewRelic
         # the end. It'll either remove the one-character-too-many we have, or
         # peel off the partial, mangled character left by the byteslice.
         def slice(incoming)
-          if CAN_BYTESLICE
-            result = incoming.to_s.byteslice(0, VALUE_LIMIT + 1)
-          else
-            # < 1.9.3 doesn't have byteslice, so we take off bytes instead.
-            result = incoming.to_s.bytes.take(VALUE_LIMIT + 1).pack("C*")
-          end
-
+          result = incoming.to_s.byteslice(0, VALUE_LIMIT + 1)
           result.chop!
-          result
         end
       end
     end

data/lib/new_relic/agent/vm.rb

@@ -5,7 +5,6 @@
 require 'new_relic/language_support'
 require 'new_relic/agent/vm/mri_vm'
 require 'new_relic/agent/vm/jruby_vm'
-require 'new_relic/agent/vm/rubinius_vm'
 
 module NewRelic
   module Agent
@@ -19,10 +18,8 @@ module NewRelic
       end
 
       def self.create_vm
-        if NewRelic::LanguageSupport.using_engine?('jruby')
+        if NewRelic::LanguageSupport.jruby?
           JRubyVM.new
-        elsif NewRelic::LanguageSupport.using_engine?('rbx')
-          RubiniusVM.new
         else
           MriVM.new
         end

data/lib/new_relic/agent/vm/jruby_vm.rb

@@ -26,9 +26,7 @@ module NewRelic
 
         def supports?(key)
           case key
-          when :gc_runs
-            RUBY_VERSION >= "1.9.2"
-          when :thread_count
+          when :gc_runs, :thread_count
             true
           else
             false

data/lib/new_relic/agent/vm/mri_vm.rb

@@ -57,26 +57,18 @@ module NewRelic
 
         def supports?(key)
           case key
-          when :gc_runs
-            RUBY_VERSION >= '1.9.2'
+          when :gc_runs, :total_allocated_object, :heap_live, :heap_free, :thread_count
+            true
           when :gc_total_time
             NewRelic::LanguageSupport.gc_profiler_enabled?
-          when :total_allocated_object
-            RUBY_VERSION >= '2.0.0'
           when :major_gc_count
             RUBY_VERSION >= '2.1.0'
           when :minor_gc_count
             RUBY_VERSION >= '2.1.0'
-          when :heap_live
-            RUBY_VERSION >= '1.9.3'
-          when :heap_free
-            RUBY_VERSION >= '1.9.3'
           when :method_cache_invalidations
             RUBY_VERSION >= '2.1.0'
           when :constant_cache_invalidations
             RUBY_VERSION >= '2.1.0'
-          when :thread_count
-            true
           else
             false
           end

data/lib/new_relic/control.rb

@@ -3,11 +3,10 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'yaml'
-require 'conditional_vendored_dependency_detection'
+require 'new_relic/dependency_detection'
 require 'new_relic/local_environment'
 require 'new_relic/language_support'
 require 'new_relic/helper'
-require 'new_relic/json_wrapper'
 
 require 'singleton'
 require 'erb'

data/lib/new_relic/control/frameworks/rails.rb

@@ -115,7 +115,7 @@ module NewRelic
         end
 
         def rails_version
-          @rails_version ||= NewRelic::VersionNumber.new(::Rails::VERSION::STRING)
+          @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)
         end
 
         protected

data/lib/new_relic/control/frameworks/rails3.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/rails'
-require 'new_relic/rack/error_collector'
 
 module NewRelic
   class Control
@@ -28,7 +27,7 @@ module NewRelic
         end
 
         def version
-          @rails_version ||= NewRelic::VersionNumber.new(::Rails::VERSION::STRING)
+          @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)
         end
 
         protected

data/lib/new_relic/control/frameworks/rails4.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/rails3'
-require 'new_relic/rack/error_collector'
+
 module NewRelic
   class Control
     module Frameworks

data/lib/new_relic/control/frameworks/rails5.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/rails4'
-require 'new_relic/rack/error_collector'
+
 module NewRelic
   class Control
     module Frameworks

data/lib/new_relic/control/instance_methods.rb

@@ -86,7 +86,7 @@ module NewRelic
           Agent.logger.error("Attempted to start agent in #{env.inspect} environment, but agent was already running in #{@started_in_env.inspect}",
                              "The agent will continue running in #{@started_in_env.inspect}. To alter this, ensure the desired environment is set before the agent starts.")
         else
-          Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.",
+          Agent.logger.info("Starting the New Relic agent version #{NewRelic::VERSION::STRING} in #{env.inspect} environment.",
                             "To prevent agent startup add a NEW_RELIC_AGENT_ENABLED=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
         end
 

data/{vendor/gems/dependency_detection-0.0.1.build/lib → lib/new_relic}/dependency_detection.rb

@@ -2,7 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'dependency_detection/version'
 module DependencyDetection
 
   module_function

data/lib/new_relic/helper.rb

@@ -9,20 +9,13 @@ module NewRelic
   module Helper
     extend self
 
-    # confirm a string is correctly encoded (in >= 1.9)
+    # Confirm a string is correctly encoded,
     # If not force the encoding to ASCII-8BIT (binary)
-    if NewRelic::LanguageSupport.supports_string_encodings?
-      def correctly_encoded(string)
-        return string unless string.is_a? String
-        # The .dup here is intentional, since force_encoding mutates the target,
-        # and we don't know who is going to use this string downstream of us.
-        string.valid_encoding? ? string : string.dup.force_encoding("ASCII-8BIT")
-      end
-    else
-      #noop
-      def correctly_encoded(string)
-        string
-      end
+    def correctly_encoded(string)
+      return string unless string.is_a? String
+      # The .dup here is intentional, since force_encoding mutates the target,
+      # and we don't know who is going to use this string downstream of us.
+      string.valid_encoding? ? string : string.dup.force_encoding(Encoding::ASCII_8BIT)
     end
 
     def instance_method_visibility(klass, method_name)

data/lib/new_relic/language_support.rb

@@ -2,158 +2,63 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-module NewRelic::LanguageSupport
-  extend self
-
-  RUBY_VERSION_192 = '1.9.2'.freeze
-
-  # need to use syck rather than psych when possible
-  def needs_syck?
-    !NewRelic::LanguageSupport.using_engine?('jruby') &&
-         NewRelic::LanguageSupport.using_version?('1.9.2')
-  end
-
-  @@forkable = nil
-  def can_fork?
-    # this is expensive to check, so we should only check once
-    return @@forkable if @@forkable != nil
-
-    if Process.respond_to?(:fork)
-      # if this is not 1.9.2 or higher, we have to make sure
-      @@forkable = ::RUBY_VERSION < '1.9.2' ? test_forkability : true
-    else
-      @@forkable = false
+module NewRelic
+  module LanguageSupport
+    extend self
+
+    @@forkable = nil
+    def can_fork?
+      # this is expensive to check, so we should only check once
+      return @@forkable if @@forkable != nil
+      @@forkable = Process.respond_to?(:fork)
     end
 
-    @@forkable
-  end
-
-  def using_engine?(engine)
-    if defined?(::RUBY_ENGINE)
-      ::RUBY_ENGINE == engine
-    else
-      engine == 'ruby'
-    end
-  end
-
-  def broken_gc?
-    NewRelic::LanguageSupport.using_version?('1.8.7') &&
-      RUBY_PATCHLEVEL < 348 &&
-      !NewRelic::LanguageSupport.using_engine?('jruby') &&
-      !NewRelic::LanguageSupport.using_engine?('rbx')
-  end
-
-  def with_disabled_gc
-    if defined?(::GC) && ::GC.respond_to?(:disable)
-      val = nil
-      begin
-        ::GC.disable
-        val = yield
-      ensure
-        ::GC.enable
-      end
-      val
-    else
-      yield
+    def gc_profiler_usable?
+      defined?(::GC::Profiler) && !jruby?
     end
-  end
 
-  def with_cautious_gc
-    if broken_gc?
-      with_disabled_gc { yield }
-    else
-      yield
+    def gc_profiler_enabled?
+      gc_profiler_usable? && ::GC::Profiler.enabled? && !::NewRelic::Agent.config[:disable_gc_profiler]
     end
-  end
 
-  def gc_profiler_usable?
-    if defined?(::GC::Profiler) && !jruby?
-      true
-    else
-      false
+    def object_space_usable?
+      if defined?(::JRuby) && JRuby.respond_to?(:runtime)
+        JRuby.runtime.is_object_space_enabled
+      else
+        defined?(::ObjectSpace)
+      end
     end
-  end
 
-  def gc_profiler_enabled?
-    if gc_profiler_usable? && ::GC::Profiler.enabled? && !::NewRelic::Agent.config[:disable_gc_profiler]
-      true
-    else
-      false
+    def jruby?
+      RUBY_ENGINE == 'jruby'
     end
-  end
 
-  def object_space_usable?
-    if defined?(::JRuby) && JRuby.respond_to?(:runtime)
-      JRuby.runtime.is_object_space_enabled
-    elsif defined?(::ObjectSpace) && !rubinius?
-      true
-    else
-      false
-    end
-  end
-
-  if ::RUBY_VERSION >= RUBY_VERSION_192
-    def uniq_accepts_block?; true; end
-  else
-    def uniq_accepts_block?; false; end
-  end
-
-  def jruby?
-    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-  end
-
-  def rubinius?
-    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-  end
-
-  def ree?
-    defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
-  end
-
-  def using_version?(version)
-    numbers = version.split('.')
-    numbers == ::RUBY_VERSION.split('.')[0, numbers.size]
-  end
-
-  def supports_string_encodings?
-    RUBY_VERSION >= '1.9.0'
-  end
-
-  def constantize(const_name)
-    const_name.to_s.sub(/\A::/,'').split('::').inject(Object) do |namespace, name|
-      begin
-        result = namespace.const_get(name)
-
-        # const_get looks up the inheritence chain, so if it's a class
-        # in the constant make sure we found the one in our namespace.
-        #
-        # Can't help if the constant isn't a class...
-        if result.is_a?(Module)
-          expected_name = "#{namespace}::#{name}".gsub(/^Object::/, "")
-          return unless expected_name == result.to_s
+    def constantize(const_name)
+      const_name.to_s.sub(/\A::/,'').split('::').inject(Object) do |namespace, name|
+        begin
+          result = namespace.const_get(name)
+
+          # const_get looks up the inheritence chain, so if it's a class
+          # in the constant make sure we found the one in our namespace.
+          #
+          # Can't help if the constant isn't a class...
+          if result.is_a?(Module)
+            expected_name = "#{namespace}::#{name}".gsub(/^Object::/, "")
+            return unless expected_name == result.to_s
+          end
+
+          result
+        rescue NameError
+          nil
         end
-
-        result
-      rescue NameError
-        nil
       end
     end
-  end
-
-  def test_forkability
-    child = Process.fork { exit! }
-    # calling wait here doesn't seem like it should necessary, but it seems to
-    # resolve some weird edge cases with resque forking.
-    Process.wait child
-    true
-  rescue NotImplementedError
-    false
-  end
 
-  def bundled_gem?(gem_name)
-    defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
-  rescue => e
-    ::NewRelic::Agent.logger.info("Could not determine if third party #{gem_name} gem is installed", e)
-    false
+    def bundled_gem?(gem_name)
+      defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
+    rescue => e
+      ::NewRelic::Agent.logger.info("Could not determine if third party #{gem_name} gem is installed", e)
+      false
+    end
   end
 end