newrelic_rpm 3.8.0.218 → 3.8.1.221

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -120,8 +120,8 @@ module NewRelic
 
       def transaction_trace_threshold
         source_class = Agent.config.source(TT_THRESHOLD_KEY).class
-        if source_class == Configuration::DefaultSource && TransactionState.get.transaction
-          TransactionState.get.transaction.apdex_t * 4
+        if source_class == Configuration::DefaultSource && TransactionState.get.current_transaction
+          TransactionState.get.current_transaction.apdex_t * 4
         else
           Agent.config[TT_THRESHOLD_KEY]
         end

data/lib/new_relic/agent/transaction_sampler.rb

@@ -19,11 +19,10 @@ module NewRelic
 
       # Module defining methods stubbed out when the agent is disabled
       module Shim #:nodoc:
-        def notice_transaction(*args); end
-        def notice_first_scope_push(*args); end
-        def notice_push_scope(*args); end
-        def notice_pop_scope(*args); end
-        def notice_scope_empty(*args); end
+        def on_start_transaction(*args); end
+        def notice_push_frame(*args); end
+        def notice_pop_frame(*args); end
+        def on_finishing_transaction(*args); end
       end
 
       attr_reader :last_sample, :dev_mode_sample_buffer, :xray_sample_buffer
@@ -63,20 +62,19 @@ module NewRelic
         Agent.config[:'transaction_tracer.enabled'] || Agent.config[:developer_mode]
       end
 
-      # Creates a new transaction sample builder, unless the
-      # transaction sampler is disabled. Takes a time parameter for
-      # the start of the transaction sample
-      def notice_first_scope_push(time)
-        start_builder(time.to_f) if enabled?
+      def on_start_transaction(start_time, uri=nil, params={})
+        if enabled?
+          start_builder(start_time.to_f)
+          builder.set_transaction_info(uri, params) if builder
+        end
       end
 
-      # This delegates to the builder to create a new open transaction
-      # segment for the specified scope, beginning at the optionally
-      # specified time.
+      # This delegates to the builder to create a new open transaction segment
+      # for the frame, beginning at the optionally specified time.
       #
       # Note that in developer mode, this captures a stacktrace for
       # the beginning of each segment, which can be fairly slow
-      def notice_push_scope(time=Time.now)
+      def notice_push_frame(time=Time.now)
         return unless builder
 
         segment = builder.trace_entry(time.to_f)
@@ -84,12 +82,11 @@ module NewRelic
         return segment
       end
 
-      # Informs the transaction sample builder about the end of a
-      # traced scope
-      def notice_pop_scope(scope, time = Time.now)
+      # Informs the transaction sample builder about the end of a traced frame
+      def notice_pop_frame(frame, time = Time.now)
         return unless builder
         raise "finished already???" if builder.sample.finished
-        builder.trace_exit(scope, time.to_f)
+        builder.trace_exit(frame, time.to_f)
       end
 
       def custom_parameters_from_transaction(txn)
@@ -103,13 +100,13 @@ module NewRelic
       # This is called when we are done with the transaction.  We've
       # unwound the stack to the top level. It also clears the
       # transaction sample builder so that it won't continue to have
-      # scopes appended to it.
+      # frames appended to it.
       #
       # It sets various instance variables to the finished sample,
       # depending on which settings are active. See `store_sample`
-      def notice_scope_empty(txn, time=Time.now, gc_time=nil)
+      def on_finishing_transaction(txn, time=Time.now, gc_time=nil)
         last_builder = builder
-        last_builder.set_transaction_name(txn.name) if enabled? && last_builder
+        last_builder.set_transaction_name(txn.best_name) if enabled? && last_builder
 
         return unless last_builder
 
@@ -132,12 +129,6 @@ module NewRelic
         end
       end
 
-      # Delegates to the builder to store the uri, and
-      # parameters if the sampler is active
-      def notice_transaction(uri=nil, params={})
-        builder.set_transaction_info(uri, params) if enabled? && builder
-      end
-
       # Tells the builder to ignore a transaction, if we are currently
       # creating one. Only causes the sample to be ignored upon end of
       # the transaction, and does not change the metrics gathered

data/lib/new_relic/agent/transaction_state.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/browser_token'
+require 'new_relic/agent/traced_method_stack'
 
 module NewRelic
   module Agent
