newrelic_rpm 3.16.0.318 → 3.16.1.320

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

@@ -0,0 +1,73 @@
+# 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.
+
+module NewRelic
+  module Agent
+    class Transaction
+      class AbstractSegment
+        attr_reader :start_time, :end_time, :duration, :exclusive_duration
+        attr_accessor :name, :children_time, :transaction
+
+        def initialize name
+          @name = name
+          @children_time = 0.0
+          @record_metrics = true
+          @transaction = nil
+        end
+
+        def start
+          @start_time = Time.now
+        end
+
+        def finish
+          @end_time = Time.now
+          @duration = end_time.to_f - start_time.to_f
+          @exclusive_duration = duration - children_time
+          record_metrics if record_metrics?
+          segment_complete
+          @transaction.segment_complete self if transaction
+        rescue => e
+          # This rescue block was added for the benefit of this test:
+          # test/multiverse/suites/bare/standalone_instrumentation_test.rb
+          # See the top of the test for details.
+          NewRelic::Agent.logger.error "Exception finishing segment: #{name}", e
+        end
+
+        def record_metrics?
+          @record_metrics
+        end
+
+        def record_metrics= value
+          @record_metrics = value
+        end
+
+        def record_metrics
+          raise NotImplementedError, "Subclasses must implement record_metrics"
+        end
+
+        private
+
+        # callback for subclasses to override
+        def segment_complete
+        end
+
+        def metric_cache
+          if transaction
+            transaction.metrics
+          else
+            NewRelic::Agent.instance.stats_engine
+          end
+        end
+
+        def transaction_state
+          @transaction_state ||= if @transaction
+            transaction.state
+          else
+            TransactionState.tl_get
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# 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.
+
+require 'new_relic/agent/transaction/segment'
+require 'new_relic/agent/datastores/metric_helper'
+require 'new_relic/agent/database'
+
+module NewRelic
+  module Agent
+    class Transaction
+      class DatastoreSegment < Segment
+        attr_reader :product, :operation, :collection, :sql_statement
+
+        def initialize product, operation, collection = nil
+          @product = product
+          @operation = operation
+          @collection = collection
+          @sql_statement = nil
+          super Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
+                Datastores::MetricHelper.unscoped_metrics_for(product, operation, collection)
+        end
+
+        def notice_sql sql
+          _notice_sql sql
+        end
+
+        # @api private
+        def _notice_sql sql, config=nil, explainer=nil, binds=nil, name=nil
+          return unless record_sql?
+          @sql_statement = Database::Statement.new sql, config, explainer, binds, name
+        end
+
+        private
+
+        def segment_complete
+          return unless sql_statement
+
+          NewRelic::Agent.instance.transaction_sampler.notice_sql_statement(sql_statement, duration)
+          NewRelic::Agent.instance.sql_sampler.notice_sql_statement(sql_statement.dup, name, duration)
+        end
+
+        def record_sql?
+          transaction_state.is_sql_recorded?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +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.
+
+require 'new_relic/agent/transaction/abstract_segment'
+
+module NewRelic
+  module Agent
+    class Transaction
+      class Segment < AbstractSegment
+        # unscoped_metrics can be nil, a string, or array. we do this to save
+        # object allocations. if allocations weren't important then we would
+        # initialize it as an array that would be empty, have one item, or many items.
+        attr_reader :unscoped_metrics
+
+        def initialize name, unscoped_metrics=nil
+          @unscoped_metrics = unscoped_metrics
+          super name
+        end
+
+        def record_metrics
+          metric_cache.record_scoped_and_unscoped name, duration, exclusive_duration
+          if unscoped_metrics
+            metric_cache.record_unscoped unscoped_metrics, duration, exclusive_duration
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# 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.
+
+require 'new_relic/agent/transaction/segment'
+require 'new_relic/agent/transaction/datastore_segment'
+
+module NewRelic
+  module Agent
+    class Transaction
+      module Tracing
+        module ClassMethods
+          def start_segment name, unscoped_metrics=nil
+            segment = Segment.new name, unscoped_metrics
+            segment.start
+            add_segment segment
+            segment
+          end
+
+          def start_datastore_segment product, operation, collection=nil
+            segment = DatastoreSegment.new product, operation, collection
+            segment.start
+            add_segment segment
+            segment
+          end
+
+          private
+
+          def add_segment segment
+            state = NewRelic::Agent::TransactionState.tl_get
+            segment.record_metrics = state.is_execution_traced?
+            if (txn = state.current_transaction) && state.is_execution_traced?
+              txn.add_segment segment
+            end
+          end
+        end
+
+        def self.included base
+          base.extend ClassMethods
+        end
+
+        def add_segment segment
+          segment.transaction = self
+          state.traced_method_stack.push_segment state, segment
+        end
+
+        def segment_complete segment
+          state.traced_method_stack.pop_frame(state, segment, segment.name, segment.end_time, segment.record_metrics?)
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/transaction_sampler.rb

@@ -183,7 +183,7 @@ module NewRelic
       # @api public
       # @deprecated Use {Datastores.notice_sql} instead.
       #
-      def notice_sql(sql, config, duration, state=nil, explainer=nil, binds=[], name="SQL") #THREAD_LOCAL_ACCESS sometimes
+      def notice_sql(sql, config, duration, state=nil, explainer=nil, binds=nil, name=nil) #THREAD_LOCAL_ACCESS sometimes
         # some statements (particularly INSERTS with large BLOBS
         # may be very large; we should trim them to a maximum usable length
         state ||= TransactionState.tl_get
@@ -194,6 +194,13 @@ module NewRelic
         end
       end
 
+
+      def notice_sql_statement(statement, duration) #THREAD_LOCAL_ACCESS sometimes
+        state ||= TransactionState.tl_get
+        builder = state.transaction_sample_builder
+        notice_extra_data(builder, statement, duration, :sql)
+      end
+
       # Attaches an additional non-SQL query parameter to the current
       # transaction trace node.
       #

data/lib/new_relic/noticed_error.rb

@@ -30,7 +30,9 @@ class NewRelic::NoticedError
 
     if exception.nil?
       @message = '<no message>'
-    elsif exception.respond_to?('original_exception')
+    elsif exception.respond_to?(:cause)
+      @message = (exception.cause || exception).to_s
+    elsif exception.respond_to?(:original_exception)
       @message = (exception.original_exception || exception).to_s
     else # exception is not nil, but does not respond to original_exception
       @message = exception.to_s

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 16
-    TINY  = 0
+    TINY  = 1
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -32,30 +32,37 @@ module Sequel
   #
   module NewRelicInstrumentation
 
-    # Instrument all queries that go through #execute_query.
-    def log_yield(sql, args=nil) #THREAD_LOCAL_ACCESS
-      rval = nil
-      product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(self.class.adapter_scheme)
-      metrics = NewRelic::Agent::Datastores::MetricHelper.metrics_from_sql(product, sql)
-      scoped_metric = metrics.first
-
-      NewRelic::Agent::MethodTracer.trace_execution_scoped(metrics) do
-        t0 = Time.now
-        begin
-          rval = super
-        ensure
-          notice_sql(sql, scoped_metric, args, t0, Time.now)
+    module Naming
+      def self.query_method_name
+        if Sequel::VERSION >= "4.35.0"
+          :log_connection_yield
+        else
+          :log_yield
         end
       end
+    end
+
+    define_method Naming.query_method_name do |*args, &blk| #THREAD_LOCAL_ACCESS
+      sql = args.first
 
-      return rval
+      product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(self.class.adapter_scheme)
+      operation = NewRelic::Agent::Datastores::MetricHelper.operation_from_sql(sql)
+      segment = NewRelic::Agent::Transaction.start_datastore_segment product, operation
+
+      begin
+        super(*args, &blk)
+      ensure
+        notice_sql(sql, segment.name, segment.start_time, Time.now)
+        segment.finish
+      end
     end
 
+
     THREAD_SAFE_CONNECTION_POOL_CLASSES = [
       (defined?(::Sequel::ThreadedConnectionPool) && ::Sequel::ThreadedConnectionPool)
     ].freeze
 
-    def notice_sql(sql, metric_name, args, start, finish)
+    def notice_sql(sql, metric_name, start, finish)
       state    = NewRelic::Agent::TransactionState.tl_get
       duration = finish - start
 

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -22,12 +22,13 @@ module Sequel
         def wrap_sequel_method(method_name, operation_name=method_name)
           define_method(method_name) do |*args, &block|
             klass = self.is_a?(Class) ? self : self.class
-
             product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(db.adapter_scheme)
-            metrics = ::NewRelic::Agent::Datastores::MetricHelper.metrics_for(product, operation_name, klass.name)
+            segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation_name, klass.name)
 
