opentsdb-ruby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6358b79d7e73fa08c4da97bdb3d195d24d08f20
-  data.tar.gz: 1cc144968d1f8850dabb531163ed5268ffb54cea
+  metadata.gz: afae53299d7cd506a3088b34755f75adb7c3bc00
+  data.tar.gz: 7ed07f6b3a199ede80d502546d6dce94b115cf5b
 SHA512:
-  metadata.gz: bff20bcf46714f1adff97035646bd0d3b387d086e5393866a966d7f72623e514fa2639c67963449043cd2af4131a80d05a44845edbaea41c6d36733b1d3803f8
-  data.tar.gz: 44663760bc00891ab53b225c90b6d5613f2156b3eef69d08816fe10cb88647f56619a184d7dafceef0d5ee34374ae9b57be50e23e26aa3848d0f5ec04c7f3610
+  metadata.gz: 7f64d2a0df96568f8061934e503a3720cd798cee218cd47bbce431420c4c312ee3de574022cb807fbc05b8932db10cc36a6c54279f998763f811c52e54b6b8b4
+  data.tar.gz: b75805bed80f6be6d6d11b2c864a10d1494f0df09b539bc3a06c2de9671f042d6970139ee3d975449f04b6006a5aed3596492e74d2f15247991d3ccb1bc1ed0a

data/README.md

@@ -40,26 +40,25 @@ Or install it yourself as:
 
   # define simple query params
   params = { begin: Time.now.ago(1.hour), q: 'avg:system.load.1{host=*}' }
-  # opensted
   client = Opentsdb::Client.new(params)
-  result = client.query # opentsdb json result
+  result = client.query
   # => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
 
   # complicate query params
   params = { begin: Time.now.ago(1.hour), end: Time.now, q: 'avg:system.load.1{host=server1, host=server2, tagk=tagv}by{host}', interval: 360 }
   client = Opentsdb::Client.new(params)
-  result = client.query # opentsdb json result
+  result = client.query
   # => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
 
   # reconfig opentsdb host and port
   params = { host: '192.168.0.100', port: 8000, q: 'avg:system.load.1{host=*}' }
   client = Opentsdb::Client.new(params)
-  result = client.query # opentsdb json result
+  result = client.query
   # => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
 
   #query exception
   client = Opentsdb::Client.new(q: 'avg:unknown_metric')