@@ -38,11 +39,11 @@ module NewRelic
       end
 
       def initialize
-        @stats_scope_stack = []
+        @traced_method_stack = TracedMethodStack.new
+        @current_transaction = nil
       end
 
       def request=(request)
-        reset unless reset?
         @request = request
         @request_token = BrowserToken.get_token(request)
       end
@@ -52,7 +53,7 @@ module NewRelic
         # not available, we track the last reset. No accessor, as only the
         # TransactionState class should use it.
         @last_reset_time = Time.now
-        @transaction = nil
+        @most_recent_transaction = nil
         @timings = nil
         @request = nil
         @request_token = nil
@@ -61,10 +62,6 @@ module NewRelic
         @referring_transaction_info = nil
       end
 
-      def reset?
-        @transaction.nil?
-      end
-
       def timings
         @timings ||= TransactionTimings.new(transaction_queue_time, transaction_start_time, transaction_name)
       end
@@ -91,8 +88,8 @@ module NewRelic
       attr_accessor :request_token, :request_ignore_enduser
 
       def request_guid
-        return nil unless transaction
-        transaction.guid
+        return nil unless most_recent_transaction
+        most_recent_transaction.guid
       end
 
       def request_guid_to_include
@@ -101,40 +98,31 @@ module NewRelic
       end
 
       def include_guid?
-        request_token && timings.app_time_in_seconds > transaction.apdex_t
+        request_token && timings.app_time_in_seconds > most_recent_transaction.apdex_t
       end
 
       # Current transaction stack and sample building
-      attr_accessor :transaction, :transaction_sample_builder
-      attr_writer   :current_transaction_stack
-
-      # Returns and initializes the transaction stack if necessary
-      #
-      # We don't default in the initializer so non-transaction threads retain
-      # a nil stack, and methods in this class use has_current_transction?
-      # instead of this accessor to see if we're a transaction thread or not
-      def current_transaction_stack
-        @current_transaction_stack ||= []
-      end
+      attr_accessor :most_recent_transaction, :transaction_sample_builder,
+                    :current_transaction
 
       def transaction_start_time
-        if transaction.nil?
+        if most_recent_transaction.nil?
           @last_reset_time
         else
-          transaction.start_time
+          most_recent_transaction.start_time
         end
       end
 
       def transaction_queue_time
-        transaction.nil? ? 0.0 : transaction.queue_time
+        most_recent_transaction.nil? ? 0.0 : most_recent_transaction.queue_time
       end
 
       def transaction_name
-        transaction.nil? ? nil : transaction.name
+        most_recent_transaction.nil? ? nil : most_recent_transaction.best_name
       end
 
       def transaction_noticed_error_ids
-        transaction.nil? ? [] : transaction.noticed_error_ids
+        most_recent_transaction.nil? ? [] : most_recent_transaction.noticed_error_ids
       end
 
       def self.in_background_transaction?(thread)
@@ -153,14 +141,6 @@ module NewRelic
         !current_transaction.nil? && !current_transaction.request.nil?
       end
 
-      def current_transaction
-        current_transaction_stack.last if has_current_transaction?
-      end
-
-      def has_current_transaction?
-        !@current_transaction_stack.nil?
-      end
-
       # Execution tracing on current thread
       attr_accessor :untraced
 
@@ -196,12 +176,7 @@ module NewRelic
 
       # Scope stack tracking from NewRelic::StatsEngine::Transactions
       # Should not be nil--this class manages its initialization and resetting
-      attr_accessor :stats_scope_stack
-
-      def clear_stats_scope_stack
-        @stats_scope_stack = []
-      end
-
+      attr_reader :traced_method_stack
     end
   end
 end

data/lib/new_relic/control/instance_methods.rb

@@ -50,7 +50,7 @@ module NewRelic
       def init_plugin(options={})
         env = options[:env] || self.env
         Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.")
