newrelic_rpm 3.8.0.218 → 3.8.1.221

data/ui/views/newrelic/show_sample.rhtml

@@ -15,7 +15,7 @@
   </tr>
   <tr>
     <th>Start Time:</th>
-    <td><%= format_timestamp(@sample.start_time) %></td>
+    <td><%= format_timestamp(Time.at(@sample.start_time)) %></td>
   </tr>
   <tr>
     <th>Duration:</th>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.8.0.218
+  version: 3.8.1.221
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
-  name: sdoc-helpers
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -139,38 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.8
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.46.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.46.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.8
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -401,17 +369,16 @@ files:
 - lib/new_relic/agent/stats_engine/metric_stats.rb
 - lib/new_relic/agent/stats_engine/samplers.rb
 - lib/new_relic/agent/stats_engine/stats_hash.rb
-- lib/new_relic/agent/stats_engine/transactions.rb
 - lib/new_relic/agent/supported_versions.rb
 - lib/new_relic/agent/system_info.rb
 - lib/new_relic/agent/threading/agent_thread.rb
 - lib/new_relic/agent/threading/backtrace_node.rb
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
+- lib/new_relic/agent/traced_method_stack.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/developer_mode_sample_buffer.rb
 - lib/new_relic/agent/transaction/force_persist_sample_buffer.rb
-- lib/new_relic/agent/transaction/pop.rb
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
 - lib/new_relic/agent/transaction/xray_sample_buffer.rb
@@ -744,6 +711,7 @@ files:
 - test/multiverse/suites/agent_only/start_up_test.rb
 - test/multiverse/suites/agent_only/testing_app.rb
 - test/multiverse/suites/agent_only/thread_profiling_test.rb
+- test/multiverse/suites/agent_only/transaction_ignoring_test.rb
 - test/multiverse/suites/agent_only/xray_sessions_test.rb
 - test/multiverse/suites/bare/Envfile
 - test/multiverse/suites/bare/standalone_instrumentation_test.rb
@@ -797,6 +765,7 @@ files:
 - test/multiverse/suites/rails/mongrel_queue_depth_test.rb
 - test/multiverse/suites/rails/queue_time_test.rb
 - test/multiverse/suites/rails/request_statistics_test.rb
+- test/multiverse/suites/rails/transaction_ignoring_test.rb
 - test/multiverse/suites/rails/view_instrumentation_test.rb
 - test/multiverse/suites/resque/Envfile
 - test/multiverse/suites/resque/Rakefile
@@ -922,9 +891,9 @@ files:
 - test/new_relic/agent/threading/fake_thread.rb
 - test/new_relic/agent/threading/thread_profile_test.rb
 - test/new_relic/agent/threading/threaded_test_case.rb
+- test/new_relic/agent/traced_method_stack_test.rb
 - test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb
 - test/new_relic/agent/transaction/force_persist_sample_buffer_test.rb
-- test/new_relic/agent/transaction/pop_test.rb
 - test/new_relic/agent/transaction/slowest_sample_buffer_test.rb
 - test/new_relic/agent/transaction/xray_sample_buffer_test.rb
 - test/new_relic/agent/transaction_interrobang_test.rb
@@ -977,6 +946,7 @@ files:
 - test/new_relic/rack/transaction_reset_test.rb
 - test/new_relic/transaction_analysis/segment_summary_test.rb
 - test/new_relic/transaction_analysis_test.rb
+- test/new_relic/transaction_ignoring_test_cases.rb
 - test/new_relic/transaction_sample/composite_segment_test.rb
 - test/new_relic/transaction_sample/fake_segment_test.rb
 - test/new_relic/transaction_sample/segment_test.rb
@@ -1100,54 +1070,28 @@ licenses:
 - New Relic
 - MIT
 - Ruby