-            NewRelic::Agent::MethodTracer.trace_execution_scoped(metrics) do
+            begin
               NewRelic::Agent.disable_all_tracing { super(*args, &block) }
+            ensure
+              segment.finish
             end
           end
         end

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 1.8.7'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Karl Sandwich", "Caito Scherr" ]
+  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Caito Scherr", "Kenichi Nakamura" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic', 'MIT', 'Ruby']
   s.description = <<-EOS
@@ -49,14 +49,6 @@ EOS
   s.add_development_dependency 'pry', '~> 0.9.12'
   s.add_development_dependency 'hometown', '~> 0.2.5'
 
-  # Only let Guard run on newer Rubies
-  if RUBY_VERSION >= "1.9.3"
-    s.add_development_dependency 'guard'
-    s.add_development_dependency 'listen', '< 3.1' if RUBY_VERSION < "2.2.3"
-    s.add_development_dependency 'guard-minitest'
-    s.add_development_dependency 'rb-fsevent'
-  end
-
   # rack-cache ~> 1.2 is specified by actionpack 3.2, but rack-cache 1.3.1 only works on Ruby 1.9.3 & newer. :(
   # https://github.com/rtomayko/rack-cache/issues/124
   if RUBY_VERSION < "1.9.3"

data/test/environments/lib/environments/runner.rb

@@ -5,6 +5,7 @@
 require 'bundler'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'multiverse', 'lib', 'multiverse', 'color'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'multiverse', 'lib', 'multiverse', 'shell_utils'))
 
 module Environments
   class Runner
@@ -94,14 +95,15 @@ module Environments
 
     def bundle(dir)
       puts "Bundling in #{dir}..."
-      bundling = `cd #{dir} && bundle install --local`
+      result = `cd #{dir} && bundle install --local`
       unless $?.success?
         puts "Failed local bundle, trying again with full bundle..."
-        bundling = `cd #{dir} && bundle install --retry 3`
+        command = "cd #{dir} && bundle install --retry 3"
+        result = Multiverse::ShellUtils.try_command_n_times(command, 3)
       end
 
-      bundling = red(bundling) unless $?.success?
-      puts bundling
+      result = red(result) unless $?.success?
+      puts result
       $?
     end
 

data/test/environments/norails/Gemfile

@@ -4,14 +4,20 @@ gem 'rake', '~>10.1.1'
 
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
-gem 'rack'
+
+if RUBY_VERSION < '2.2.2'
+  gem 'rack', '< 2.0.0'
+else
+  gem 'rack'
+end
+
 gem 'rack-test'
-gem 'json' if RUBY_VERSION == "1.8.7"
+gem 'json', '< 2.0.0' if RUBY_VERSION == "1.8.7"
 
 platforms :rbx do
   gem "rubysl"
   gem "rubysl-test-unit"
-  gem "json"
+  gem "json", '< 2.0.0'
   gem "psych"
   gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
 end

data/test/environments/rails21/Gemfile

@@ -7,8 +7,7 @@ gem 'minitest', '~>4.7.5'
 gem "mocha", :require => false
 gem "jeweler", "1.4.0"
 gem "rdoc"
-
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 gem 'newrelic_rpm', :path => "../../.."
 
@@ -24,4 +23,8 @@ end
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
 
-gem 'git', '< 1.3' if RUBY_VERSION < '1.9' # git 1.3.0 requires Ruby version >= 1.9
+if RUBY_VERSION < '1.9'
+  gem 'git', '< 1.3' # git 1.3.0 requires Ruby version >= 1.9
+  gem 'json_pure', '< 2.0'
+end
+

data/test/environments/rails22/Gemfile

@@ -8,7 +8,7 @@ gem "mocha", :require => false
 gem "jeweler", "1.4.0"
 gem "rdoc"
 
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 gem 'newrelic_rpm', :path => '../../..'
 
@@ -24,4 +24,7 @@ end
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
 
-gem 'git', '< 1.3' if RUBY_VERSION < '1.9' # git 1.3.0 requires Ruby version >= 1.9
+if RUBY_VERSION < '1.9'
+  gem 'git', '< 1.3' # git 1.3.0 requires Ruby version >= 1.9
+  gem 'json_pure', '< 2.0'
+end

data/test/environments/rails23/Gemfile

@@ -5,7 +5,7 @@ gem "rails", "~> 2.3.18"
 gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 gem 'rdoc'