-  result = client.query # opentsdb json result
+  result = client.query
   # => { status: 'error', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '{"error":{"code":400,"message":"No such name for 'metrics'...}}'
 
 ```

data/lib/opentsdb.rb

@@ -33,6 +33,7 @@ require 'logger'
 require 'net/http'
 require 'opentsdb/version'
 require 'opentsdb/client'
+require 'opentsdb/faraday'
 require 'opentsdb/query_parser'
 require 'opentsdb/query_param'
 require 'forwardable'

data/lib/opentsdb/client.rb

@@ -1,10 +1,9 @@
-require_relative 'http_client'
 module Opentsdb
   # ruby client for OpenTsdb HTTP API
   class Client
     extend Forwardable
 
-    def_instance_delegators :@http, :post
+    def_instance_delegators :@faraday, :post
 
     attr_reader :host, :port
     attr_accessor :query_commads
@@ -12,15 +11,15 @@ module Opentsdb
     def initialize(options = {})
       @host = options.delete(:host) || Opentsdb.host
       @port = options.delete(:port) || Opentsdb.port
-      @http = HttpClient.new
+      @faraday = Opentsdb::Faraday.new(query_url)
       @query_commads = parse_queries options
     end
 
     def query
       [].tap do |results|
         query_commads.each do |query_commad|
-          res = post(query_uri, query_commad.to_json)
-          status = res.code.to_i == 200 ? 'ok' : 'error'
+          res = post query_commad.to_json
+          status = res.status.to_i == 200 ? 'ok' : 'error'
           results << { status: status, condition: query_commad, result: res.body }
         end
       end
@@ -40,8 +39,8 @@ module Opentsdb
 
     private
 
-    def query_uri
-      URI("http://#{host}:#{port}/api/query")
+    def query_url
+      "http://#{host}:#{port}/api/query"
     end
   end
 end

data/lib/opentsdb/faraday.rb

@@ -0,0 +1,53 @@
+require 'faraday'
+module Opentsdb
+  # :nodoc:
+  class Faraday
+    attr_reader :url
+
+    def initialize(url, options = {})
+      @url = url
+      @options = options
+    end
+
+    def post(body)
+      connection.post do |req|
+        req.headers         = headers
+        req.body            = body
+        req.options.timeout = 5
+      end
+    end
+
+    private
+
+    def headers
+      { 'Content-Type' => 'application/json; charset=UTF-8' }
+    end
+
+    def connection
+      @connection ||= begin
+        ::Faraday.new(url: url) do |faraday|
+          faraday.request  :url_encoded              # form-encode POST params
+          faraday.response :logger                   # log requests to STDOUT
+          faraday.adapter  auto_detect_adapter
+        end
+      end
+    end
+
+    def auto_detect_adapter
+      case 
+      when defined?(::Patron)
+        :partron
+      when defined?(::Excon)
+        :excon
+      when defined?(::Typhoeus)
+        :typhoeus
+      when defined?(::HTTPClient)
+        :httpclient
+      when defined?(::Net::HTTP::Persistent)
+        :net_http_persistent
+      else
+        ::Faraday.default_adapter
+      end
+    end
+  end
+end

data/lib/opentsdb/query_param.rb

@@ -11,6 +11,8 @@ module Opentsdb
       @tags         = options[:tags] || {}
       @rate_options = options[:rate_options]
       @group        = options[:group] || []
+      @start_time   = 0
+      @end_time     = 0
     end
 
     def start_time
@@ -45,7 +47,8 @@ module Opentsdb
     private
 
     def to_ms(time = Time.now)
-      (time.to_f * 1000).to_i
+      time = time.is_a?(Fixnum) ? time : time.to_i
+      time.to_s.ljust(13, '0').to_i # ms.to_size = 13
     end
 
     def queries

data/lib/opentsdb/query_parser.rb

@@ -8,15 +8,15 @@ module Opentsdb
         metric_query = {}
         metric_query[:aggregator] = parts[0]
         metric_query[:rate] = false
-        metic = parts[1]
+        metric = parts[1]
         if parts.size == 3
-          if metic.start_with?('rate')
+          if metric.start_with?('rate')
             metric_query[:rate] = true
-            metric_query[:rate_options] = parse_rate(metic) if temp.index('{')
+            metric_query[:rate_options] = parse_rate(metric) if metric.index('{')
           end
-          metic = parts[2]
+          metric = parts[2]
         end
-        QueryParam.new metric_query.merge(parse_metric(metic))
+        QueryParam.new metric_query.merge(parse_metric(metric))
       end
 
       private

data/lib/opentsdb/version.rb

@@ -1,3 +1,3 @@
 module Opentsdb
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentsdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - lizhe
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +168,7 @@ files:
 - README.md
 - lib/opentsdb.rb
 - lib/opentsdb/client.rb
-- lib/opentsdb/http_client.rb
+- lib/opentsdb/faraday.rb
 - lib/opentsdb/query_errors.rb
 - lib/opentsdb/query_param.rb
 - lib/opentsdb/query_parser.rb

data/lib/opentsdb/http_client.rb

@@ -1,36 +0,0 @@
-require 'net/http'
-require 'benchmark'
-module Opentsdb
-  # :nodoc:
-  class HttpClient
-    def post(uri, body)
-      send_http(uri) do |http|
-        Opentsdb.logger.debug "Http post body: #{body}"
-        req = Net::HTTP::Post.new(uri, headers)
-        req.body = body
-        http.request(req)
-      end
-    end
-
-    private
-
-    def headers
-      { 'Content-Type' => 'application/json; charset=UTF-8' }
-    end
-
-    def send_http(uri)
-      Opentsdb.logger.info "Http request uri: #{uri}"
-      http = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https')
-      res = nil
-      time = Benchmark.realtime do
-        res = yield(http)
-      end
-      Opentsdb.logger.info "Response Code: #{res.code} Consume: #{time} s"
-      res
-    rescue Timeout::Error, Errno::ECONNRESET, Net::HTTPBadResponse,
-           Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-      Opentsdb.logger.error "Http request error: #{e}"
-      false
-    end
-  end
-end