newrelic_plugin 1.0.3 → 1.2.1

data/test/newrelic_plugin/run_test.rb

@@ -0,0 +1,77 @@
+require 'test_helper'
+
+class RunTest < Minitest::Test
+  TestConfig = Struct.new(:newrelic)
+  def setup
+    @newrelic = {
+    }
+  end
+
+  def test_log_level_set_verbose
+    NewRelic::Logger.expects(:log_level=).with(::Logger::DEBUG)
+    @newrelic['verbose'] = 1
+    initialize_run
+  end
+
+  def test_log_level_not_set
+    NewRelic::Logger.expects(:log_level=).never
+    initialize_run
+  end
+
+  def test_log_level_set_to_not_verbose
+    NewRelic::Logger.expects(:log_level=).never
+    @newrelic['verbose'] = 0
+    initialize_run
+  end
+
+  def test_endpoint_config
+    NewRelic::Binding::Config.expects(:endpoint=).with('http://test.com')
+    @newrelic['endpoint'] = 'http://test.com'
+    initialize_run
+  end
+
+  def test_ssl_host_verification_nil
+    NewRelic::Binding::Config.expects(:ssl_host_verification=).never
+    initialize_run
+  end
+
+  def test_ssl_host_verification_string
+    NewRelic::Binding::Config.expects(:ssl_host_verification=).with(true)
+    @newrelic['ssl_host_verification'] = 'foo'
+    initialize_run
+  end
+
+  def test_ssl_host_verification_false
+    NewRelic::Binding::Config.expects(:ssl_host_verification=).with(false)
+    @newrelic['ssl_host_verification'] = false
+    initialize_run
+  end
+
+  def test_ssl_host_verification_true
+    NewRelic::Binding::Config.expects(:ssl_host_verification=).with(true)
+    @newrelic['ssl_host_verification'] = true
+    initialize_run
+  end
+
+  def test_proxy
+    NewRelic::Binding::Config.expects(:proxy=).with('foobar')
+    @newrelic['proxy'] = 'foobar'
+    initialize_run
+  end
+
+  def test_poll_cycle_period_without_poll_set
+    NewRelic::Binding::Config.expects(:poll_cycle_period=).with(60)
+    initialize_run
+  end
+
+  def test_poll_cycle_period_with_poll_set
+    NewRelic::Binding::Config.expects(:poll_cycle_period=).with(20)
+    @newrelic['poll'] = 20
+    initialize_run
+  end
+
+  def initialize_run
+    NewRelic::Plugin::Config.stubs(:config).returns(TestConfig.new(@newrelic))
+    NewRelic::Plugin::Run.new()
+  end
+end

data/test/newrelic_plugin/setup_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+
+class SetupTest < Minitest::Test
+
+  def setup
+    @context = NewRelic::Binding::Context.new('license_key')
+  end
+
+
+  def test_create_agent
+    setup = NewRelic::Plugin::AgentSetup.new
+    @context.expects(:version=).with('0.0.1')
+    setup.create_agent(@context, 'testing_agent', nil)
+  end
+
+end

data/test/test_helper.rb

@@ -1,15 +1,22 @@
 require 'rubygems'
 require 'bundler'
 Bundler.setup
+require 'newrelic_platform_binding'
 require 'newrelic_plugin'
-require 'test/unit'
-require 'shoulda-context'
-require 'mocha'
+require 'minitest/autorun'
+require 'mocha/setup'
+require 'pry'
+require 'timecop'
 
 
 module TestingAgent
+  NewRelic::Logger.log_level = ::Logger::FATAL
   class Agent < NewRelic::Plugin::Agent::Base
-
+    agent_guid 'com.newrelic.test'
+    agent_version '0.0.1'
+    agent_human_labels("Testing") { "Testing host" }
   end
+
+  NewRelic::Plugin::Setup.install_agent 'testing_agent', TestingAgent
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,16 +26,48 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 5.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 5.0.6
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,14 +123,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/newrelic_platform_binding.rb
+- lib/newrelic_platform_binding/component.rb
+- lib/newrelic_platform_binding/config.rb
+- lib/newrelic_platform_binding/connection.rb
+- lib/newrelic_platform_binding/context.rb
+- lib/newrelic_platform_binding/logger.rb
+- lib/newrelic_platform_binding/metric.rb
+- lib/newrelic_platform_binding/request.rb
 - lib/newrelic_plugin.rb
 - lib/newrelic_plugin/agent.rb
 - lib/newrelic_plugin/config.rb
