ffwd-kairosdb 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36ff45d69b3dc01b2c78f6f76600b2dacfce747
-  data.tar.gz: d804e576bd3bb9df3e920f2118a5ee1c2c3d8dae
+  metadata.gz: c847b7694b20491e0e5cec03e920d9fd6ac66168
+  data.tar.gz: 1111fea050eb39e19862d215fec95e303ba822fa
 SHA512:
-  metadata.gz: 5c99c2e8c6c4ce5a6727a97c30b07c760de601351d867a010a974cc0929010b30747dc32ace45936b2c9d07a84d11118326d3cea8fb79d3a789dac36b57554bf
-  data.tar.gz: 9683d41400ab9e2bef1ccaa9194d012f5e91d39600266deda59d496a03ec4a26a152ef4c47ef0a561f2fab5f4afbc7e905a8eeb2ca1ac50c77ded6fdfc871352
+  metadata.gz: 7c8208441ea471b67df9561fea1d2ed88ef47e2fb7bdcd9e617539fe3d6bee0ee3c950e40cac68ba4e82f1edcc091d6a476c6395ec9e19161d681e6e6d717e3d
+  data.tar.gz: 27d981894adbc070241496b20ad4a81292d8ada16f70d30af967bc5e7bb54415957e91b486a267a59c2231842e61eba5ee172ff0ae699b19d2b4b27d9387a13c

data/lib/ffwd/plugin/kairosdb/hook.rb

@@ -0,0 +1,58 @@
+# $LICENSE
+# Copyright 2013-2014 Spotify AB. All rights reserved.
+#
+# The contents of this file are licensed under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'json'
+
+require_relative 'utils'
+
+require 'ffwd/flushing_output_hook'
+
+module FFWD::Plugin::KairosDB
+  class Hook < FFWD::FlushingOutputHook
+    HEADER = {
+      "Content-Type" => "application/json"
+    }
+
+    API_PATH = "/api/v1/series"
+
+    def initialize url
+      @c = nil
+      @url = url
+    end
+
+    def active?
+      not @c.nil?
+    end
+
+    def connect
+      @c = EM::HttpRequest.new(@url)
+    end
+
+    def close
+      @c.close
+      @c = nil
+    end
+
+    def send metrics
+      metrics = Utils.make_metrics(metrics)
+      metrics = JSON.dump(metrics)
+      @c.post(:path => API_PATH, :head => HEADER, :body => metrics)
+    end
+
+    def reporter_meta
+      {:component => :datadog}
+    end
+  end
+end

data/lib/ffwd/plugin/kairosdb/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module KairosDB
-      VERSION = "0.2.4"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/ffwd/plugin/kairosdb.rb

@@ -19,8 +19,9 @@ require 'em-http'
 require 'ffwd/logging'
 require 'ffwd/plugin'
 require 'ffwd/reporter'
+require 'ffwd/flushing_output'
 
-require_relative 'kairosdb/output'
+require_relative 'kairosdb/hook'
 
 module FFWD::Plugin::KairosDB
   include FFWD::Plugin
@@ -32,21 +33,13 @@ module FFWD::Plugin::KairosDB
   DEFAULT_FLUSH_INTERVAL = 10
   DEFAULT_BUFFER_LIMIT = 100000
 
-  class Setup
-    def initialize log, opts
-      @log = log
-      @opts = opts
-    end
-
-    def connect core
-      url = @opts[:url] || DEFAULT_URL
-      flush_interval = @opts[:flush_interval] || DEFAULT_FLUSH_INTERVAL
-      buffer_limit = @opts[:buffer_limit] || DEFAULT_BUFFER_LIMIT
-      Output.new core, @log, url, flush_interval, buffer_limit
-    end
-  end
+  def self.setup_output config
+    config[:url] ||= DEFAULT_URL
+    config[:flush_interval] ||= DEFAULT_FLUSH_INTERVAL
+    config[:buffer_limit] ||= DEFAULT_BUFFER_LIMIT
+
+    hook = Hook.new(config[:url])
 
-  def self.setup_output opts
-    Setup.new log, opts
+    FFWD.flushing_output log, hook, config
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-kairosdb
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ffwd/plugin/kairosdb.rb
-- lib/ffwd/plugin/kairosdb/output.rb
+- lib/ffwd/plugin/kairosdb/hook.rb
 - lib/ffwd/plugin/kairosdb/utils.rb
 - lib/ffwd/plugin/kairosdb/version.rb
 homepage: https://github.com/spotify/ffwd

data/lib/ffwd/plugin/kairosdb/output.rb

@@ -1,130 +0,0 @@
-# $LICENSE
-# Copyright 2013-2014 Spotify AB. All rights reserved.
-#
-# The contents of this file are licensed under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-require 'ffwd/reporter'
-
-require_relative 'utils'
-
-module FFWD::Plugin::KairosDB
-  class Output
-    include FFWD::Reporter
-    setup_reporter :keys => [:dropped_metrics, :sent_metrics, :failed_metrics]
-
-    attr_reader :log, :reporter_meta
-
-    HEADER = {
-      "Content-Type" => "application/json"
-    }
-
-    API_PATH = "/api/v1/datapoints"
-
-    def initialize core, log, url, flush_interval, buffer_limit
-      @log = log
-      @url = url
-      @flush_interval = flush_interval
-      @buffer_limit = buffer_limit
-      @reporter_meta = {:type => "kairosdb_out", :url => @url}
-
-      @buffer = []
-      @pending = nil
-      @c = nil
-
-      @sub = nil
-
-      core.starting do
-        log.info "Will send events to #{@url}"
-
-        @c = EM::HttpRequest.new(@url)
-
-        @sub = core.output.metric_subscribe do |metric|
-          if @buffer.size >= @buffer_limit
-            increment :dropped_metrics, 1
-            next
-          end
-
-          @buffer << metric
-          check_timer!
-        end
-      end
-
-      core.stopping do
-        # Close is buggy, don.
-        #@c.close
-
-        log.info "Closing connection to #{@url}"
-
-        if @sub
-          @sub.unsubscribe
-          @sub = nil
-        end
-
-        if @timer
-          @timer.cancel
-          @timer = nil
-        end
-      end
-    end
-
-    def flush!
-      if @timer
-        @timer.cancel
-        @timer = nil
-      end
-
-      if @pending
-        log.info "Request already in progress, dropping metrics"
-        increment :dropped_metrics, @buffer.size
-        @buffer.clear
-        return
-      end
-
-      unless @c
-        log.error "Dropping metrics, no active connection available"
-        increment :dropped_metrics, @buffer.size
-        @buffer.clear
-        return
-      end
-
-      buffer_size = @buffer.size
-      metrics = Utils.make_metrics(@buffer)
-      metrics = JSON.dump(metrics)
-      @buffer.clear
-
-      log.info "Sending #{buffer_size} metric(s) to #{@url}"
-      @pending = @c.post(:path => API_PATH, :head => HEADER, :body => metrics)
-
-      @pending.callback do
-        increment :sent_metrics, buffer_size
-        @pending = nil
-      end
-
-      @pending.errback do
-        log.error "Failed to submit events: #{@pending.error}"
-        increment :failed_metrics, buffer_size
-        @pending = nil
-      end
-    end
-
-    def check_timer!
-      return if @timer
-
-      log.debug "Setting timer to #{@flush_interval}s"
-
-      @timer = EM::Timer.new(@flush_interval) do
-        flush!
-      end
-    end
-  end
-end