-        Agent.logger.info("To prevent agent startup add a NEWRELIC_ENABLE=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
+        Agent.logger.info("To prevent agent startup add a NEWRELIC_AGENT_ENABLED=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
 
         configure_agent(env, options)
 
@@ -79,9 +79,13 @@ module NewRelic
       end
 
       def configure_agent(env, options)
-        yaml = Agent::Configuration::YamlSource.new(@config_file_path, env)
-        Agent.config.replace_or_add_config(yaml, 1)
+        manual = Agent::Configuration::ManualSource.new(options)
+        Agent.config.replace_or_add_config(manual, 1)
 
+        config_file_path = @config_file_override || Agent.config[:config_path]
+        Agent.config.replace_or_add_config(Agent::Configuration::YamlSource.new(config_file_path, env), 1)
+
+        Agent.config.remove_config(manual)
         Agent.config.replace_or_add_config(Agent::Configuration::ManualSource.new(options), 1)
       end
 
@@ -122,7 +126,7 @@ module NewRelic
       def initialize(local_env, config_file_override=nil)
         @local_env = local_env
         @instrumentation_files = []
-        @config_file_path = config_file_override || Agent.config[:config_path]
+        @config_file_override = config_file_override
       end
 
       def root

data/lib/new_relic/recipes.rb

@@ -34,7 +34,7 @@ make_notify_task = Proc.new do
         user        = fetch(:newrelic_user)        if exists?(:newrelic_user)
         license_key = fetch(:newrelic_license_key) if exists?(:newrelic_license_key)
 
-        unless scm == :none
+        unless scm.to_sym == :none
           changelog = lookup_changelog(changelog)
           rev       = lookup_rev(rev)
         end
@@ -76,7 +76,7 @@ make_notify_task = Proc.new do
         logger.debug "Getting log of changes for New Relic Deployment details"
         from_revision = source.next_revision(current_revision)
 
-        if scm == :git
+        if scm.to_sym == :git
           log_command = "git log --no-color --pretty=format:'  * %an: %s' " +
             "--abbrev-commit --no-merges #{previous_revision}..#{real_revision}"
         else
@@ -95,7 +95,7 @@ make_notify_task = Proc.new do
           `#{cmd}`
         end
 
-        rev = rev[0..6] if scm == :git
+        rev = rev[0..6] if scm.to_sym == :git
       end
       rev
     end

data/lib/new_relic/transaction_sample.rb

@@ -16,7 +16,7 @@ module NewRelic
   class TransactionSample
 
     attr_accessor :params, :root_segment, :profile, :force_persist, :guid,
-                  :threshold, :finished, :xray_session_id
+                  :threshold, :finished, :xray_session_id, :start_time
     attr_reader :root_segment, :params, :sample_id
     attr_writer :prepared
 
@@ -84,10 +84,6 @@ module NewRelic
       ]
     end
 
-    def start_time
-      Time.at(@start_time)
-    end
-
     def path_string
       @root_segment.path_string
     end
@@ -139,7 +135,7 @@ module NewRelic
     end
 
     def to_s
-      s = "Transaction Sample collected at #{start_time}\n"
+      s = "Transaction Sample collected at #{Time.at(start_time)}\n"
       s << "  {\n"
       s << "  Path: #{params[:path]} \n"
 
@@ -201,7 +197,7 @@ module NewRelic
 
     def force_persist_sample?
       NewRelic::Agent::TransactionState.get.request_token &&
-        self.duration > NewRelic::Agent::TransactionState.get.transaction.apdex_t
+        self.duration > NewRelic::Agent::TransactionState.get.current_transaction.apdex_t
     end
 
   private

data/lib/new_relic/version.rb

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

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -71,7 +71,7 @@ module Sequel
       (defined?(::Sequel::ThreadedConnectionPool) && ::Sequel::ThreadedConnectionPool),
     ].compact.freeze
 
-    # Record the given +sql+ within a new scope, using the given +start+ and
+    # Record the given +sql+ within a new frame, using the given +start+ and
     # +finish+ times.
     def notice_sql( sql, args, start, finish )
       metric   = primary_metric_for( sql, args )
@@ -79,7 +79,7 @@ module Sequel
       duration = finish - start
 
       begin
-        scope = agent.stats_engine.push_scope( :sequel, start )
+        frame = NewRelic::Agent::TracedMethodStack.push_frame( :sequel, start )
         explainer = Proc.new do |*|
           if THREAD_SAFE_CONNECTION_POOL_CLASSES.include?(self.pool.class)
             self[ sql ].explain
