newrelic_rpm 3.7.1.182 → 3.7.1.188

data.tar.gz.sig

@@ -1,2 +1,2 @@
-Nw}7��{.[`�]��T��C�\��ް����>�"����Z�e
Q�귅��/������$�s4BM@��d�3*��%��w��[o}��B^��hz�O6
-Z����CV!C��j�������[@�W��K�+��l��7��7Ɯ_��RXMצ�H�x���s�4[J��
+���ڪb��f��w+�;Q�ڇ0g��Q�*	�0T�hA(����9��Oh�r��
+)~��U�6�.g�V]�F�<�@!���{�1�Ug��k1�����͆c����[�5v�gU�H�:�L��WM��6������

data/CHANGELOG

@@ -33,6 +33,12 @@
   calling through to the uninstrumented version of this method. This has been
   fixed in 3.7.1.182. Thanks to Yuki Miyauchi for the fix!
 
+  * Correct first reported metric timespan for forking dispatchers (3.7.1.188)
+
+  The first time a newly-forked process (in some configurations) reported metric
+  data, it would use the startup time of the parent process as the start time
+  for that metric data instead of its own start time. This has been fixed.
+
 ## v3.7.0 ##
 
   * Official Rubinius support (for Rubinius >= 2.2.1)

data/lib/new_relic/agent/new_relic_service.rb

@@ -23,14 +23,13 @@ module NewRelic
       # 534:   v2 (shows up in 2.1.0, our first tag)
 
       attr_accessor :request_timeout, :agent_id
-      attr_reader :collector, :marshaller, :metric_id_cache, :last_metric_harvest_time
+      attr_reader :collector, :marshaller, :metric_id_cache
 
       def initialize(license_key=nil, collector=control.server)
         @license_key = license_key || Agent.config[:license_key]
         @collector = collector
         @request_timeout = Agent.config[:timeout]
         @metric_id_cache = {}
-        @last_metric_harvest_time = Time.now
 
         @audit_logger = ::NewRelic::Agent::AuditLogger.new
         Agent.config.register_callback(:'audit_log.enabled') do |enabled|
@@ -88,6 +87,11 @@ module NewRelic
                                        metric_spec_hash['scope'])
           metric_id_cache[metric_spec] = metric_id
         end
+      rescue => e
+        # If we've gotten this far, we don't want this error to propagate and
+        # make this post appear to have been non-successful, which would trigger
+        # re-aggregation of the same metric data into the next post, so just log
+        NewRelic::Agent.logger.error("Failed to fill metric ID cache from response, error details follow ", e)
       end
 
       # The collector wants to recieve metric data in a format that's different
@@ -111,17 +115,17 @@ module NewRelic
       end
 
       def metric_data(stats_hash)
-        harvest_time = stats_hash.harvested_at || Time.now
+        timeslice_start = stats_hash.started_at
+        timeslice_end  = stats_hash.harvested_at || Time.now
         metric_data_array = build_metric_data_array(stats_hash)
         result = invoke_remote(
           :metric_data,
           @agent_id,
-          @last_metric_harvest_time.to_f,
-          harvest_time.to_f,
+          timeslice_start.to_f,
+          timeslice_end.to_f,
           metric_data_array
         )
         fill_metric_id_cache(result)
-        @last_metric_harvest_time = harvest_time
         result
       end
 

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

@@ -145,7 +145,7 @@ module NewRelic
         end
 
         def apply_rules_to_metric_data(rules_engine, stats_hash)
-          renamed_stats = NewRelic::Agent::StatsHash.new
+          renamed_stats = NewRelic::Agent::StatsHash.new(stats_hash.started_at)
           stats_hash.each do |spec, stats|
             new_name = rules_engine.rename(spec.name)
             new_spec = NewRelic::MetricSpec.new(new_name, spec.scope)

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

@@ -18,18 +18,20 @@ require 'new_relic/agent/internal_agent_error'
 module NewRelic
   module Agent
     class StatsHash < ::Hash
-      attr_accessor :harvested_at
+      attr_accessor :started_at, :harvested_at
 
-      def initialize
-        super { |hash, key| hash[key] = NewRelic::Agent::Stats.new }
+      def initialize(started_at=Time.now)
+        @started_at = started_at
+        super() { |hash, key| hash[key] = NewRelic::Agent::Stats.new }
       end
 
       def marshal_dump
-        Hash[self]
+        [@started_at, Hash[self]]
       end
 
-      def marshal_load(hash)
-        self.merge!(hash)
+      def marshal_load(data)
+        @started_at = data.shift
+        self.merge!(data.shift)
       end
 
       def ==(other)
@@ -86,6 +88,9 @@ module NewRelic
       end
 
       def merge!(other)
+        if other.is_a?(StatsHash) && other.started_at < @started_at
+          @started_at = other.started_at
+        end
         other.each do |key,val|
           begin
             if self.has_key?(key)

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

@@ -43,9 +43,12 @@ module Environments
         Bundler.with_clean_env do
           dir = File.expand_path(dir)
           puts "", yellow("Running tests for #{dir}")
-          bundle(dir)
-          create_database(dir)
-          status = run(dir)
+          status = bundle(dir)
+          if status.success?
+            create_database(dir)
+            status = run(dir)
+          end
+
           if !status.success?
             overall_status += 1
             failures << dir
@@ -99,6 +102,7 @@ module Environments
 
       bundling = red(bundling) unless $?.success?
       puts bundling
+      $?
     end
 
     # Would be nice to get our unit tests decoupled from the actual DB, but

data/test/environments/norails/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rake'
 
@@ -9,7 +9,7 @@ gem 'rack-test'
 platforms :rbx do
   gem "rubysl"
   gem "rubysl-test-unit"
-  gem "rubysl-json"
+  gem "json"
   gem "psych"
   gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
 end

data/test/environments/rails40/Gemfile

@@ -22,7 +22,7 @@ end
 
 platforms :rbx do
   gem "rubysl"
-  gem "rubysl-json"
+  gem "json"
   # If we don't skip the require here, test-unit tries to install its at_exit
   # hook and run when we run our rake task to create the test DB.
   gem "rubysl-test-unit", :require => false

data/test/multiverse/lib/multiverse/suite.rb

@@ -107,7 +107,7 @@ module Multiverse
       return unless is_rbx?
 
       f.puts "gem 'rubysl', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl./
-      f.puts "gem 'rubysl-json', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl-json./
+      f.puts "gem 'json', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .json./
       f.puts "gem 'racc', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .racc./
     end
 

data/test/multiverse/suites/agent_only/harvest_timestamps_test.rb

@@ -0,0 +1,76 @@
+# 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 'newrelic_rpm'
+require 'multiverse_helpers'
+
+class HarvestTimestampsTest < MiniTest::Unit::TestCase
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_resets_metric_data_timestamps_after_forking
+    t0 = freeze_time
+
+    t1 = advance_time 10
+    NewRelic::Agent.after_fork
+
+    t2 = advance_time 10
+    trigger_metric_data_post
+
+    metric_data_post = $collector.calls_for('metric_data').first
+    start_ts, end_ts = metric_data_post[1..2]
+
+    assert_equal(t1.to_f, start_ts)
+    assert_equal(t2.to_f, end_ts)
+  end
+
+  def test_start_timestamp_maintained_on_harvest_failure
+    t0 = freeze_time.to_f
+
+    NewRelic::Agent.after_fork
+
+    $collector.stub('metric_data', {}, 503)
+    t1 = advance_time(10).to_f
+    trigger_metric_data_post
+    first_post = last_metric_data_post
+
+    $collector.reset
+    t2 = advance_time(10).to_f
+    trigger_metric_data_post
+    second_post = last_metric_data_post
+
+    assert_equal([t0, t1], first_post[1..2])
+    assert_equal([t0, t2], second_post[1..2])
+  end
+
+  def test_timestamps_updated_even_if_filling_metric_id_cache_fails
+    t0 = freeze_time.to_f
+
+    NewRelic::Agent.after_fork
+
+    # Induce a failure in filling the metric ID cache by handing back a bogus
+    # response to the first metric_data post.
+    $collector.stub('metric_data', [[[[]]]], 200)
+    t1 = advance_time(10).to_f
+    trigger_metric_data_post
+    first_post = last_metric_data_post
+
+    $collector.reset
+    t2 = advance_time(10).to_f
+    trigger_metric_data_post
+    second_post = last_metric_data_post
+
+    assert_equal([t0, t1], first_post[1..2])
+    assert_equal([t1, t2], second_post[1..2])
+  end
+
+  def trigger_metric_data_post
+    NewRelic::Agent.agent.send(:transmit_data)
+  end
+
+  def last_metric_data_post
+    $collector.calls_for('metric_data').last
+  end
+end

data/test/multiverse/suites/agent_only/thread_profiling_test.rb

@@ -7,6 +7,7 @@
 
 if RUBY_VERSION >= '1.9'
 
+require 'thread'
 require 'multiverse_helpers'
 
 class ThreadProfilingTest < MiniTest::Unit::TestCase
@@ -60,11 +61,11 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
   # go only let a few cycles through, so we check less than 10
 
   def test_thread_profiling
-    issue_command(START_COMMAND)
-
     run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
     run_thread { NewRelic::Agent::Transaction.start(:task) }
 
+    issue_command(START_COMMAND)
+
     let_it_finish
 
     profile_data = $collector.calls_for('profile_data')[0]
@@ -79,11 +80,11 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
 
   def test_thread_profiling_with_pruby_marshaller
     with_config(:marshaller => 'pruby') do
-      issue_command(START_COMMAND)
-
       run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
       run_thread { NewRelic::Agent::Transaction.start(:task) }
 
+      issue_command(START_COMMAND)
+
       let_it_finish
     end
 
@@ -118,15 +119,29 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
 
   # Runs a thread we expect to span entire test and be killed at the end
   def run_thread
-    Thread.new do
+    q = Queue.new
+    @threads ||= []
+    @threads << Thread.new do
       yield
-      sleep(10)
+      q.push('.')
+      sleep # sleep until explicitly woken in join_background_threads
     end
+    q.pop # block until the thread has had a chance to start up
   end
 
   def let_it_finish
     wait_for_backtrace_service_poll(:timeout => 10.0, :iterations => 10)
     harvest
+    join_background_threads
+  end
+
+  def join_background_threads
+    if @threads
+      @threads.each do |thread|
+        thread.run
+        thread.join
+      end
+    end
   end
 
   def harvest

data/test/multiverse/suites/curb/Envfile

@@ -5,15 +5,11 @@ end
 gemfile <<-RB
   gem 'curb', '0.8.1'
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 gemfile <<-RB
   gem 'curb', '~> 0.8.4'
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB

data/test/multiverse/suites/datamapper/Envfile

@@ -5,7 +5,7 @@ end
 omit_collector!
 
 gemfile <<-RB
+  gem 'json', '>= 1.8.1'
   gem 'datamapper'
   gem 'dm-sqlite-adapter'
 RB
-

data/test/multiverse/suites/excon/Envfile

@@ -8,8 +8,6 @@ excon_versions.each do |excon_version|
   gemfile <<-RB
     gem 'excon', '~> #{excon_version}'
     gem 'rack'
-    if RUBY_VERSION < '1.9.0'
-      gem 'json'
-    end
+    gem 'json', :platforms => [:rbx, :mri_18]
   RB
 end

data/test/multiverse/suites/httpclient/Envfile

@@ -8,8 +8,6 @@ httpclient_versions.each do |httpclient_version|
   gemfile <<-RB
     gem 'httpclient', '~> #{httpclient_version}'
     gem 'rack'
-    if RUBY_VERSION < '1.9.0'
-      gem 'json'
-    end
+    gem 'json', :platforms => [:rbx, :mri_18]
   RB
 end

data/test/multiverse/suites/net_http/Envfile

@@ -1,6 +1,4 @@
 gemfile <<-RB
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB

data/test/multiverse/suites/typhoeus/Envfile

@@ -12,9 +12,7 @@ end
 gemfile <<-RB
   gem 'typhoeus', '~> 0.6.3'
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 gemfile <<-RB
@@ -23,9 +21,7 @@ gemfile <<-RB
 
   gem 'typhoeus', '~> 0.5.4'
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 # Earliest supported version
@@ -35,9 +31,7 @@ gemfile <<-RB
 
   gem 'typhoeus', '0.5.3'
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 # Prior to supported versions
@@ -47,7 +41,5 @@ gemfile <<-RB
 
   gem 'typhoeus', '0.5.2'
   gem 'rack'
-  if RUBY_VERSION < '1.9.0'
-    gem 'json'
-  end
+  gem 'json', :platforms => [:rbx, :mri_18]
 RB

data/test/new_relic/agent/new_relic_service_test.rb

@@ -252,20 +252,20 @@ class NewRelicServiceTest < Test::Unit::TestCase
     assert_equal(42, results.first.metric_id)
   end
 
-  def test_metric_data_tracks_last_harvest_time
+  def test_metric_data_harvest_time_based_on_stats_hash_creation
     t0 = freeze_time
+    dummy_rsp = 'met rick date uhh'
+    @http_handle.respond_to(:metric_data, dummy_rsp)
 
-    @http_handle.respond_to(:metric_data, [])
+    advance_time 10
+    stats_hash = NewRelic::Agent::StatsHash.new
+    advance_time 1
+    stats_hash.harvested_at = Time.now
 
-    hash = build_stats_hash('a' => 1)
-    advance_time(1)
-    @service.metric_data(hash)
-    assert_equal(t0, @service.last_metric_harvest_time)
+    @service.metric_data(stats_hash)
 
-    t1 = advance_time(60)
-    hash = build_stats_hash('a' => 1)
-    @service.metric_data(hash)
-    assert_equal(t1, @service.last_metric_harvest_time)
+    timeslice_start = @http_handle.last_request_payload[1]
+    assert timeslice_start >= t0.to_f + 10
   end
 
   def test_error_data

data/test/new_relic/agent/stats_hash_test.rb

@@ -109,11 +109,23 @@ class NewRelic::Agent::StatsHashTest < Test::Unit::TestCase
     assert_equal(1, hash1[specs[3]].call_count)
   end
 
+  def test_merge_re_sets_started_at_if_needed
+    t0 = Time.at(0)
+    t1 = Time.at(100)
+
+    hash0 = NewRelic::Agent::StatsHash.new(t0)
+    hash1 = NewRelic::Agent::StatsHash.new(t1)
+
+    hash1.merge!(hash0)
+    assert_equal(t0, hash1.started_at)
+  end
+
   def test_marshal_dump
     @hash.record('foo', 1)
     @hash.record('bar', 2)
     copy = Marshal.load(Marshal.dump(@hash))
     assert_equal(@hash, copy)
+    assert_equal(@hash.started_at, copy.started_at)
   end
 
   def test_borked_default_proc_can_record_metric

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.7.1.182
+  version: 3.7.1.188
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -586,6 +586,7 @@ files:
 - test/multiverse/suites/agent_only/collector_exception_handling_test.rb
 - test/multiverse/suites/agent_only/config/newrelic.yml
 - test/multiverse/suites/agent_only/cross_application_tracing_test.rb
+- test/multiverse/suites/agent_only/harvest_timestamps_test.rb
 - test/multiverse/suites/agent_only/http_response_code_test.rb
 - test/multiverse/suites/agent_only/key_transactions_test.rb
 - test/multiverse/suites/agent_only/logging_test.rb
@@ -988,7 +989,11 @@ post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.7.1 ##\
   now be more accurate.\n\n* Fix for Mongo ensure_index instrumentation (3.7.1.182)\n\n
   \ The Mongo instrumentation for ensure_index in 3.7.1.180 was not properly\n  calling
   through to the uninstrumented version of this method. This has been\n  fixed in
-  3.7.1.182. Thanks to Yuki Miyauchi for the fix!\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  3.7.1.182. Thanks to Yuki Miyauchi for the fix!\n\n* Correct first reported metric
+  timespan for forking dispatchers (3.7.1.188)\n\n  The first time a newly-forked
+  process (in some configurations) reported metric\n  data, it would use the startup
+  time of the parent process as the start time\n  for that metric data instead of
+  its own start time. This has been fixed.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers