ffwd-kafka 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bd92cb26ba2f91f67dc006f07647f032c568104b
+  data.tar.gz: 4bebbf74c4d5f9f3636baada9ae758d598fb95c2
+SHA512:
+  metadata.gz: 2d401625fccdcf2f8a4a603c60745e0d5787d72100c1c90fc9f66790c098701d013fcac355d76726a8d199508aa646d78ac0c610fbb283b817308c99cd14fa71
+  data.tar.gz: 0fb870d71df35ba0ebe49f243b0c151dc6033325cc1da5d5b6c9ea561cd232365fbdaf7d7f410fc708b06afe8328ccaed3448ab8f1d4064bcf3c73012b8adb87

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

@@ -29,12 +29,21 @@ module FFWD::Plugin::Kafka
 
     MAPPING = [:host, :ttl, :key, :time, :value, :tags, :attributes]
 
-    def initialize producer, brokers, schema, router, partitioner
-      @producer = producer
-      @brokers = brokers
+    DEFAULT_PRODUCER = "ffwd"
+    DEFAULT_BROKERS = ["localhost:9092"]
+
+    def self.prepare config
+      config[:producer] ||= DEFAULT_PRODUCER
+      config[:brokers] ||= DEFAULT_BROKERS
+      config
+    end
+
+    def initialize schema, router, partitioner, config
       @schema = schema
       @router = router
       @partitioner = partitioner
+      @producer = config[:producer]
+      @brokers = config[:brokers]
       @reporter_meta = {:producer_type => "kafka", :producer => @producer}
       @instance = nil
     end

data/lib/ffwd/plugin/kafka/partitioners.rb

@@ -41,14 +41,14 @@ module FFWD::Plugin::Kafka
       ),
     ]
 
-    def self.build opts
-      attr = opts[:attribute] || DEFAULT_ATTRIBUTE
-      new attr
+    def self.prepare config
+      config[:attribute] ||= DEFAULT_ATTRIBUTE
+      config
     end
 
-    def initialize attr
-      @attr = attr.to_sym
-      @attr_s = attr.to_s
+    def initialize config
+      @attr = config[:attribute].to_sym
+      @attr_s = config[:attribute].to_s
     end
 
     # currently there is an issue where you can store both symbols and string
@@ -62,15 +62,19 @@ module FFWD::Plugin::Kafka
     end
   end
 
-  def self.build_partitioner type, opts
-    if type == :host
-      return HostPartitioner
-    end
+  DEFAULT_PARTITIONER = :host
 
-    if type == :key
-      return KeyPartitioner
-    end
+  def self.prepare_partitioner config
+    type = (config[:type] ||= DEFAULT_PARTITIONER)
+    return config if type == :host
+    return config if type == :key
+    AttributePartitioner.prepare config
+  end
 
-    return AttributePartitioner.build opts
+  def self.build_partitioner config
+    type = config[:type]
+    return HostPartitioner if type == :host
+    return KeyPartitioner if type == :key
+    return AttributePartitioner.new config
   end
 end

data/lib/ffwd/plugin/kafka/routers.rb

@@ -46,18 +46,25 @@ module FFWD::Plugin::Kafka
       ),
     ]
 
-    def self.build opts
-      metric_pattern = opts[:metric_pattern] || DEFAULT_METRIC_PATTERN
-      event_pattern = opts[:event_pattern] || DEFAULT_EVENT_PATTERN
-      attr = opts[:attribute] || DEFAULT_ATTRIBUTE
+    def self.prepare config
+      config[:metric_pattern] ||= DEFAULT_METRIC_PATTERN
+      config[:event_pattern] ||= DEFAULT_EVENT_PATTERN
+      config[:attribute] ||= DEFAULT_ATTRIBUTE
+      config
+    end
+
+    def self.build config
+      metric_pattern = config[:metric_pattern] || DEFAULT_METRIC_PATTERN
+      event_pattern = config[:event_pattern] || DEFAULT_EVENT_PATTERN
+      attr = config[:attribute] || DEFAULT_ATTRIBUTE
       new(metric_pattern, event_pattern, attr)
     end
 
-    def initialize metric_pattern, event_pattern, attr
-      @metric_pattern = metric_pattern
-      @event_pattern = event_pattern
-      @attr = attr.to_sym
-      @attr_s = attr.to_s
+    def initialize config
+      @metric_pattern = config[:metric_pattern]
+      @event_pattern = config[:event_pattern]
+      @attr = config[:attribute]
+      @attr_s = @attr.to_s
     end
 
     def value d
@@ -79,11 +86,17 @@ module FFWD::Plugin::Kafka
     end
   end
 
-  def self.build_router type, opts
-    if type == :attribute
-      return AttributeRouter.build opts
-    end
+  DEFAULT_ROUTER = :attribute
+
+  def self.prepare_router config
+    type = (config[:type] ||= DEFAULT_ROUTER)
+    return AttributeRouter.prepare config if type == :attribute
+    raise "Unsupported router type: #{type}"
+  end
 
+  def self.build_router config
+    type = config[:type]
+    return AttributeRouter.new config if type == :attribute
     raise "Unsupported router type: #{type}"
   end
 end

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

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Kafka
-      VERSION = "0.1.7"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/ffwd/plugin/kafka.rb

@@ -28,24 +28,19 @@ module FFWD::Plugin
     include FFWD::Plugin
     include FFWD::Logging
 
-    DEFAULT_PRODUCER = "ffwd"
-    DEFAULT_BROKERS = ["localhost:9092"]
-    DEFAULT_PARTITIONER = :host
-    DEFAULT_ROUTER = :attribute
-
     register_plugin "kafka",
       :description => "A plugin for the collectd binary protocol.",
       :options => [
         FFWD::Plugin.option(
-          :producer, :default => DEFAULT_PRODUCER,
+          :producer, :default => FFWD::Plugin::Kafka::Output::DEFAULT_PRODUCER,
           :help => ["Name of the producer."]
         ),
         FFWD::Plugin.option(
-          :port, :default => DEFAULT_BROKERS,
+          :port, :default => FFWD::Plugin::Kafka::Output::DEFAULT_BROKERS,
           :help => ["Brokers to connect to."]
         ),
         FFWD::Plugin.option(
-          :partitioner, :default => DEFAULT_PARTITIONER,
+          :partitioner, :default => FFWD::Plugin::Kafka::DEFAULT_PARTITIONER,
           :help => [
             "Partitioner to use, the partitioner decides what partition key is used for a specific message.",
             ":host - Base partition key of the host of the event/metric.",
@@ -54,7 +49,7 @@ module FFWD::Plugin
           ]
         ),
         FFWD::Plugin.option(
-          :router, :default => DEFAULT_ROUTER,
+          :router, :default => FFWD::Plugin::Kafka::DEFAULT_ROUTER,
           :help => [
             "Router to use, the router decides which topic to use for a specific message." 
           ]
@@ -63,17 +58,29 @@ module FFWD::Plugin
       FFWD::Plugin::Kafka::AttributePartitioner::OPTIONS +
       FFWD::Plugin::Kafka::AttributeRouter::OPTIONS
 
-    def self.setup_output opts, core
-      producer = opts[:producer] || DEFAULT_PRODUCER
-      brokers = opts[:brokers] || DEFAULT_BROKERS
-      partitioner = FFWD::Plugin::Kafka.build_partitioner(
-        opts[:partitioner] || DEFAULT_PARTITIONER, opts)
-      router = FFWD::Plugin::Kafka.build_router(
-        opts[:router] || DEFAULT_ROUTER, opts)
-      schema = FFWD.parse_schema opts
+    class Setup
+      attr_reader :config
+
+      def initialize config
+        @config = Output.prepare Hash[config]
+        @config = FFWD.prepare_schema @config
+        @config[:partitioner] = FFWD::Plugin::Kafka.prepare_partitioner(
+          @config[:partitioner] || {})
+        @config[:router] = FFWD::Plugin::Kafka.prepare_router(
+          @config[:router] || {})
+      end
+
+      def connect core
+        partitioner = FFWD::Plugin::Kafka.build_partitioner @config[:partitioner]
+        router = FFWD::Plugin::Kafka.build_router @config[:router]
+        schema = FFWD.parse_schema @config
+        output = Output.new schema, router, partitioner, @config
+        FFWD.producing_client core.output, output, @config
+      end
+    end
 
-      producer = Output.new producer, brokers, schema, router, partitioner
-      FFWD.producing_client core.output, producer, opts
+    def self.setup_output config
+      Setup.new config
     end
   end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-kafka
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poseidon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffwd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 description: 
 email:
 - udoprog@spotify.com
@@ -50,35 +45,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ffwd/plugin/kafka.rb
-- lib/ffwd/plugin/kafka/version.rb
+- lib/ffwd/plugin/kafka/output.rb
 - lib/ffwd/plugin/kafka/producer.rb
-- lib/ffwd/plugin/kafka/partitioners.rb
 - lib/ffwd/plugin/kafka/routers.rb
-- lib/ffwd/plugin/kafka/output.rb
+- lib/ffwd/plugin/kafka/version.rb
+- lib/ffwd/plugin/kafka/partitioners.rb
+- lib/ffwd/plugin/kafka.rb
 homepage: https://github.com/spotify/ffwd
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Kafka support for FFWD.
 test_files: []