-post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.8.0 ##\n\n*
-  Better support for forking and daemonizing dispatchers (e.g. Puma, Unicorn)\n\n
-  \ The agent should now work out-of-the box with no special configuration on\n  servers
-  that fork or daemonize themselves (such as Unicorn or Puma in some\n  configurations).
-  The agent's background thread will be automatically restarted\n  after the first
-  transaction processed within each child process.\n\n  This change means it's no
-  longer necessary to set the\n  'restart_thread_in_children setting' in your agent
-  configuration file if you\n  were doing so previously.\n\n* Rails 4.1 support\n\n
-  \ Rails 4.1 has shipped, and the Ruby agent is ready for it! We've been running\n
-  \ our test suites against the release candidates with no significant issues, so\n
-  \ we're happy to announce full compatibility with this new release of Rails.\n\n*
-  Ruby VM measurements\n\n  The Ruby agent now records more detailed information about
-  the performance and\n  behavior of the Ruby VM, mainly focused around Ruby's garbage
-  collector. This\n  information is exposed on the new 'Ruby VM' tab in the UI. For
-  details about\n  what is recorded, see:\n\n  http://docs.newrelic.com/docs/ruby/ruby-vm-stats\n\n*
-  Separate in-transaction GC timings for web and background processes\n\n  Previously,
-  an application with GC instrumentation enabled, and both web and\n  background processes
-  reporting in to it would show an overly inflated GC band\n  on the application overview
-  graph, because data from both web and non-web\n  transactions would be included.
-  This has been fixed, and GC time during web\n  and non-web transactions is now tracked
-  separately.\n\n* More accurate GC measurements on multi-threaded web servers\n\n
-  \ The agent could previously have reported inaccurate GC times on multi-threaded\n
-  \ web servers such as Puma. It will now correctly report GC timings in\n  multi-threaded
-  contexts.\n\n* Improved ActiveMerchant instrumentation\n\n  The agent will now trace
-  the store, unstore, and update methods on\n  ActiveMerchant gateways. In addition,
-  a bug preventing ActiveMerchant\n  instrumentation from working on Ruby 1.9+ has
-  been fixed.\n\n  Thanks to Troex Nevelin for the contribution!\n\n* More robust
-  Real User Monitoring script injection with charset meta tags\n\n  Previous versions
-  of the agent with Real User Monitoring enabled could have\n  injected JavaScript
-  code into the page above a charset meta tag. By the HTML5\n  spec, the charset tag
-  must appear in the first 1024 bytes of the page, so the\n  Ruby agent will now attempt
-  to inject RUM script after a charset tag, if one\n  is present.\n\n* More robust
-  connection sequence with New Relic servers\n\n  A rare bug that could cause the
-  agent's initial connection handshake with\n  New Relic servers to silently fail
-  has been fixed, and better logging has been\n  added to the related code path to
-  ease diagnosis of any future issues.\n\n* Prevent over-counting of queue time with
-  nested transactions\n\n  When using add_transaction_tracer on methods called from
-  within a Rails or\n  Sinatra action, it was previously possible to get inflated
-  queue time\n  measurements, because queue time would be recorded for both the outer\n
-  \ transaction (the Rails or Sinatra action) and the inner transaction (the\n  method
-  given to add_transaction_tracer). This has been fixed, so only the\n  outermost
-  transaction will now record queue time.\n\n    See https://github.com/newrelic/rpm/blob/master/CHANGELOG
+post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.8.1 ##\n\n*
+  Better handling for Rack applications implemented as middlewares\n\n  When using
+  a Sinatra application as a middleware around another app (for\n  example, a Rails
+  app), or manually instrumenting a Rack middleware wrapped\n  around another application,
+  the agent would previously generate two separate\n  transaction names in the New
+  Relic UI (one for the middleware, and one for\n  the inner application).\n\n  As
+  of this release, the agent will instead unify these two parts into a single\n  transaction
+  in the UI. The unified name will be the name assigned to the\n  inner-most traced
+  transaction by default. Calls to\n  NewRelic::Agent.set_transaction_name will continue
+  to override the default\n  names assigned by the agent's instrumentation code.\n\n
+  \ This change also makes it possible to run X-Ray sessions against transactions\n
+  \ of the 'inner' application in cases where one instrumented app is wrapped in\n
+  \ another that's implemented as a middleware.\n\n* Support for mongo-1.10.0\n\n
+  \ The Ruby agent now instruments version 1.10.0 of the mongo gem (versions 1.8.x\n
+  \ and 1.9.x were already supported, and continue to be).\n\n* Allow setting configuration
+  file path via an option to manual_start\n\n  Previously, passing the :config_path
+  option to NewRelic::Agent.manual_start\n  would not actually affect the location
+  that the agent would use to look for\n  its configuration file. This has been fixed,
+  and the log messages emitted when\n  a configuration file is not found should now
+  be more helpful.\n\n    See https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\n    changes.\n"
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- New Relic Ruby Agent
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -1169,3 +1113,4 @@ signing_key:
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
+has_rdoc: 

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

