newrelic_rpm 3.18.1.330 → 4.0.0.332

data/lib/new_relic/agent/agent.rb

@@ -376,32 +376,16 @@ module NewRelic
 
           def should_install_exit_handler?
             (
-              Agent.config[:send_data_on_exit]                  &&
-              !NewRelic::LanguageSupport.using_engine?('jruby') &&
+              Agent.config[:send_data_on_exit]  &&
+              !NewRelic::LanguageSupport.jruby? &&
               !sinatra_classic_app?
             )
           end
 
-          # There's an MRI 1.9 bug that loses exit codes in at_exit blocks.
-          # A workaround is necessary to get correct exit codes for the agent's
-          # test suites.
-          # http://bugs.ruby-lang.org/issues/5218
-          def need_exit_code_workaround?
-            defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)
-          end
-
           def install_exit_handler
             return unless should_install_exit_handler?
             NewRelic::Agent.logger.debug("Installing at_exit handler")
-            at_exit do
-              if need_exit_code_workaround?
-                exit_status = $!.status if $!.is_a?(SystemExit)
-                shutdown
-                exit exit_status if exit_status
-              else
-                shutdown
-              end
-            end
+            at_exit { shutdown }
           end
 
           # Classy logging of the agent version and the current pid,
@@ -535,14 +519,6 @@ module NewRelic
             return false
           end
 
-          unless NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
-            NewRelic::Agent.logger.error "JSON marshaller requested, but the 'json' gem was not available. ",
-              "You will need to: 1) upgrade to Ruby 1.9.3 or newer (strongly recommended), ",
-              "2) add the 'json' gem to your Gemfile or operating environment, ",
-              "or 3) use a version of newrelic_rpm prior to 3.14.0."
-            return false
-          end
-
           return true
         end
 
@@ -569,11 +545,6 @@ module NewRelic
           @sql_sampler.reset!
         end
 
-        # Deprecated, and not part of the public API, but here for backwards
-        # compatibility because some 3rd-party gems call it.
-        # @deprecated
-        def reset_stats; drop_buffered_data; end
-
         # Clear out state for any objects that we know lock from our parents
         # This is necessary for cases where we're in a forked child and Ruby
         # might be holding locks for background thread that aren't there anymore.

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -87,12 +87,8 @@ module NewRelic
 
         def raise_unsupported_error
           msg = <<-EOF
-Thread profiling is only supported on 1.9.2 and greater versions of Ruby.
-We detected running agents capable of profiling, but the profile started with
-an agent running Ruby #{RUBY_VERSION}.
-
-Profiling again might select an appropriate agent, but we recommend running a
-consistent version of Ruby across your application for better results.
+Thread profiling is not supported for Resque processes. If you did not intend to
+profile a Resque process, profiling again might select an appropriate agent.
           EOF
           raise_command_error(msg)
         end

data/lib/new_relic/agent/configuration/default_source.rb

@@ -127,13 +127,6 @@ module NewRelic
           Proc.new { NewRelic::Control.instance.local_env.discovered_dispatcher }
         end
 
-        # On Rubies with string encodings support (1.9.x+), default to always
-        # normalize encodings since it's safest and fast. Without that support
-        # the conversions are too expensive, so only enable if overridden to.
-        def self.normalize_json_string_encodings
-          Proc.new { NewRelic::LanguageSupport.supports_string_encodings? }
-        end
-
         def self.thread_profiler_enabled
           Proc.new { NewRelic::Agent::Threading::BacktraceService.is_supported? }
         end
@@ -1204,7 +1197,7 @@ module NewRelic
           :description => 'Controls whether to check on running a transaction whether to respawn the harvest thread.'
         },
         :normalize_json_string_encodings => {
-          :default => DefaultSource.normalize_json_string_encodings,
+          :default => true,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,

data/lib/new_relic/agent/configuration/yaml_source.rb

@@ -100,7 +100,7 @@ module NewRelic
 
         def process_yaml(file, env, config, path)
           if file
-            confighash = with_yaml_engine { YAML.load(file) }
+            confighash = YAML.load(file)
             unless confighash.key?(env)
               log_failure("Config file at #{path} doesn't include a '#{env}' section!")
             end
@@ -119,17 +119,6 @@ module NewRelic
           end
         end
 
-        def with_yaml_engine
-          return yield unless NewRelic::LanguageSupport.needs_syck?
-
-          yamler = ::YAML::ENGINE.yamler
-          ::YAML::ENGINE.yamler = 'syck'
-          result = yield
-          ::YAML::ENGINE.yamler = yamler
-          result
-        end
-
-
         def booleanify_values(config, *keys)
           # auto means defer ro default
           keys.each do |option|

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'digest'
+require 'json'
 
 require 'new_relic/agent/inbound_request_monitor'
 require 'new_relic/agent/transaction_state'
@@ -129,7 +130,7 @@ module NewRelic
           content_length,
           state.request_guid
         ]
-        payload = obfuscator.obfuscate(NewRelic::JSONWrapper.dump(payload))
+        payload = obfuscator.obfuscate(::JSON.dump(payload))
       end
 
       def set_transaction_attributes(state)

data/lib/new_relic/agent/cross_app_tracing.rb

@@ -3,6 +3,8 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require 'json'
+
 module NewRelic
   module Agent
     module CrossAppTracing
@@ -57,7 +59,7 @@ module NewRelic
 
       def insert_request_headers(request, txn_guid, trip_id, path_hash, synthetics_header)
         cross_app_id = NewRelic::Agent.config[:cross_process_id]
-        txn_data  = NewRelic::JSONWrapper.dump([txn_guid, false, trip_id, path_hash])
+        txn_data  = ::JSON.dump([txn_guid, false, trip_id, path_hash])
 
         request[NR_ID_HEADER]  = obfuscator.obfuscate(cross_app_id)
         request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
@@ -93,7 +95,7 @@ module NewRelic
         decoded_appdata.set_encoding(::Encoding::UTF_8) if
           decoded_appdata.respond_to?(:set_encoding)
 
-        NewRelic::JSONWrapper.load(decoded_appdata)
+        ::JSON.load(decoded_appdata)
       end
 
       def valid_cross_app_id?(xp_id)

data/lib/new_relic/agent/datastores/mongo.rb

@@ -16,7 +16,7 @@ module NewRelic
         end
 
         def self.is_unsupported_2x?
-          defined?(::Mongo::VERSION) && VersionNumber.new(::Mongo::VERSION).major_version == 2 &&
+          defined?(::Mongo::VERSION) && Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
             !self.is_monitoring_enabled?
         end
 

data/lib/new_relic/agent/datastores/redis.rb

@@ -89,7 +89,7 @@ module NewRelic
         end
 
         def self.is_supported_version?
-          ::NewRelic::VersionNumber.new(::Redis::VERSION) >= ::NewRelic::VersionNumber.new("3.0.0")
+          Gem::Version.new(::Redis::VERSION) >= Gem::Version.new("3.0.0")
         end
 
         def self.ellipsize(result, string)

data/lib/new_relic/agent/encoding_normalizer.rb

@@ -8,8 +8,7 @@ module NewRelic
   module Agent
     module EncodingNormalizer
       def self.normalize_string(raw_string)
-        @normalizer ||= choose_normalizer
-        @normalizer.normalize(raw_string)
+        EncodingNormalizer.normalize(raw_string)
       end
 
       def self.normalize_object(object)
@@ -37,14 +36,6 @@ module NewRelic
         end
       end
 
-      def self.choose_normalizer
-        if NewRelic::LanguageSupport.supports_string_encodings?
-          EncodingNormalizer
-        else
-          IconvNormalizer
-        end
-      end
-
       module EncodingNormalizer
         def self.normalize(raw_string)
           encoding = raw_string.encoding
@@ -69,16 +60,6 @@ module NewRelic
           normalized
         end
       end
-
-      module IconvNormalizer
-        def self.normalize(raw_string)
-          if @iconv.nil?
-            require 'iconv'
-            @iconv = Iconv.new('utf-8', 'iso-8859-1')
-          end
-          @iconv.iconv(raw_string)
-        end
-      end
     end
   end
 end

data/lib/new_relic/agent/error_collector.rb

@@ -14,8 +14,8 @@ module NewRelic
       # Maximum possible length of the queue - defaults to 20, may be
       # made configurable in the future. This is a tradeoff between
       # memory and data retention
-      MAX_ERROR_QUEUE_LENGTH = 20 unless defined? MAX_ERROR_QUEUE_LENGTH
-      EXCEPTION_TAG_IVAR = :'@__nr_seen_exception' unless defined? EXCEPTION_TAG_IVAR
+      MAX_ERROR_QUEUE_LENGTH = 20
+      EXCEPTION_TAG_IVAR = :'@__nr_seen_exception'
 
       attr_reader :error_trace_aggregator, :error_event_aggregator
 
@@ -180,12 +180,16 @@ module NewRelic
       # detection and soft fail-safe. Returns nil if the method does
       # not exist
       def sense_method(object, method)