-- lib/newrelic_plugin/data_collector.rb
 - lib/newrelic_plugin/error.rb
-- lib/newrelic_plugin/logger.rb
-- lib/newrelic_plugin/new_relic_connection.rb
-- lib/newrelic_plugin/new_relic_message.rb
 - lib/newrelic_plugin/processor.rb
 - lib/newrelic_plugin/processors/epoch_counter_processor.rb
 - lib/newrelic_plugin/processors/rate_processor.rb
@@ -107,11 +143,17 @@ files:
 - lib/newrelic_plugin/simple_syntax.rb
 - lib/newrelic_plugin/version.rb
 - newrelic_plugin.gemspec
-- test/agent_test.rb
 - test/fixtures/valid_payload.json
-- test/logger_test.rb
-- test/manual_test.rb
-- test/new_relic_message_test.rb
+- test/newrelic_platform_binding/component_test.rb
+- test/newrelic_platform_binding/config_test.rb
+- test/newrelic_platform_binding/connection_test.rb
+- test/newrelic_platform_binding/context_test.rb
+- test/newrelic_platform_binding/logger_test.rb
+- test/newrelic_platform_binding/metric_test.rb
+- test/newrelic_platform_binding/request_test.rb
+- test/newrelic_plugin/agent_test.rb
+- test/newrelic_plugin/run_test.rb
+- test/newrelic_plugin/setup_test.rb
 - test/test_helper.rb
 homepage: http://newrelic.com
 licenses: []

data/lib/newrelic_plugin/data_collector.rb

@@ -1,67 +0,0 @@
-module NewRelic
-  module Plugin
-#
-# Gather's data from agent and presents it to nr_connect for processing.
-#
-# This is a wrapper for nr_connect used in the context of an agent.
-#
-    class DataCollector
-      #
-      #
-      # Methods used within an agent implementation:
-      #
-      #
-      def add_data metric_name,units,data,opts={}
-        nrmsg.add_stat_fullname(
-            "Component/#{metric_name}[#{units}]",
-            1,
-            data,
-            :min => data,
-            :max => data,
-            :sum_of_squares => (data*data)
-        )
-        #puts "Metric '#{metric_name}' (#{units}): raw: #{value}, processed: #{data} (#{processor_type})" if verbose?
-        @cnt+=1
-        data
-      end
-
-
-      #
-      # Internal methods used within Agent class
-      #
-      def initialize agent,poll_interval
-        @agent=agent
-        @poll_interval=poll_interval
-        @cnt=0
-      end
-      def process
-        nrmsg_send
-        @cnt
-      end
-
-      ################################################################################
-      private
-
-      def verbose?
-        return @verbose unless @verbose.nil?
-        @verbose=NewRelic::Plugin::Config.config.newrelic["verbose"].to_i>0
-      end
-
-      #
-      # NewRelicConnection Handling
-      #
-      def nrmsg
-        @nrmsg||=nrobj.start_message @agent.instance_label,@agent.guid,@agent.version,@poll_interval
-      end
-      def nrmsg_send
-        return unless @nrmsg
-        @nrmsg.send_metrics
-        @nrmsg=nil
-      end
-      def nrobj
-        @nrobj||=NewRelic::Plugin::NewRelicConnection.new NewRelic::Plugin::Config.config.newrelic
-      end
-
-    end
-  end
-end

data/lib/newrelic_plugin/logger.rb

@@ -1,19 +0,0 @@
-module NewRelic
-  module Plugin
-    require 'time'
-
-    class Logger
-      def self.write(message)
-        Logger.output "[#{Logger.timestamp}] #{message}"
-      end
-
-      def self.output(message)
-        puts message
-      end
-
-      def self.timestamp
-        Time.iso8601(Time.now.utc.iso8601).to_s
-      end
-    end
-  end
-end

data/lib/newrelic_plugin/new_relic_connection.rb

@@ -1,67 +0,0 @@
-require 'faraday'
-
-module NewRelic
-  module Plugin
-    class NewRelicConnection
-      #
-      # Allowed configuration Values:
-      #   license_key [required] Specifies RPM account to store metrics in
-      #   host [optional] override default production collector
-      #   port [optional] override default production collector
-      #   verbose [optional] log HTTP transactions to stdout
-      #
-      def initialize config = {}
-        @config = config
-      end
-      #
-      # Start creating a message containing a set of metrics to New Relic.
-      #
-      def start_message component_name,component_guid,component_version,duration_in_seconds
-        NewRelic::Plugin::NewRelicMessage.new self,component_name,component_guid,component_version,duration_in_seconds
-      end
-
-      #################### Internal Only
-      #
-      # Create HTTP tunnel to New Relic
-      #
-      def connect
-        @connect ||= Faraday.new(:url => url, :ssl => { :verify => ssl_host_verification } ) do |builder|
-          builder.request  :url_encoded
-          builder.response :logger if @config["log_http"].to_i>0
-          builder.use AuthenticationMiddleware,license_key
-          builder.adapter  :net_http
-        end
-      end
-      def url
-        @config["endpoint"] || "https://platform-api.newrelic.com"
-      end
-      def uri
-        @config["uri"] || "/platform/v1/metrics"
-      end
-      def ssl_host_verification
-        ssl_host_verification = @config["ssl_host_verification"]
-        return true if ssl_host_verification.nil?
-        !!ssl_host_verification
-      end
-      class AuthenticationMiddleware < Faraday::Middleware
-        def initialize(app,apikey)
-          super(app)
-          @apikey = apikey
-        end
-        def call(env)
-          unless env[:request_headers]['X-License-Key']
-            env[:request_headers]['X-License-Key'] = @apikey
-          end
-          @app.call(env)
-        end
-      end
-      def log_metrics?
-        @config["verbose"] || @config["log_metrics"]
-      end
-      def license_key
-        @config["license_key"]
-      end
-
-    end
-  end
-end

data/lib/newrelic_plugin/new_relic_message.rb