@@ -1,114 +0,0 @@
-# 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 StatsEngine
-    # A simple stack element that tracks the current name and length
-    # of the executing stack
-    class ScopeStackElement
-      attr_reader :deduct_call_time_from_parent, :tag
-      attr_accessor :name, :start_time, :children_time
-      def initialize(tag, start_time, deduct_call_time)
-        @tag = tag
-        @start_time = start_time
-        @deduct_call_time_from_parent = deduct_call_time
-        @children_time = 0
-      end
-    end
-
-    # Handles pushing and popping elements onto an internal stack that
-    # tracks where time should be allocated in Transaction Traces
-    module Transactions
-
-      # Defines methods that stub out the stats engine methods
-      # when the agent is disabled
-      module Shim # :nodoc:
-        def start_transaction(*args); end
-        def end_transaction; end
-        def push_scope(*args); end
-        def transaction_sampler=(*args); end
-        def pop_scope(*args); end
-      end
-
-
-      # Pushes a scope onto the transaction stack - this generates a
-      # TransactionSample::Segment at the end of transaction execution
-      # The generated segment will not be named until the corresponding
-      # pop_scope call is made.
-      # +tag+ should be a Symbol, and is only used for debugging purposes to
-      # identify this scope if the stack gets corrupted.
-      def push_scope(tag, time = Time.now.to_f, deduct_call_time_from_parent = true)
-        stack = scope_stack
-        transaction_sampler.notice_push_scope(time) if sampler_enabled?
-        scope = ScopeStackElement.new(tag, time, deduct_call_time_from_parent)
-        stack.push scope
-        scope
-      end
-
-      # Pops a scope off the transaction stack - this updates the
-      # transaction sampler that we've finished execution of a traced method
-      # +expected_scope+ should be the ScopeStackElement that was returned by
-      # the corresponding push_scope call.
-      # +name+ is the name that will be applied to the generated transaction
-      # trace segment.
-      def pop_scope(expected_scope, name, time=Time.now.to_f)
-        stack = scope_stack
-        scope = stack.pop
-        fail "unbalanced pop from blame stack, got #{scope ? scope.tag : 'nil'}, expected #{expected_scope ? expected_scope.tag : 'nil'}" if scope != expected_scope
-
-        if !stack.empty?
-          if scope.deduct_call_time_from_parent
-            stack.last.children_time += (time - scope.start_time)
-          else
-            stack.last.children_time += scope.children_time
-          end
-        end
-        transaction_sampler.notice_pop_scope(name, time) if sampler_enabled?
-        scope.name = name
-        scope
-      end
-
-      def sampler_enabled?
-        Agent.config[:'transaction_tracer.enabled'] || Agent.config[:developer_mode]
-      end
-
-      def transaction_sampler
-        Agent.instance.transaction_sampler
-      end
-
-      # deprecated--used to add transaction sampler, now we always look to the agent
-      def transaction_sampler= sampler
-        NewRelic::Agent.logger.warn("NewRelic::Agent::StatsEngine#transaction_sampler is deprecated")
-      end
-
-      # Start a new transaction, unless one is already in progress
-      def start_transaction
-        NewRelic::Agent.instance.events.notify(:start_transaction)
-      end
-
-      # Try to clean up gracefully, otherwise we leave things hanging around on thread locals.
-      # If it looks like a transaction is still in progress, then maybe this is an inner transaction
-      # and is ignored.
-      #
-      def end_transaction
-        stack = scope_stack
-
-        if stack && stack.empty?
-          NewRelic::Agent::TransactionState.get.clear_stats_scope_stack
-        end
-      end
-
-      def transaction_stats_hash
-        Transaction.current && Transaction.current.stats_hash
-      end
-
-      # Returns the current scope stack, memoized to a thread local variable
-      def scope_stack
-        NewRelic::Agent::TransactionState.get.stats_scope_stack
-      end
-    end
-  end
-end
-end

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

@@ -1,52 +0,0 @@
-# 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/instrumentation'
-module NewRelic
-  module Agent
-    class Transaction
-      module Pop
-        def log_underflow
-          ::NewRelic::Agent.logger.error "Underflow in transaction: #{caller.join("\n   ")}"
-        end
-
-        def record_transaction_cpu
-          burn = cpu_burn
-          transaction_sampler.notice_transaction_cpu_time(burn) if burn
-        end
-
-        def normal_cpu_burn
-          return unless @process_cpu_start
-          process_cpu - @process_cpu_start
-        end
-
-        def jruby_cpu_burn
-          return unless @jruby_cpu_start
-          burn = (jruby_cpu_time - @jruby_cpu_start)
-          # record_jruby_cpu_burn(burn)
-          burn
-        end
-
-        # we need to do this here because the normal cpu sampler
-        # process doesn't work on JRuby. See the cpu_sampler.rb file
-        # to understand where cpu is recorded for non-jruby processes
-        def record_jruby_cpu_burn(burn)
-          NewRelic::Agent.record_metric(NewRelic::Metrics::USER_TIME, burn)
-        end
-
-        def cpu_burn
-          normal_cpu_burn || jruby_cpu_burn
-        end
-
-        def traced?
-          NewRelic::Agent.is_execution_traced?
-        end
-
-        def current_stack_metric
-          metric_name
-        end
-      end
-    end
-  end
-end

data/test/new_relic/agent/transaction/pop_test.rb

@@ -1,79 +0,0 @@
-# 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 File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
-require 'new_relic/agent/transaction/pop'
-class NewRelic::Agent::Transaction::PopTest < Minitest::Test
-  include NewRelic::Agent::Transaction::Pop
-
-  attr_reader :agent
-  attr_reader :transaction_sampler
-  attr_reader :sql_sampler
-
-  def setup
-    @transaction_type_stack = []
-    @agent = mock('agent')
-    @transaction_sampler = mock('transaction sampler')
-    @sql_sampler = mock('sql sampler')
-  end
-
-  def test_log_underflow
-    expects_logging(:error, regexp_matches(/Underflow in transaction: /))
-    log_underflow
-  end
-
-  def test_record_transaction_cpu_positive
-    self.expects(:cpu_burn).once.returns(1.0)
-    transaction_sampler.expects(:notice_transaction_cpu_time).with(1.0)
-    record_transaction_cpu
-  end
-
-  def test_record_transaction_cpu_negative
-    self.expects(:cpu_burn).once.returns(nil)
-    # should not be called for the nil case
-    transaction_sampler.expects(:notice_transaction_cpu_time).never
-    record_transaction_cpu
-  end
-
-  def test_normal_cpu_burn_positive
-    @process_cpu_start = 3
-    self.expects(:process_cpu).returns(4)
-    assert_equal 1, normal_cpu_burn
-  end
-
-  def test_normal_cpu_burn_negative
-    @process_cpu_start = nil
-    self.expects(:process_cpu).never
-    assert_equal nil, normal_cpu_burn
-  end
-
-  def test_jruby_cpu_burn_negative
-    @jruby_cpu_start = nil
-    self.expects(:jruby_cpu_time).never
-    self.expects(:record_jruby_cpu_burn).never
-    assert_equal nil, jruby_cpu_burn
-  end
-
-  def test_record_jruby_cpu_burn
-    NewRelic::Agent.get_stats_no_scope(NewRelic::Metrics::USER_TIME).expects(:record_data_point).with(1.0, 1.0)
-    record_jruby_cpu_burn(1.0)
-  end
-
-  def test_cpu_burn_normal
-    self.expects(:normal_cpu_burn).returns(1)
-    self.expects(:jruby_cpu_burn).never
-    assert_equal 1, cpu_burn
-  end
-
-  def test_cpu_burn_jruby
-    self.expects(:normal_cpu_burn).returns(nil)
-    self.expects(:jruby_cpu_burn).returns(2)
-    assert_equal 2, cpu_burn
-  end
-
-  def test_current_stack_metric
-    self.expects(:metric_name)
-    current_stack_metric
-  end
-end