newrelic_rpm 3.18.1.330 → 4.0.0.332

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

@@ -25,15 +25,15 @@ DependencyDetection.defer do
   # so we could safely subscribe and not be clobbered by future subscribers,
   # but alas, it does not yet.
 
-  EXCON_MIN_VERSION = ::NewRelic::VersionNumber.new("0.10.1")
-  EXCON_MIDDLEWARE_MIN_VERSION = ::NewRelic::VersionNumber.new("0.19.0")
+  EXCON_MIN_VERSION = Gem::Version.new("0.10.1")
+  EXCON_MIDDLEWARE_MIN_VERSION = Gem::Version.new("0.19.0")
 
   depends_on do
     defined?(::Excon) && defined?(::Excon::VERSION)
   end
 
   executes do
-    excon_version = NewRelic::VersionNumber.new(::Excon::VERSION)
+    excon_version = Gem::Version.new(::Excon::VERSION)
     if excon_version >= EXCON_MIN_VERSION
       install_excon_instrumentation(excon_version)
     else

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

@@ -15,7 +15,7 @@ module NewRelic
         FORMAT_REGEX   = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
         VERSION_REGEX  = /:version(\/|$)/.freeze
         EMPTY_STRING   = ''.freeze
-        MIN_VERSION    = VersionNumber.new("0.2.0")
+        MIN_VERSION    = Gem::Version.new("0.2.0")
         PIPE_STRING    = '|'.freeze
 
         def handle_transaction(endpoint, class_name, version)
@@ -30,7 +30,7 @@ module NewRelic
           Transaction.set_default_transaction_name(txn_name, :grape, node_name)
         end
 