@@ -91,7 +91,7 @@ module Sequel
         agent.transaction_sampler.notice_sql( sql, self.opts, duration, &explainer )
         agent.sql_sampler.notice_sql( sql, metric, self.opts, duration, &explainer )
       ensure
-        agent.stats_engine.pop_scope( scope, metric, finish )
+        NewRelic::Agent::TracedMethodStack.pop_frame( frame, metric, finish )
       end
     end
 

data/newrelic_rpm.gemspec

@@ -36,27 +36,33 @@ EOS
   s.files = file_list
 
   s.homepage = "http://www.github.com/newrelic/rpm"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
   s.post_install_message = NewRelic::LatestChanges.read
-  s.add_development_dependency 'rubysl' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-  s.add_development_dependency 'racc' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+
   s.add_development_dependency 'rake', '10.1.0'
   s.add_development_dependency 'minitest', '~> 4.7.5'
   s.add_development_dependency 'mocha', '~> 0.13.0'
-  s.add_development_dependency 'sdoc-helpers'
-  s.add_development_dependency 'rdoc', '>= 2.4.2'
+  s.add_development_dependency 'yard'
   s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'sqlite3', '1.3.8' unless RUBY_PLATFORM == 'java'
-  s.add_development_dependency 'activerecord-jdbcsqlite3-adapter' if RUBY_PLATFORM == 'java'
-  s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
-  s.add_development_dependency 'sequel', '~> 3.46.0'
   s.add_development_dependency 'pry'
+#  s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'guard', '~> 1.8.3' # Guard 2.0 is Ruby 1.9 only
   s.add_development_dependency 'guard-minitest'
   s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
+  s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
+
+  if RUBY_PLATFORM == 'java'
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+  else
+    s.add_development_dependency 'sqlite3', '1.3.8'
+  end
+
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    s.add_development_dependency 'rubysl'
+    s.add_development_dependency 'racc'
+  end
 
   # Only sign with our private key if you can find it
   signing_key_path = File.expand_path('~/.ssh/newrelic_rpm-private_key.pem')

data/test/agent_helper.rb

@@ -5,6 +5,19 @@
 # These helpers should not have any gem dependencies except on newrelic_rpm
 # itself, and should be usable from within any multiverse suite.
 
+class ArrayLogDevice
+  def initialize( array=[] )
+    @array = array
+  end
+  attr_reader :array
+
+  def write( message )
+    @array << message
+  end
+
+  def close; end
+end
+
 def assert_between(floor, ceiling, value, message="expected #{floor} <= #{value} <= #{ceiling}")
   assert((floor <= value && value <= ceiling), message)
 end
@@ -19,14 +32,6 @@ def assert_has_error(error_class)
     "Didn't find error of class #{error_class}"
 end
 
-
-unless defined?( build_message )
-  def build_message(head, template=nil, *arguments)
-    template &&= template.chomp
-    template.gsub(/\?/) { mu_pp(arguments.shift) }
-  end
-end
-
 unless defined?( assert_block )
   def assert_block(*msgs)
     assert yield, *msgs
@@ -35,14 +40,14 @@ end
 
 unless defined?( assert_includes )
   def assert_includes( collection, member, msg=nil )
-    msg = build_message( msg, "Expected ? to include ?", collection, member )
+    msg = "Expected #{collection.inspect} to include #{member.inspect}"
     assert_block( msg ) { collection.include?(member) }
   end
 end
 
 unless defined?( assert_not_includes )
   def assert_not_includes( collection, member, msg=nil )
-    msg = build_message( msg, "Expected ? not to include ?", collection, member )
+    msg = "Expected #{collection.inspect} not to include #{member.inspect}"
     assert !collection.include?(member), msg
   end
 end
@@ -91,14 +96,14 @@ def assert_metrics_recorded(expected)
     expected_spec = metric_spec_from_specish(specish)
     actual_stats = NewRelic::Agent.instance.stats_engine.lookup_stats(*Array(specish))
     if !actual_stats
-      all_specs = NewRelic::Agent.instance.stats_engine.metric_specs
+      all_specs = NewRelic::Agent.instance.stats_engine.metric_specs.sort
       matches = all_specs.select { |spec| spec.name == expected_spec.name }
       matches.map! { |m| "  #{m.inspect}" }
       msg = "Did not find stats for spec #{expected_spec.inspect}."
       msg += "\nDid find specs: [\n#{matches.join(",\n")}\n]" unless matches.empty?
 
       msg += "\nAll specs in there were: [\n#{all_specs.map do |s|