-        object.send(method) if object.respond_to?(method)
+        object.__send__(method) if object.respond_to?(method)
       end
 
       # extracts a stack trace from the exception for debugging purposes
       def extract_stack_trace(exception)
-        actual_exception = sense_method(exception, :cause) || sense_method(exception, :original_exception) || exception
+        actual_exception = if defined?(Rails) && Rails::VERSION::MAJOR < 5
+                             sense_method(exception, :original_exception) || exception
+                           else
+                             exception
+                           end
         sense_method(actual_exception, :backtrace) || '<no stack trace>'
       end
 
@@ -225,8 +229,6 @@ module NewRelic
         noticed_error.line_number = sense_method(exception, :line_number)
         noticed_error.stack_trace = extract_stack_trace(exception)
 
-        handle_deprecated_options(options)
-
         noticed_error.attributes_from_notice_error = options.delete(:custom_params) || {}
 
         # Any options that are passed to notice_error which aren't known keys
@@ -236,21 +238,6 @@ module NewRelic
         noticed_error
       end
 
-      DEPRECATED_OPTIONS_MSG = "Passing %s to notice_error is no longer supported. Set values on the enclosing transaction or record them as custom attributes instead.".freeze
-      DEPRECATED_OPTIONS = [:request_params, :request, :referer].freeze
-
-      # Old options no longer used by notice_error can still be passed. If they
-      # are, they shouldn't get merged into custom attributes. Delete and
-      # warn callers so they can fix their calls to notice_error.
-      def handle_deprecated_options(options)
-        DEPRECATED_OPTIONS.each do |deprecated|
-          if options.include?(deprecated)
-            NewRelic::Agent.logger.warn(DEPRECATED_OPTIONS_MSG % deprecated)
-            options.delete(deprecated)
-          end
-        end
-      end
-
       # *Use sparingly for difficult to track bugs.*
       #
       # Track internal agent errors for communication back to New Relic.

data/lib/new_relic/agent/inbound_request_monitor.rb

@@ -10,6 +10,9 @@
 # be called when the agent is fully configured. That method is expected to
 # subscribe to the necessary request events, such as before_call and after_call
 # for the monitor to do its work.
+
+require 'json'
+
 module NewRelic
   module Agent
     class InboundRequestMonitor
@@ -30,7 +33,7 @@ module NewRelic
 
       def deserialize_header(encoded_header, key)
         decoded_header = obfuscator.deobfuscate(encoded_header)
-        NewRelic::JSONWrapper.load(decoded_header)
+        ::JSON.load(decoded_header)
       rescue => err
         # If we have a failure of any type here, just return nil and carry on
         NewRelic::Agent.logger.debug("Failure deserializing encoded header '#{key}' in #{self.class}, #{err.class}, #{err.message}")

data/lib/new_relic/agent/instrumentation/active_record_helper.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/datastores/metric_helper'
-require 'new_relic/agent/deprecator'
 
 module NewRelic
   module Agent
@@ -83,8 +82,8 @@ module NewRelic
           end
         end
 
-        ACTIVE_RECORD = "ActiveRecord".freeze unless defined?(ACTIVE_RECORD)
-        OTHER         = "other".freeze unless defined?(OTHER)
+        ACTIVE_RECORD = "ActiveRecord".freeze
+        OTHER         = "other".freeze
 
         def product_operation_collection_for name, sql, adapter_name
           product   = map_product(adapter_name)
@@ -94,23 +93,8 @@ module NewRelic
           NewRelic::Agent::Datastores::MetricHelper.product_operation_collection_for product, operation, model, ACTIVE_RECORD
         end
 
-        # @deprecated
-        def rollup_metrics_for(*_)
-          NewRelic::Agent::Deprecator.deprecate("ActiveRecordHelper.rollup_metrics_for",
-                                                "NewRelic::Agent::Datastores::MetricHelper.metrics_for")
-
-          rollup_metric = if NewRelic::Agent::Transaction.recording_web_transaction?
-            NewRelic::Agent::Datastores::MetricHelper::WEB_ROLLUP_METRIC
-          else
-            NewRelic::Agent::Datastores::MetricHelper::OTHER_ROLLUP_METRIC
-          end
-
-          [rollup_metric,
-           NewRelic::Agent::Datastores::MetricHelper::ROLLUP_METRIC]
-        end
-
-        SPACE = ' '.freeze unless defined?(SPACE)
-        EMPTY = [].freeze unless defined?(EMPTY)
+        SPACE = ' '.freeze
+        EMPTY = [].freeze
 
         def split_name(name)
           if name && name.respond_to?(:split)