-        if defined?(Grape::VERSION) && VersionNumber.new(::Grape::VERSION) >= VersionNumber.new("0.16.0")
+        if defined?(Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
           def name_for_transaction(route, class_name, version)
             action_name = route.path.sub(FORMAT_REGEX, EMPTY_STRING)
             method_name = route.request_method
@@ -86,7 +86,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(::Grape::VERSION) &&
-      ::NewRelic::VersionNumber.new(::Grape::VERSION) >= ::NewRelic::Agent::Instrumentation::GrapeInstrumentation::MIN_VERSION
+      Gem::Version.new(::Grape::VERSION) >= ::NewRelic::Agent::Instrumentation::GrapeInstrumentation::MIN_VERSION
   end
 
   depends_on do

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

@@ -12,8 +12,8 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    minimum_supported_version = NewRelic::VersionNumber.new(HTTPCLIENT_MIN_VERSION)
-    current_version = NewRelic::VersionNumber.new(HTTPClient::VERSION)
+    minimum_supported_version = Gem::Version.new(HTTPCLIENT_MIN_VERSION)
+    current_version = Gem::Version.new(HTTPClient::VERSION)
 
     current_version >= minimum_supported_version
   end

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -12,13 +12,13 @@ module NewRelic
           MEMCACHED = "Memcached".freeze
           METHODS = [:get, :set, :add, :incr, :decr, :delete, :replace, :append, :prepend, :cas]
           SEND_MULTIGET_METRIC_NAME = "get_multi_request".freeze
-          DATASTORE_INSTANCES_SUPPORTED_VERSION = ::NewRelic::VersionNumber.new '2.6.4'
+          DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new '2.6.4'
           SLASH = '/'.freeze
           UNKNOWN = 'unknown'.freeze
           LOCALHOST = 'localhost'.freeze
 
           def supports_datastore_instances?
-            DATASTORE_INSTANCES_SUPPORTED_VERSION <= ::Dalli::VERSION
+            DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
           end
 
           def instrument_methods

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

@@ -15,8 +15,8 @@ module NewRelic
       class MiddlewareProxy
         include MiddlewareTracing
 
-        ANONYMOUS_CLASS   = "AnonymousClass".freeze unless defined?(ANONYMOUS_CLASS)
-        OBJECT_CLASS_NAME = "Object".freeze unless defined?(OBJECT_CLASS_NAME)
+        ANONYMOUS_CLASS   = "AnonymousClass".freeze
+        OBJECT_CLASS_NAME = "Object".freeze
 
         # This class is used to wrap classes that are passed to
         # Rack::Builder#use without synchronously instantiating those classes.

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

@@ -26,7 +26,7 @@ module NewRelic
   module Agent
     module Instrumentation
       module MiddlewareTracing
-        TXN_STARTED_KEY = 'newrelic.transaction_started'.freeze unless defined?(TXN_STARTED_KEY)
+        TXN_STARTED_KEY = 'newrelic.transaction_started'.freeze
 
         def _nr_has_middleware_tracing
           true
@@ -56,9 +56,7 @@ module NewRelic
           end
         end
 
-        # the trailing unless is for the benefit for Ruby 1.8.7 and can be removed
-        # when it is deprecated.
-        CONTENT_TYPE = 'Content-Type'.freeze unless defined?(CONTENT_TYPE)
+        CONTENT_TYPE = 'Content-Type'.freeze
 
         def capture_response_content_type(state, result)
           if result.is_a?(Array) && state.current_transaction
@@ -67,9 +65,7 @@ module NewRelic
           end
         end
 
-        # the trailing unless is for the benefit for Ruby 1.8.7 and can be removed
-        # when it is deprecated.
-        CONTENT_LENGTH = 'Content-Length'.freeze unless defined?(CONTENT_LENGTH)
+        CONTENT_LENGTH = 'Content-Length'.freeze
 
         def capture_response_content_length(state, result)
           if result.is_a?(Array) && state.current_transaction

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

@@ -9,23 +9,21 @@ module NewRelic
       # Record queue time metrics based on any of three headers
       # which can be set on the request.
       module QueueTime
-        unless defined?(REQUEST_START_HEADER)
-          REQUEST_START_HEADER    = 'HTTP_X_REQUEST_START'.freeze
-          QUEUE_START_HEADER      = 'HTTP_X_QUEUE_START'.freeze
-          MIDDLEWARE_START_HEADER = 'HTTP_X_MIDDLEWARE_START'.freeze
-          ALL_QUEUE_METRIC        = 'WebFrontend/QueueTime'.freeze
-          # any timestamps before this are thrown out and the parser
-          # will try again with a larger unit (2000/1/1 UTC)
-          EARLIEST_ACCEPTABLE_TIME = Time.at(946684800)
+        REQUEST_START_HEADER    = 'HTTP_X_REQUEST_START'.freeze
+        QUEUE_START_HEADER      = 'HTTP_X_QUEUE_START'.freeze
+        MIDDLEWARE_START_HEADER = 'HTTP_X_MIDDLEWARE_START'.freeze
+        ALL_QUEUE_METRIC        = 'WebFrontend/QueueTime'.freeze
+        # any timestamps before this are thrown out and the parser
+        # will try again with a larger unit (2000/1/1 UTC)
+        EARLIEST_ACCEPTABLE_TIME = Time.at(946684800)
 
-          CANDIDATE_HEADERS = [
-            REQUEST_START_HEADER,
-            QUEUE_START_HEADER,
-            MIDDLEWARE_START_HEADER
-          ].freeze
+        CANDIDATE_HEADERS = [
+          REQUEST_START_HEADER,
+          QUEUE_START_HEADER,
+          MIDDLEWARE_START_HEADER
+        ].freeze
 
-          DIVISORS = [1_000_000, 1_000, 1]
-        end
+        DIVISORS = [1_000_000, 1_000, 1]
 
         module_function
 

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

@@ -7,52 +7,6 @@ require 'new_relic/agent/instrumentation/controller_instrumentation'
 module NewRelic
   module Agent
     module Instrumentation
-      # == Instrumentation for Rack
-      #
-      # Since version 3.9.0, New Relic instruments Rack middlewares by default.
-      # As a result, this entire module has been deprecated.
-      #
-      # @api public
-      # @deprecated
-      #
-      module Rack
-        include ControllerInstrumentation
-
-        def newrelic_request_headers(_)
-          @newrelic_request.env
-        end
-
-        def call_with_newrelic(*args)
-          @newrelic_request = ::Rack::Request.new(args.first)
-          perform_action_with_newrelic_trace(:category => :middleware, :request => @newrelic_request) do
-            result = call_without_newrelic(*args)
-            # Ignore cascaded calls
-            Transaction.abort_transaction! if result.first == 404
-            result
-          end
-        end
-
-        def self.included middleware #:nodoc:
-          middleware.class_eval do
-            alias call_without_newrelic call
-            alias call call_with_newrelic
-          end
-        end
-
-        def self.extended middleware #:nodoc:
-          middleware.class_eval do
-            class << self
-              alias call_without_newrelic call
-              alias call call_with_newrelic
-            end
-          end
-        end
-
-        def _nr_has_middleware_tracing
-          true
-        end
-      end
-
       module RackHelpers
         def self.version_supported?
           rack_version_supported? || puma_rack_version_supported?
@@ -61,16 +15,16 @@ module NewRelic
         def self.rack_version_supported?
           return false unless defined? ::Rack
 
-          version = ::NewRelic::VersionNumber.new(::Rack.release)
-          min_version = ::NewRelic::VersionNumber.new('1.1.0')
+          version = Gem::Version.new(::Rack.release)
+          min_version = Gem::Version.new('1.1.0')
           version >= min_version
         end
 
         def self.puma_rack_version_supported?
           return false unless defined? ::Puma::Const::PUMA_VERSION
 
-          version = ::NewRelic::VersionNumber.new(::Puma::Const::PUMA_VERSION)
-          min_version = ::NewRelic::VersionNumber.new('2.12.0')
+          version = Gem::Version.new(::Puma::Const::PUMA_VERSION)
+          min_version = Gem::Version.new('2.12.0')
           version >= min_version
         end
 

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

@@ -58,7 +58,7 @@ module NewRelic
         end
 
         def self.is_supported_version?
-          ::NewRelic::VersionNumber.new(::Rake::VERSION) >= ::NewRelic::VersionNumber.new("10.0.0")
+          Gem::Version.new(::Rake::VERSION) >= Gem::Version.new("10.0.0")
         end
 
         def self.safe_from_third_party_gem?

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

@@ -6,8 +6,7 @@ DependencyDetection.defer do
   @name = :resque
 
   depends_on do
-    defined?(::Resque::Job) && !NewRelic::Agent.config[:disable_resque]  &&
-      !NewRelic::LanguageSupport.using_version?('1.9.1')
+    defined?(::Resque::Job) && !NewRelic::Agent.config[:disable_resque]
   end
 
   executes do

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

@@ -49,7 +49,6 @@ DependencyDetection.defer do
       # we can't be sure that rack is available when this file is first required.
       require 'new_relic/rack/agent_hooks'
       require 'new_relic/rack/browser_monitoring'
-      require 'new_relic/rack/error_collector'
 
       ::Sinatra::Base.class_eval do
         class << self

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

@@ -50,10 +50,10 @@ end
 
 module NewRelic::Agent::Instrumentation::TyphoeusTracing
 
-  EARLIEST_VERSION = NewRelic::VersionNumber.new("0.5.3")
+  EARLIEST_VERSION = Gem::Version.new("0.5.3")
 
   def self.is_supported_version?
-    NewRelic::VersionNumber.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
+    Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
   end
 
   def self.request_is_hydra_enabled?(request)

data/lib/new_relic/agent/javascript_instrumentor.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'base64'
+require 'json'
 require 'new_relic/agent/obfuscator'
 require 'new_relic/agent/transaction_timings'
 
@@ -112,7 +113,7 @@ module NewRelic
 
         txn.freeze_name_and_execute_if_not_ignored do
           data = data_for_js_agent(state)
-          json = NewRelic::JSONWrapper.dump(data)
+          json = ::JSON.dump(data)
           return html_safe_if_needed("\n<script type=\"text/javascript\">window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
         end
 
@@ -168,7 +169,7 @@ module NewRelic
         append_agent_attributes!(txn, atts)
 
         unless atts.empty?
-          json = NewRelic::JSONWrapper.dump(atts)
+          json = ::JSON.dump(atts)
           data[ATTS_KEY] = obfuscator.obfuscate(json)
         end
       end

data/lib/new_relic/agent/method_tracer.rb

@@ -93,65 +93,12 @@ module NewRelic
         end
       end
 
-      # Deprecated: original method preserved for API backward compatibility.
-      # Use either #trace_execution_scoped or #trace_execution_unscoped
-      #
-      # @api public
-      # @deprecated
-      #
-      def trace_method_execution(metric_names, push_scope, produce_metric, deduct_call_time_from_parent, &block) #:nodoc:
-        if push_scope
-          trace_execution_scoped(metric_names, :metric => produce_metric,
-                                 :deduct_call_time_from_parent => deduct_call_time_from_parent, &block)
-        else
-          trace_execution_unscoped(metric_names, &block)
-        end
-      end
-
-      # Deprecated. Use #trace_execution_scoped, a version with an options hash.
-      #
-      # @deprecated
-      #
-      def trace_method_execution_with_scope(metric_names, produce_metric, deduct_call_time_from_parent, scoped_metric_only=false, &block) #:nodoc:
-        trace_execution_scoped(metric_names,
-                               :metric => produce_metric,
-                               :deduct_call_time_from_parent => deduct_call_time_from_parent,
-                               :scoped_metric_only => scoped_metric_only, &block)
-      end
-
-      alias trace_method_execution_no_scope trace_execution_unscoped #:nodoc:
-
-      #
-      # This method is deprecated and exists only for backwards-compatibility
-      # reasons. Usages should be replaced with calls to
-      # NewRelic::Agent.record_metric.
-      #
-      # @api public
-      # @deprecated
-      #
-      def get_stats_scoped(first_name, scoped_metric_only)
-        NewRelic::Agent.instance.stats_engine.get_stats(first_name, true, scoped_metric_only)
-      end
-
-      # This method is deprecated and exists only for backwards-compatibility
-      # reasons. Usages should be replaced with calls to
-      # NewRelic::Agent.record_metric.
-      #
-      # @api public
-      # @deprecated
-      #
-      def get_stats_unscoped(name)
-        NewRelic::Agent.instance.stats_engine.get_stats_no_scope(name)
-      end
-
       # Defines methods used at the class level, for adding instrumentation
       # @api public
       module ClassMethods
         # contains methods refactored out of the #add_method_tracer method
         module AddMethodTracer
-          ALLOWED_KEYS = [:force, :metric, :push_scope, :code_header, :code_footer].freeze
-
-          DEPRECATED_KEYS = [:force, :scoped_metric_only, :deduct_call_time_from_parent].freeze
+          ALLOWED_KEYS = [:metric, :push_scope, :code_header, :code_footer].freeze
 
           # raises an error when the
           # NewRelic::Agent::MethodTracer::ClassMethods#add_method_tracer
@@ -159,17 +106,11 @@ module NewRelic
           # debugging new instrumentation by failing fast
           def check_for_illegal_keys!(method_name, options)
             unrecognized_keys = options.keys - ALLOWED_KEYS
-            deprecated_keys   = options.keys & DEPRECATED_KEYS
 
             if unrecognized_keys.any?
               raise "Unrecognized options when adding method tracer to #{method_name}: " +
                     unrecognized_keys.join(', ')
             end
-
-            if deprecated_keys.any?
-              NewRelic::Agent.logger.warn("Deprecated options when adding method tracer to #{method_name}: "+
-                deprecated_keys.join(', '))
-            end
           end
 
           # validity checking - add_method_tracer must receive either

data/lib/new_relic/agent/new_relic_service.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'zlib'
+require 'timeout'
 require 'new_relic/agent/audit_logger'
 require 'new_relic/agent/new_relic_service/encoders'
 require 'new_relic/agent/new_relic_service/marshaller'
@@ -267,7 +268,7 @@ module NewRelic
 
       def start_connection(conn)
         NewRelic::Agent.logger.debug("Opening TCP connection to #{conn.address}:#{conn.port}")
-        NewRelic::TimerLib.timeout(@request_timeout) { conn.start }
+        Timeout.timeout(@request_timeout) { conn.start }
         conn
       end
 
@@ -457,7 +458,7 @@ module NewRelic
           attempts += 1
           conn = http_connection
           ::NewRelic::Agent.logger.debug "Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}"
-          NewRelic::TimerLib.timeout(@request_timeout) do
+          Timeout.timeout(@request_timeout) do
             response = conn.request(request)
           end
         rescue *CONNECTION_ERRORS => e

data/lib/new_relic/agent/new_relic_service/encoders.rb

@@ -3,8 +3,9 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'base64'
-require 'zlib'
+require 'json'
 require 'stringio'
+require 'zlib'
 
 module NewRelic
   module Agent
@@ -40,12 +41,10 @@ module NewRelic
 
         module Base64CompressedJSON
           def self.encode(data, opts={})
-            normalize_encodings = if opts[:skip_normalization]
-              false
-            else
-              Agent.config[:normalize_json_string_encodings]
+            if !opts[:skip_normalization] && Agent.config[:normalize_json_string_encodings]
+              data = NewRelic::Agent::EncodingNormalizer.normalize_object(data)
             end
-            json = ::NewRelic::JSONWrapper.dump(data, :normalize => normalize_encodings)
+            json = ::JSON.dump(data)
             Base64.encode64(Compressed::Deflate.encode(json))
           end
         end

data/lib/new_relic/agent/new_relic_service/json_marshaller.rb

@@ -2,6 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require 'json'
 require 'new_relic/agent/new_relic_service/marshaller'
 
 module NewRelic
@@ -10,19 +11,15 @@ module NewRelic
       # Marshal collector protocol with JSON when available
       class JsonMarshaller < Marshaller
         def initialize
-          ::NewRelic::Agent.logger.debug "Using JSON marshaller (#{NewRelic::JSONWrapper.backend_name})"
-          unless self.class.is_supported?
-            ::NewRelic::Agent.logger.error "JSON backend #{NewRelic::JSONWrapper.backend_name} is not supported."
-          end
           warn_for_yajl
         end
 
-        OK_YAJL_VERSION = NewRelic::VersionNumber.new("1.2.1")
+        OK_YAJL_VERSION = Gem::Version.new("1.2.1")
 
         def warn_for_yajl
           if defined?(::Yajl)
             require 'yajl/version'
-            if NewRelic::VersionNumber.new(::Yajl::VERSION) < OK_YAJL_VERSION
+            if Gem::Version.new(::Yajl::VERSION) < OK_YAJL_VERSION
               ::NewRelic::Agent.logger.warn "Detected yajl-ruby version #{::Yajl::VERSION} which can cause segfaults with newrelic_rpm's thread profiling features. We strongly recommend you upgrade to the latest yajl-ruby version available."
             end
           end
@@ -33,13 +30,11 @@ module NewRelic
         def dump(ruby, opts={})
           prepared = prepare(ruby, opts)
 
-          if opts[:skip_normalization]
-            normalize_encodings = false
-          else
-            normalize_encodings = Agent.config[:normalize_json_string_encodings]
+          if !opts[:skip_normalization] && Agent.config[:normalize_json_string_encodings]
+            prepared = NewRelic::Agent::EncodingNormalizer.normalize_object(prepared)
           end
 
-          NewRelic::JSONWrapper.dump(prepared, :normalize => normalize_encodings)
+          ::JSON.dump(prepared)
         end
 
         def load(data)
@@ -48,7 +43,7 @@ module NewRelic
             return nil
           end
 
-          return_value(NewRelic::JSONWrapper.load(data))
+          return_value(::JSON.load(data))
         rescue => e
           ::NewRelic::Agent.logger.debug "#{e.class.name} : #{e.message} encountered loading collector response: #{data}"
           raise
@@ -66,10 +61,6 @@ module NewRelic
           'json'
         end
 
-        def self.is_supported?
-          NewRelic::JSONWrapper.usable_for_collector_serialization?
-        end
-
         def self.human_readable?
           true # for some definitions of 'human'
         end