-        "#{s.name} (#{s.scope.empty? ? '<unscoped>' : s.scope})"
+        "  #{s.name} (#{s.scope.empty? ? '<unscoped>' : s.scope})"
       end.join(",\n")}\n]"
 
       assert(actual_stats, msg)
@@ -142,12 +147,12 @@ def assert_metrics_not_recorded(not_expected)
 end
 
 def assert_truthy(expected, msg = nil)
-  msg = build_message( msg, "Expected ? to be truthy", expected )
+  msg = "Expected #{expected.inspect} to be truthy"
   assert !!expected, msg
 end
 
 def assert_falsy(expected, msg = nil)
-  msg = build_message( msg, "Expected ? to be falsy", expected )
+  msg = "Expected #{expected.inspect} to be falsy"
   assert !expected, msg
 end
 
@@ -157,7 +162,7 @@ unless defined?( assert_false )
   end
 end
 
-unless defined? ( refute )
+unless defined?(refute)
   alias refute assert_false
 end
 
@@ -181,16 +186,19 @@ end
 #
 def in_transaction(*args)
   opts = (args.last && args.last.is_a?(Hash)) ? args.pop : {}
-  name = args.first || 'dummy'
+  opts[:transaction_name] = args.first || 'dummy'
   transaction_type = (opts && opts.delete(:type)) || :other
 
-  NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler,
-                        NewRelic::Agent::TransactionSampler.new)
-  NewRelic::Agent.instance.stats_engine.transaction_sampler = \
-    NewRelic::Agent.instance.transaction_sampler
-  NewRelic::Agent::Transaction.start(transaction_type, opts || {})
-  val = yield NewRelic::Agent::Transaction.current
-  NewRelic::Agent::Transaction.stop(name)
+  NewRelic::Agent::Transaction.start(transaction_type, opts)
+
+  val = nil
+
+  begin
+    val = yield NewRelic::Agent::Transaction.current
+  ensure
+    NewRelic::Agent::Transaction.stop()
+  end
+
   val
 end
 
@@ -251,27 +259,34 @@ def advance_time(seconds)
   freeze_time(Time.now + seconds)
 end
 
-def define_constant(constant_symbol, implementation)
-  if Object.const_defined?(constant_symbol)
-    existing_implementation = Object.send(:remove_const, constant_symbol)
-  end
-
-  Object.const_set(constant_symbol, implementation)
+def with_constant_defined(constant_symbol, implementation)
+  const_path = constant_path(constant_symbol.to_s)
 
-  yield
-ensure
-  Object.send(:remove_const, constant_symbol)
+  if const_path
+    # Constant is already defined, nothing to do
+    return yield
+  else
+    const_path = constant_path(constant_symbol.to_s, :allow_partial => true)
+    parent = const_path[-1]
+    constant_symbol = constant_symbol.to_s.split('::').last.to_sym
+  end
 
-  if existing_implementation
-    Object.const_set(constant_symbol, existing_implementation)
+  begin
+    parent.const_set(constant_symbol, implementation)
+    yield
+  ensure
+    parent.send(:remove_const, constant_symbol)
   end
 end
 
-def constant_path(name)
+def constant_path(name, opts={})
+  allow_partial = opts[:allow_partial]
   path = [Object]
   parts = name.gsub(/^::/, '').split('::')
   parts.each do |part|
-    return nil unless path.last.const_defined?(part)
+    if !path.last.const_defined?(part)
+      return allow_partial ? path : nil
+    end
     path << path.last.const_get(part)
   end
   path
@@ -320,3 +335,23 @@ def wait_for_backtrace_service_poll(opts={})
     end
   end
 end
+
+def with_array_logger(level=:info)
+  orig_logger = NewRelic::Agent.logger
+  config = {
+      :log_file_path => nil,
+      :log_file_name => nil,
+      :log_level => level,
+    }
+  logdev = ArrayLogDevice.new
+  override_logger = Logger.new(logdev)
+
+  with_config(config) do
+    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new("", override_logger)
+    yield
+  end
+
+  return logdev
+ensure
+  NewRelic::Agent.logger = orig_logger
+end