sematext-metrics 0.0.1.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjBmNTFiNWNlODliZGU5NWFhODVkZDg2YTExNmUzOTJlMDExZDYyNw==
+    ODUxZjQ0NWQ1OWVjZDQ5YmY1ODg2OWI1Yzg2YjE3NGRhOTlkZWEwMw==
   data.tar.gz: !binary |-
-    MGE1NTIzZDU0NmQ1YTY0Y2NmMGE3ZTIyNjdjNDY1OGE0ZGI5NmM3YQ==
+    NWY1YmI0YjE4YjRhZDU1ZDI4MDRlYzMwNDU5MDdlZGYxMmY0ODJkMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjI1ZmZlMzI4NmY2MzBjYWE1N2M3NTk4YzZlOTQ0NTFiZDZhYjhiMzc1YWM3
-    YjMwN2QyMGI2OTAyZGYyNDdmY2FmMmFhOWMwYTE3MGE4ODA3MmM1MjA3Zjg0
-    YjE3MGNlNDVjMzQyNzhkZjMyNGRmMmZlZmNkYWQ2YzYxNWY3ZDM=
+    ZmZhMWNhODQxNmE3NTYzYzZhMjBlZDZiZTY1MTE0MjQ4ZDhlOWFhZDM5ZmVj
+    NmUzNzAyYTI4NDg4ODkwZGU0MDY5M2EwODBlMGVkOWViMTZjYjhkZjQyM2Q4
+    ZDNjODZhNzlmNWYzNjE0N2QxODA3ZTY1MmNjZWIwOGYxNjkxNjc=
   data.tar.gz: !binary |-
-    NzRiMWU4YzBiYmIwMjk5ZTJlNDc3ODUzZGQwNzNkNGY2MzhiYTVhY2U4MDcw
-    ZmI2YmZiOWY3MGU3ZWUzMWJjNTc2MDFkYWEwNzBiODRlM2MwZGM2ZDBlY2Zk
-    NjM5YWE0NTE2YzExOGY3YjFkNmVlZjRlY2M0MzVjNDBkMzdkM2Y=
+    YzViYzMxODMxY2Q4YTRmYWMyYzkxOWY5MGQyZDE2NmFkM2YwNWQ3NmEyNzhk
+    NjQwNDM5MjMzZThlODFmYzc3ZWUyZDdkMWMwY2FkZGNmYzAwZjJkOTc1MDY3
+    YTE3NzRlZDQ1MGIxZTQyNmEwODk0NmNmN2JhMjJhYjRiZDk3ZGY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sematext-metrics (0.0.1)
+    sematext-metrics (0.0.2)
       httparty (~> 0.11.0)
 
 GEM
@@ -11,9 +11,9 @@ GEM
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
-    multi_json (1.7.6)
-    multi_xml (0.5.4)
-    rake (10.0.4)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    rake (10.1.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)

data/README.md

@@ -1,4 +1,4 @@
-# sematext-metrics gem
+# sematext-metrics gem[![Build Status](https://travis-ci.org/sematext/sematext-metrics-gem.png)](https://travis-ci.org/sematext/sematext-metrics-gem)
 
 Ruby gem for sending [Custom Metrics](https://sematext.atlassian.net/wiki/display/PUBSPM/Custom+Metrics) to [SPM](http://sematext.com/spm/index.html).
 
@@ -62,6 +62,14 @@ To use different tokens for different applications, use `sync` or `async` factor
     user_metrics.send_batch user_datapoints
     search_metrics.send_batch search_datapoints
 
+To send metrics to on-premises SPM setup you can also configure endpoint url:
+
+    user_metrics = Sematext::Metrics::Client.sync("[token]", "http://spm-receiver.example.com/spm-receiver/custom/receive.raw")
+    search_metrics = Sematext::Metrics::Client.async("[token]", "http://spm-receiver.example.com/spm-receiver/custom/receive.raw")
+
+or
+
+    Sematext::Metrics.initialize("[token]", :receiver_url => "http://spm-receiver.example.com/spm-receiver/custom/receive.raw")
 
 ## Asynchronous sending
 
@@ -72,7 +80,7 @@ In order to use this extension add  `em-http-request` gem to your application ma
 
 Asynchronous data sending can be configured during initialization:
 
-    Sematext::Metrics.initialize("[token]", async=true)
+    Sematext::Metrics.initialize("[token]", :async => true)
 
 Or use `async` factory method to create a client instance:
 

data/lib/sematext/metrics.rb

@@ -21,9 +21,16 @@ require "sematext/metrics/async_sender"
 
 module Sematext
   module Metrics
-    def self.initialize(token, async = false)
+    def self.initialize(token, args = {})
       raise "Token should be defined" unless token
-      @client = async ? Client.async(token) : Client.sync(token)
+
+      opts = { :async => false }
+      if !!args == args
+        opts[:async] = args
+      elsif args.kind_of?(Hash)
+        opts.merge!(args)
+      end
+      @client = opts[:async] ? Client.async(token, opts[:receiver_url]) : Client.sync(token, opts[:receiver_url])
     end
 
     def self.send datapoint
@@ -42,12 +49,20 @@ module Sematext
 
     class Client
       class << self
-        def sync(token)
-          Client.new(SyncSender.new(token))
+        def sync(token, receiver_url = nil)
+          url, path = parse_url(receiver_url) if receiver_url
+          Client.new(SyncSender.new(token, url, path))
         end
         
-        def async(token)
-          Client.new(AsyncSender.new(token))
+        def async(token, receiver_url = nil)
+          url, path = parse_url(receiver_url) if receiver_url
+          Client.new(AsyncSender.new(token, url, path))
+        end
+
+        private
+        def parse_url(url)
+          uri = URI.parse(url)
+          ["#{uri.scheme}://#{uri.host}:#{uri.port}", uri.path]
         end
       end
 
@@ -77,7 +92,7 @@ module Sematext
           @sender.send serialized
         end
       end
-
+      
       def epoch 
         Time.now.to_i * 1000
       end

data/lib/sematext/metrics/async_sender.rb

@@ -15,8 +15,10 @@
 module Sematext
   module Metrics
     class AsyncSender
-      def initialize(token)
+      def initialize(token, base_uri, path)
         @token = token
+        @path = path || Settings::RECEIVER_PATH
+        @base_uri = base_uri || Settings::RECEIVER_URI
         if defined?(EventMachine)
           require 'em-http-request'
         end
@@ -26,7 +28,7 @@ module Sematext
         deferrable = EventMachine::DefaultDeferrable.new
 
         post_options = {
-          :path => Settings::RECEIVER_PATH,
+          :path => @path,
           :query => {:token => @token},
           :body => data,
           :head => {
@@ -35,7 +37,7 @@ module Sematext
           }
         }
         
-        http = EventMachine::HttpRequest.new(Settings::RECEIVER_URI).post post_options
+        http = EventMachine::HttpRequest.new(@base_uri).post post_options
         http.errback { 
           deferrable.fail{{:status => :failed}}
         }

data/lib/sematext/metrics/sync_sender.rb

@@ -19,9 +19,10 @@ module Sematext
     class SyncSender
       include HTTParty
 
-      def initialize(token)
+      def initialize(token, base_uri, path)
         @token = token
-        self.class.default_options[:base_uri] = Settings::RECEIVER_URI
+        self.class.default_options[:base_uri] = base_uri ||  Settings::RECEIVER_URI
+        @path = path || Settings::RECEIVER_PATH
       end
       
       def send data
@@ -33,7 +34,7 @@ module Sematext
           },
           :body => data
         }
