statsn 0.1.0 → 0.1.1

data/.gitignore

@@ -1 +1 @@
-spec/argv.txt
+spec/argv.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    statsn (0.1.0)
+    statsn (0.1.1)
       newrelic_rpm (~> 3.5)
 
 GEM

data/bin/statsn-calls

@@ -3,6 +3,8 @@
 raise "Needs 1.9+" if RUBY_VERSION < "1.9.0"
 PERIOD = 24*60*60
 API_METRICS_LIMIT = 100
+class MissingFieldError < Exception
+end
 
 def stats(options)
   response = Faraday.new(
@@ -10,12 +12,20 @@ def stats(options)
     :params => options,
     :headers => {"x-api-key" => API_KEY}
   ).get
-  raise response.body unless response.status == 200
+
+  if response.status != 200
+    if response.body.include?("The field you use must be valid for at least one metric.")
+      raise MissingFieldError
+    else
+      raise response.body
+    end
+  end
+
   JSON.parse(response.body)
 end
 
-def aggregate(names, field)
-  names.each_slice(API_METRICS_LIMIT).map do |group|
+def aggregate(metric_names, field)
+  metric_names.each_slice(API_METRICS_LIMIT).map do |group|
     stats(:metrics => group, :field => field, :begin => Time.now - PERIOD, :end => Time.now)
   end.flatten(1)
 end
@@ -55,6 +65,14 @@ def metric_names(namespace)
   end
 end
 
+def data_for_field(metric_names, field)
+  metric_data = aggregate(metric_names, field)
+  metric_data = metric_data.group_by { |x| x["name"] }
+  metric_data.map { |_, values| values.inject(0) { |sum, x| sum + x[field] } }.inject(:+)
+rescue MissingFieldError
+  :missing_field
+end
+
 # Dependencies
 gem "json"
 gem "faraday"
@@ -72,22 +90,22 @@ end
 API_KEY, ACCOUNT_ID, APP_ID, namespace = ARGV
 
 # Data
-names = metric_names(namespace)
+metric_names = metric_names(namespace)
+
 results = ["call_count", "total_call_time"].map do |field|
-  metric_data = aggregate(names, field).group_by{ |x| x["name"] }
-  sums = metric_data.map{ |_, values| values.inject(0){ |sum,x| sum + x[field] } }.inject(:+)
-  [field, sums]
+  [field, data_for_field(metric_names, field)]
 end
 
 # Display results
 results = Hash[results]
-if results.values.first
-  call_time = results["total_call_time"]
-  call_count = results["call_count"]
-  puts results.map{|x|x.join(": ")}
-  puts "response time: #{call_time / call_count}"
+call_time = results["total_call_time"]
+call_count = results["call_count"]
+
+if call_time && call_count
+  puts results.reject{ |name,value| value == :missing_field }.map{ |x| x.join(": ") }
+  puts "response time: #{call_time / call_count}" unless call_time == :missing_field
   puts "call per second: #{call_count / PERIOD}"
 else
-  puts "No data found for #{names.join(", ")} in last #{PERIOD} seconds"
+  puts "No data found for #{metric_names.join(", ")} in last #{PERIOD} seconds"
   exit 1
 end

data/lib/statsn/version.rb

@@ -1,3 +1,3 @@
 module Statsn
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/argv.example.yml

@@ -0,0 +1,4 @@
+# keep exmaple up to date when chaning this!
+single: asdadsasddasads 123 123123 Controller/users/update
+multi: asdadsasddasads 123 123123 Controller/users/*
+count: asdadsasddasads 123 123123 Custom/xxx # must only have counts, no response time

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require "bundler/setup"
 require "statsn"
+require "yaml"

data/spec/statsn_calls_spec.rb

@@ -1,10 +1,14 @@
 require "spec_helper"
 
 describe "statsn-calls" do
-  let(:argv){ File.read("#{Bundler.root}/spec/argv.txt").strip }
+  let(:argv){ YAML.load File.read("#{Bundler.root}/spec/argv.yml") }
+
+  before do
+    pending "create a spec/argv.yml" unless (argv rescue nil)
+  end
 
   it "gives us some numbers" do
-    result = run("#{argv} Controller/api/v2/users/update")
+    result = run argv["single"]
     result.should =~ /^call_count: \d+/
     result.should =~ /^total_call_time: \d+/
     result.should =~ /^response time: \d+/
@@ -12,7 +16,7 @@ describe "statsn-calls" do
   end
 
   it "gives us some numbers for a prefix call" do
-    result = run("#{argv} Controller/api/v2/users/*")
+    result = run argv["multi"]
     result.should =~ /^call_count: \d+/
     result.should =~ /^total_call_time: \d+/
     result.should =~ /^response time: \d+/
@@ -29,9 +33,17 @@ describe "statsn-calls" do
     result.should include("statsn-calls API-KEY")
   end
 
+  it "show data for count-only metrics" do
+    result = run argv["count"]
+    result.should =~ /^call_count: \d+/
+    result.should_not =~ /^total_call_time: \d+/
+    result.should_not =~ /^response time: \d+/
+    result.should =~ /^call per second: \d+/
+  end
+
   it "tell us if the metric is missing" do
-    result = run("#{argv} Controller/xxxxxxx", :fail => true)
-    result.should include("No data found for Controller/xxxxxxx")
+    result = run("#{argv["single"]}/xxxx", :fail => true)
+    result.should include("No data found for Controller/")
   end
 
   private

metadata

@@ -2,7 +2,7 @@
 name: statsn
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Grosser
@@ -43,7 +43,7 @@ files:
 - bin/statsn-calls
 - lib/statsn.rb
 - lib/statsn/version.rb
-- spec/argv.example.txt
+- spec/argv.example.yml
 - spec/spec_helper.rb
 - spec/statsn_calls_spec.rb
 - spec/statsn_spec.rb
@@ -62,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3608192158582391302
+      hash: 2968399290205698663
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3608192158582391302
+      hash: 2968399290205698663
   none: false
 requirements: []
 rubyforge_project: 

data/spec/argv.example.txt

@@ -1 +0,0 @@
-asdadsasddasads 123 123123