@@ -1,173 +0,0 @@
-require 'json'
-
-module NewRelic
-  module Plugin
-#
-# NewRelic driver. Provides all methods necessary for accessing the NewRelic service.
-# Used to store data into NewRelic service.
-#
-# Usage:
-#
-#   nrobj=NewRelic::Plugin::NewRelicConnection.new license_key:"xxx",host:"xxx",port:80,log_http:true,log_metrics:true # log_http,host and port are optional; license key is not.
-#   msg=nrobj.start_message <component_name>,<component_guid>,<component_version>,<duration_in_seconds>
-#   msg.add_stat basename,count_unit,value_unit,count,value,opts={} # opts can include :min, :max, and :sum_of_squares
-#   msg.send_message # Send the list of stats to New Relic
-#
-# Example:
-#   nrobj=NewRelic::Plugin::NewRelicConnection.new license_key:"bootstrap_newrelic_admin_license_key_000",host:"localhost",port:8081,log_http:true,log_metrics:true
-#   msg=nrobj.start_message "A Kewl Component","12345678","0.0.1",60
-#   msg.add_stat_fullname "Component/TestMetric1[Bytes/Seconds]",2,34,min:31,max:54,sum_of_squares:1234
-#   msg.add_stat_fullname "Component/AnotherTest[Bytes/Seconds]",2,34,min:31,max:54,sum_of_squares:1234
-#   msg.add_stat_fullname "Component/TestMetric2[Bytes/Seconds]",2,34,min:31,max:54,sum_of_squares:1234
-#   msg.add_stat_fullname "Component/AnotherMetric[Bytes/Seconds]",2,34,min:31,max:54,sum_of_squares:1234
-#   msg.send_metrics # Send the list of stats to New Relic
-#
-
-
-
-    class NewRelicMessage
-      #
-      #
-      # Create an object to send metrics
-      #
-      #
-      def initialize connection,component_name,component_guid,component_version,duration_in_seconds
-        @connection = connection
-        @component_name = component_name
-        @component_guid = component_guid
-        @component_version = component_version
-        @duration_in_seconds = duration_in_seconds
-        @metrics = [] # Metrics being saved
-      end
-      def add_stat_fullname metric_name,count,value,opts={}
-        entry = {}
-        entry[:metric_name] = metric_name
-        entry[:count] = count
-        entry[:total] = value
-        [:min,:max,:sum_of_squares].each do |key|
-          entry[key] = opts[key]
-        end
-        @metrics << entry
-      end
-
-      def metrics
-        @metrics
-      end
-
-      def send_metrics
-        return_errors = []
-        Logger.write "Metrics for #{@component_name}[#{@component_guid}] for last #{@duration_in_seconds} seconds:" if new_relic_connection.log_metrics?
-        #
-        # Send all metrics in a single transaction
-        #
-        response = deliver_metrics
-        evaluate_response(response)
-        log_send_metrics
-      end
-
-      private
-
-      def build_metrics_hash
-        metrics_hash = {}
-        metrics.each do |metric|
-          metric_value = []
-          [:total,:count,:max,:min,:sum_of_squares].each do |key|
-            metric_value.push(metric[key]) if metric[key]
-          end
-          metrics_hash[metric[:metric_name]] = metric_value
-        end
-        return metrics_hash
-      end
-
-      def build_request_payload
-        data = {
-          "agent" => {
-              "name" => @component_name,
-              "version" => @component_version,
-              "host" => ""
-          },
-          "components" => [
-              {
-                "name" => @component_name,
-                "guid" => @component_guid,
-                "duration" => @duration_in_seconds,
-                "metrics" => build_metrics_hash
-              }
-          ]
-        }
-        return data.to_json
-      end
-
-      def deliver_metrics
-        begin
-          response = new_relic_connection.connect.post do |req|
-            req.url new_relic_connection.uri
-            req.headers['Content-Type'] = 'application/json'
-            req.body = build_request_payload
-          end
-        rescue => err
-          Logger.write "HTTP Connection Error: #{err.inspect} #{err.message}"
-        end
-
-        return response
-      end
-
-      def evaluate_response(response)
-        return_status = nil
-        if response.nil?
-          last_result={"error" => "no response"}
-          return_status = "FAILED: No response"
-        elsif response && response.status == 200
-          last_result = JSON.parse(response.body)
-          if last_result["status"] != "ok"
-            return_status = "FAILED[#{response.status}] <#{new_relic_connection.url}>: #{last_result["error"]}"
-          end
-        elsif response && response.status == 403 && response.body == "DISABLE_NEW_RELIC"
-          Logger.write "Agent has been disabled remotely by New Relic"
-          abort "Agent has been disabled remotely by New Relic"
-        else
-          begin
-            if response.body.size>0
-              last_result = JSON.parse(response.body)
-            else
-              last_result = {"error" => "no data returned"}
-            end
-            return_status = "FAILED[#{response.status}] <#{new_relic_connection.url}>: #{last_result["error"]}"
-          rescue => err
-            if response
-              return_status = "FAILED[#{response.status}] <#{new_relic_connection.url}>: Could not parse response: #{err}"
-            else
-              return_status = "FAILED: #{err}"
-            end
-          end
-        end
-        if return_status
-          if response and response.status == 503 and !new_relic_connection.log_metrics?
-            # If logging not enabled, and it's a 503...be less error-ish...
-            Logger.write "  Collector temporarily unavailable...continuing"
-          else
-            # Otherwise, in all cases (logging enabled or not) print an error message
-            Logger.write "  ****ERROR: #{return_status}"
-          end
-        end
-      end
-
-      def log_send_metrics
-        if new_relic_connection.log_metrics?
-          Logger.write "  Sent #{metrics.size} metrics to New Relic [#{new_relic_connection.url}]:"
-          metrics.each do |metric|
-            val_strs = []
-            [:count,:total,:min,:max,:sum_of_squares].each do |key|
-              val_strs << "#{key}: #{metric[key]}" if metric[key]
-            end
-            Logger.write "    #{metric[:metric_name]}: #{val_strs.join(', ')}"
-          end
-        end
-      end
-
-      def new_relic_connection
-        @connection
-      end
-    end
-  end
-end