-        response = self.class.post(Settings::RECEIVER_PATH, post_options)
+        response = self.class.post(@path, post_options)
         if response.code == 201
           {:status => :succeed}
         else

data/lib/sematext/metrics/validator.rb

@@ -30,6 +30,8 @@ module Sematext
         [:name, :value, :agg_type].each do |field|
           check_obligatory field, datapoint[field]
         end
+        raise "name can't be empty" if datapoint[:name].empty?
+        raise "value should be a number" unless datapoint[:value].kind_of?(Numeric)
         [:name, :filter1, :filter2].each do |field|
           value = datapoint[field]
           check_bounds field, datapoint[field] if value

data/lib/sematext/metrics/version.rb

@@ -14,6 +14,6 @@
 
 module Sematext
   module Metrics
-    VERSION = "0.0.1.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/lib/sematext/metrics/validator_spec.rb

@@ -15,24 +15,97 @@
 require "spec_helper"
 
 describe Sematext::Metrics::RawValidator do
-  let(:validator) { Sematext::Metrics::RawValidator }
+  let(:validator) { Sematext::Metrics::RawValidator.new }
+  
+  it "raises exception when name is not set or empty" do 
+    expect {
+      validator.validate(
+        :name => '',
+        :agg_type => :sum,
+        :value => 42
+      )
+    }.to raise_error
+
+    expect {
+      validator.validate(
+        :agg_type => :sum,
+        :value => 42
+      )
+    }.to raise_error
+  end
+  
+  it "raises exception when value is not set" do
+    expect {
+      validator.validate(
+        :name => 'name',
+        :agg_type => :sum
+      )
+    }.to raise_error
+  end
 
-  it "raises exception when datapoint is invalid" do
+  it "raises exceptionw when agg_type is not set or invalid" do
     expect {
       validator.validate(
-        :timestamp => 123,
-        :name => 'coffee_consumed',
-        :value => 1234,
-        :agg_type => :unknown
+        :name => 'name',
+        :value => 42
       )
     }.to raise_error
-    
     expect {
       validator.validate(
-        :name => 'n' * 256,
+        :name => 'name',
+        :value => 42,
+        :agg_type => :invalid
+      )
+    }.to raise_error
+  end
+
+  it "raises exception when name, filter1 or filter2 too log" do
+    expect {
+      validator.validate(
+        :name => 'a' * 256,
         :agg_type => :sum,
-        :filter1 => 'filter'
+        :value => 42
+      )
+    }.to raise_error
+    expect {
+      validator.validate(
+        :name => 'name',
+        :agg_type => :sum,        
+        :value => 42,
+        :filter1 => 'a' * 256
+      )
+    }.to raise_error
+    expect {
+      validator.validate(
+        :name => 'name',
+        :agg_type => :sum,        
+        :value => 42,
+        :filter2 => 'a' * 256
+      )
+    }.to raise_error
+  end
+  
+  it "raises exception when value is not a number" do
+    expect {
+      validator.validate(
+        :name => 'name',
+        :agg_type => :sum,        
+        :value => 'foo'
       )
     }.to raise_error
+    expect {
+      validator.validate(
+        :name => 'name',
+        :agg_type => :sum,
+        :value => 100.2
+      )
+    }.to_not raise_error
+    expect {
+      validator.validate(
+        :name => 'name',
+        :agg_type => :sum,
+        :value => 100
+      )
+    }.to_not raise_error
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sematext-metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pavel Zalunin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler