newrelic_plugin 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 ## New Relic Ruby SDK Change Log ##
 
-### vNext - Future Date ###
+### v1.3.1 - November 4, 2013 ###
 
-**Features**
+**Bug Fixes**
+
+* Properly handle null values in epoch_counter_processor
 
 ### v1.3.0 - October 3, 2013 ###
 

data/lib/newrelic_plugin/processors/epoch_counter_processor.rb

@@ -1,21 +1,26 @@
 module NewRelic::Processor
 class EpochCounter<NewRelic::Plugin::Processor::Base
     def initialize
-      super :epoch_counter,"Epoch Counter"
+      super :epoch_counter, "Epoch Counter"
     end
+
     def process val
-      val=val.to_f
-      ret=nil
-      curr_time=Time.now
-      if @last_value and @last_time and curr_time>@last_time
-        ret=(val-@last_value)/(curr_time-@last_time).to_f
+      ret = nil
+      curr_time = Time.now
+
+      if val && @last_value && @last_time && curr_time > @last_time
+        val = val.to_f
+        ret = (val - @last_value.to_f) / (curr_time - @last_time).to_f
       end
-      @last_value=val
-      @last_time=curr_time
+
+      @last_value = val
+      @last_time = curr_time
+
       # This next line is to avoid large negative spikes during epoch reset events...
-      return nil if ret.nil? or ret<0
+      return nil if ret.nil? || ret < 0
       ret
     end
+
     #Component::Setup.install_processor EpochCounter
   end
 end

data/lib/newrelic_plugin/version.rb

@@ -1,5 +1,5 @@
 module NewRelic
   module Plugin
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/newrelic_plugin.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest", '>= 5.0.6'
   s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'timecop'
+  s.add_development_dependency 'timecop', '= 0.6.1'
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/newrelic_plugin/epoch_counter_processor_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+class EpochCounterTest < Minitest::Test
+
+  def test_with_two_valid_pollcycles
+    @counter = NewRelic::Processor::EpochCounter.new
+    firstProcess = @counter.process(5)
+    modify_counter_clock(@counter, 1)
+    secondProcess = @counter.process(6)
+
+    assert_nil(firstProcess)
+    assert(secondProcess > 0)
+  end
+
+  def test_with_null_second_pollcycle
+    @counter = NewRelic::Processor::EpochCounter.new
+    firstProcess = @counter.process(5)
+    modify_counter_clock(@counter, 1)
+    secondProcess = @counter.process(nil)
+    modify_counter_clock(@counter, 1)
+    thirdProcess = @counter.process(6)
+    modify_counter_clock(@counter, 1)
+    fourthProcess = @counter.process(7)
+
+    assert_nil(firstProcess)
+    assert_nil(secondProcess)
+    assert_nil(thirdProcess)
+    assert(fourthProcess > 0)
+  end
+
+  def test_with_null_first_pollcycle
+    @counter = NewRelic::Processor::EpochCounter.new
+    firstProcess = @counter.process(nil)
+    modify_counter_clock(@counter, 1)
+    secondProcess = @counter.process(5)
+    modify_counter_clock(@counter, 1)
+    thirdProcess = @counter.process(6)
+
+    assert_nil(firstProcess)
+    assert_nil(secondProcess)
+    assert(thirdProcess > 0)
+  end
+
+  def test_with_string_values
+    @counter = NewRelic::Processor::EpochCounter.new
+    firstProcess = @counter.process("5")
+    modify_counter_clock(@counter, 1)
+    secondProcess = @counter.process("6")
+    modify_counter_clock(@counter, 1)
+    thirdProcess = @counter.process(7)
+
+    assert_nil(firstProcess)
+    assert(secondProcess > 0)
+    assert(thirdProcess > 0)
+  end
+
+  def modify_counter_clock(counter, seconds)
+    time = counter.instance_variable_get(:@last_time)
+    counter.instance_variable_set(:@last_time, counter.instance_variable_get(:@last_time) - seconds)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_plugin
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 description: The New Relic Plugin Gem is used to send plugin data to New Relic from
   non-application sources.
 email:
@@ -152,6 +152,7 @@ files:
 - test/newrelic_platform_binding/platform_logger_test.rb
 - test/newrelic_platform_binding/request_test.rb
 - test/newrelic_plugin/agent_test.rb
+- test/newrelic_plugin/epoch_counter_processor_test.rb
 - test/newrelic_plugin/run_test.rb
 - test/newrelic_plugin/setup_test.rb
 - test/test_helper.rb