@@ -150,7 +134,7 @@ module NewRelic
           'Destroy' => 'destroy',
           'Update'  => 'update',
           'Save'    => 'save'
-        }.freeze unless defined?(OPERATION_NAMES)
+        }.freeze
 
         def map_operation(raw_operation)
           direct_op = OPERATION_NAMES[raw_operation]
@@ -195,9 +179,9 @@ module NewRelic
 
           # https://rubygems.org/gems/activerecord-oracle_enhanced-adapter
           "oracle_enhanced" => "Oracle"
-        }.freeze unless defined?(PRODUCT_NAMES)
+        }.freeze
 
-        ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze unless defined?(ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
+        ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
 
         def map_product(adapter_name)
           PRODUCT_NAMES.fetch(adapter_name,
@@ -214,17 +198,17 @@ module NewRelic
 
             "postgresql"     => :postgres,
             "jdbcpostgresql" => :postgres
-          }.freeze unless defined?(PRODUCT_SYMBOLS)
+          }.freeze
 
           DATASTORE_DEFAULT_PORTS = {
             :mysql    => "3306",
             :postgres => "5432"
-          }.freeze unless defined?(DATASTORE_DEFAULT_PORTS)
+          }.freeze
 
-          DEFAULT = "default".freeze unless defined?(DEFAULT)
-          UNKNOWN = "unknown".freeze unless defined?(UNKNOWN)
-          SLASH = "/".freeze unless defined?(SLASH)
-          LOCALHOST = "localhost".freeze unless defined?(LOCALHOST)
+          DEFAULT = "default".freeze
+          UNKNOWN = "unknown".freeze
+          SLASH = "/".freeze
+          LOCALHOST = "localhost".freeze
 
           def host(config)
             return UNKNOWN unless config
@@ -267,7 +251,7 @@ module NewRelic
             UNKNOWN
           end
 
-          SUPPORTED_ADAPTERS = [:mysql, :postgres].freeze unless defined?(SUPPORTED_ADAPTERS)
+          SUPPORTED_ADAPTERS = [:mysql, :postgres].freeze
 
           def supported_adapter? config
             config && SUPPORTED_ADAPTERS.include?(PRODUCT_SYMBOLS[config[:adapter]])

data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb

@@ -11,7 +11,7 @@ module NewRelic
   module Agent
     module Instrumentation
       class ActiveRecordSubscriber < EventedSubscriber
-        CACHED_QUERY_NAME = 'CACHE'.freeze unless defined? CACHED_QUERY_NAME
+        CACHED_QUERY_NAME = 'CACHE'.freeze
 
         def initialize
           # We cache this in an instance variable to avoid re-calling method

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -38,15 +38,14 @@ module NewRelic
           def self.included(clazz)
             clazz.extend(ClassMethodsShim)
           end
-          def newrelic_notice_error(*args); end
           def new_relic_trace_controller_action(*args); yield; end
           def perform_action_with_newrelic_trace(*args); yield; end
         end
 
-        NR_DO_NOT_TRACE_KEY   = :'@do_not_trace'   unless defined?(NR_DO_NOT_TRACE_KEY  )
-        NR_IGNORE_APDEX_KEY   = :'@ignore_apdex'   unless defined?(NR_IGNORE_APDEX_KEY  )
-        NR_IGNORE_ENDUSER_KEY = :'@ignore_enduser' unless defined?(NR_IGNORE_ENDUSER_KEY)
-        NR_DEFAULT_OPTIONS    = {}.freeze          unless defined?(NR_DEFAULT_OPTIONS   )
+        NR_DO_NOT_TRACE_KEY   = :'@do_not_trace'
+        NR_IGNORE_APDEX_KEY   = :'@ignore_apdex'
+        NR_IGNORE_ENDUSER_KEY = :'@ignore_enduser'
+        NR_DEFAULT_OPTIONS    = {}.freeze
 
         # @api public
         module ClassMethods

data/lib/new_relic/agent/instrumentation/curb.rb

@@ -5,11 +5,11 @@
 DependencyDetection.defer do
   named :curb
 
-  CURB_MIN_VERSION = ::NewRelic::VersionNumber.new("0.8.1")
+  CURB_MIN_VERSION = Gem::Version.new("0.8.1")
 
   depends_on do
     defined?(::Curl) && defined?(::Curl::CURB_VERSION) &&
-      ::NewRelic::VersionNumber.new(::Curl::CURB_VERSION) >= CURB_MIN_VERSION
+      Gem::Version.new(::Curl::CURB_VERSION) >= CURB_MIN_VERSION
   end
 
   executes do