jruby-kafka 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 845abef79fc7de08bcbbd20a8de93271fed609e0
-  data.tar.gz: 01238f1173d6cca7ccade3968d1847c738bf2290
+  metadata.gz: 757a58d558b7fce703472286dfb4a66aa180f2b7
+  data.tar.gz: 476ddc498398b11bb4c4e0b93f193ca77151c0a4
 SHA512:
-  metadata.gz: a862036fd6264456f42a0a993fd985d37b6029f684edf2e03c11d069fd706cfaa6da94d9b7305b1e88fa934ebae3108b68a716a2ea94941ee08dc50144626804
-  data.tar.gz: 40c0ce24de712ed6cee5868137628f7070bae96135f02fbbb583c549bf2b2c0c05ac47dabbfc0122fc355d4272bd4c89586644f506bd42c4cfb8a032253c182d
+  metadata.gz: 6e5fcb1d6247fbf889c841dc0d6d68a6874c1566b644a72f11b35730d1043db29feec2b1ac1df9dae99ec0cffa919b079817771417862eb921b96cf5ba207275
+  data.tar.gz: c6a86417f4fee5919c5112214af5ff55f245384d7273da1b6b6e62660a46dd2b289e89f8d5c0ea65998249c601e75e119b982105411ecd89600ae96b11f2db50

data/lib/jruby-kafka/group.rb

@@ -55,6 +55,7 @@ class Kafka::Group
     @consumer_timeout_ms = '-1'
     @consumer_restart_on_error = "#{false}"
     @consumer_restart_sleep_ms = '0'
+    @consumer_id = nil
 
     if options[:zk_connect_timeout]
       @zk_connect_timeout = "#{options[:zk_connect_timeout]}"
@@ -129,6 +130,10 @@ class Kafka::Group
         @auto_offset_reset = 'largest'
       end
     end
+
+    if options[:consumer_id]
+      @consumer_id = options[:consumer_id]
+    end
   end
 
   private
@@ -203,6 +208,9 @@ class Kafka::Group
     properties.put("fetch.wait.max.ms", @fetch_wait_max_ms)
     properties.put("refresh.leader.backoff.ms", @refresh_leader_backoff_ms)
     properties.put("consumer.timeout.ms", @consumer_timeout_ms)
+    unless @consumer_id.nil?
+      properties.put('consumer.id', @consumer_id)
+    end
     return Java::kafka::consumer::ConsumerConfig.new(properties)
   end
 end

data/lib/jruby-kafka/producer.rb

@@ -8,28 +8,41 @@ require "jruby-kafka/error"
 java_import 'kafka.common.FailedToSendMessageException'
 
 class Kafka::Producer
-  @topic
-
   # Create a Kafka Producer
   #
   # options:
-  # :topic_id => "topic" - REQUIRED: The topic id to consume on.
   # :broker_list => "localhost:9092" - REQUIRED: a seed list of kafka brokers
   def initialize(options={})
     validate_required_arguments(options)
 
-    @brokers = options[:broker_list]
-    @serializer_class = 'kafka.serializer.StringEncoder'
+    @metadata_broker_list = options[:broker_list]
+    @serializer_class = nil
     @partitioner_class = nil
-    @request_required_acks = '0'
-    @compression_codec = "#{Java::kafka::message::NoCompressionCodec.name}"
-    @compressed_topics = ''
+    @request_required_acks = nil
+    @compression_codec = nil
+    @compressed_topics = nil
+    @request_timeout_ms = nil
+    @producer_type = nil
+    @key_serializer_class = nil
+    @message_send_max_retries = nil
+    @retry_backoff_ms = nil
+    @topic_metadata_refresh_interval_ms = nil
+    @queue_buffering_max_ms = nil
+    @queue_buffering_max_messages = nil
+    @queue_enqueue_timeout_ms = nil
+    @batch_num_messages = nil
+    @send_buffer_bytes = nil
+    @client_id = nil
 
     if options[:partitioner_class]
       @partitioner_class = "#{options[:partitioner_class]}"
     end
 
     if options[:request_required_acks]
+      valid_acks = %w{ 0 1 -1 }
+      if not valid_acks.include? "#{options[:request_required_acks]}"
+        raise(ArgumentError, "#{options[:request_required_acks]} is not a valid request_required_acks value: #{valid_acks}")
+      end
       @request_required_acks = "#{options[:request_required_acks]}"
     end
 
@@ -37,16 +50,72 @@ class Kafka::Producer
       required_codecs = ["#{Java::kafka::message::NoCompressionCodec.name}",
                          "#{Java::kafka::message::GZIPCompressionCodec.name}",
                          "#{Java::kafka::message::SnappyCompressionCodec.name}"]
-      if not required_codecs.include? options[:compression_codec]
+      if not required_codecs.include? "#{options[:compression_codec]}"
         raise(ArgumentError, "#{options[:compression_codec]} is not one of required codecs: #{required_codecs}")
       end
-      @compression_codec = options[:compression_codec]
+      @compression_codec = "#{options[:compression_codec]}"
     end
 
     if options[:compressed_topics]
       if @compression_codec != 'none'
-        @compressed_topics = options[:compressed_topics]
+        @compressed_topics = "#{options[:compressed_topics]}"
+      end
+    end
+
+    if options[:request_timeout_ms]
+      @request_timeout_ms = "#{options[:request_timeout_ms]}"
+    end
+
+    if options[:producer_type]
+      valid_producer_types = %w{ sync async }
+      if not valid_producer_types.include? "#{options[:producer_type]}"
+        raise(ArgumentError, "#{options[:producer_type]} is not a valid producer type: #{valid_producer_types}")
       end
+      @producer_type = "#{options[:producer_type]}"
+    end
+
+    if options[:serializer_class]
+      @serializer_class = "#{options[:serializer_class]}"
+    end
+
+    if options[:key_serializer_class]
+      @key_serializer_class = "#{options[:key_serializer_class]}"
+    end
+
+    if options[:message_send_max_retries]
+      @message_send_max_retries = "#{options[:message_send_max_retries]}"
+    end
+
+    if options[:retry_backoff_ms]
+      @retry_backoff_ms = "#{options[:retry_backoff_ms]}"
+    end
+
+    if options[:topic_metadata_refresh_interval_ms]
+      @topic_metadata_refresh_interval_ms = "#{options[:topic_metadata_refresh_interval_ms]}"
+    end
+
+    if options[:queue_buffering_max_ms]
+      @queue_buffering_max_ms = "#{options[:queue_buffering_max_ms]}"
+    end
+
+    if options[:queue_buffering_max_messages]
+      @queue_buffering_max_messages = "#{options[:queue_buffering_max_messages]}"
+    end
+
+    if options[:queue_enqueue_timeout_ms]
+      @queue_enqueue_timeout_ms = "#{options[:queue_enqueue_timeout_ms]}"
+    end
+
+    if options[:batch_num_messages]
+      @batch_num_messages = "#{options[:batch_num_messages]}"
+    end
+
+    if options[:send_buffer_bytes]
+      @send_buffer_bytes = "#{options[:send_buffer_bytes]}"
+    end
+
+    if options[:client_id]
+      @client_id = "#{options[:client_id]}"
     end
   end
 
@@ -79,14 +148,58 @@ class Kafka::Producer
   def createProducerConfig()
     # TODO lots more options avaiable here: http://kafka.apache.org/documentation.html#producerconfigs
     properties = java.util.Properties.new()
-    properties.put("metadata.broker.list", @brokers)
-    properties.put("request.required.acks", @request_required_acks)
-    if not @partitioner_class.nil?
+    properties.put("metadata.broker.list", @metadata_broker_list)
+    unless @request_required_acks.nil?
+      properties.put("request.required.acks", @request_required_acks)
+    end
+    unless @partitioner_class.nil?
       properties.put("partitioner.class", @partitioner_class)
     end
-    properties.put("serializer.class", @serializer_class)
-    properties.put("compression.codec", @compression_codec)
-    properties.put("compressed.topics", @compressed_topics)
+    unless @key_serializer_class.nil?
+      properties.put("key.serializer.class", @key_serializer_class)
+    end
+    unless @request_timeout_ms.nil?
+      properties.put("request.timeout.ms", @request_timeout_ms)
+    end
+    unless @producer_type.nil?
+      properties.put('producer.type', @producer_type)
+    end
+    unless @serializer_class.nil?
+      properties.put("serializer.class", @serializer_class)
+    end
+    unless @compression_codec.nil?
+      properties.put("compression.codec", @compression_codec)
+    end
+    unless @compressed_topics.nil?
+      properties.put("compressed.topics", @compressed_topics)
+    end
+    unless @message_send_max_retries.nil?
+      properties.put("message.send.max.retries", @message_send_max_retries)
+    end
+    unless @retry_backoff_ms.nil?
+      properties.put('retry.backoff.ms', @retry_backoff_ms)
+    end
+    unless @topic_metadata_refresh_interval_ms.nil?
+      properties.put('topic.metadata.refresh.interval.ms', @topic_metadata_refresh_interval_ms)
+    end
+    unless @queue_buffering_max_ms.nil?
+      properties.put('queue.buffering.max.ms', @queue_buffering_max_ms)
+    end
+    unless @queue_buffering_max_messages.nil?
+      properties.put('queue.buffering.max.messages', @queue_buffering_max_messages)
+    end
+    unless @queue_enqueue_timeout_ms.nil?
+      properties.put('queue.enqueue.timeout.ms', @queue_enqueue_timeout_ms)
+    end
+    unless @batch_num_messages.nil?
+      properties.put('batch.num.messages', @batch_num_messages)
+    end
+    unless @send_buffer_bytes.nil?
+      properties.put('send.buffer.bytes', @send_buffer_bytes)
+    end
+    unless @client_id.nil?
+      properties.put('client.id', @client_id)
+    end
     return Java::kafka::producer::ProducerConfig.new(properties)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Joseph Lawson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies: []
 description: this is primarily to be used as an interface for logstash
 email:
@@ -18,14 +18,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jruby-kafka.rb
-- lib/jruby-kafka/client.rb
-- lib/jruby-kafka/config.rb
 - lib/jruby-kafka/consumer.rb
 - lib/jruby-kafka/error.rb
 - lib/jruby-kafka/group.rb
 - lib/jruby-kafka/namespace.rb
 - lib/jruby-kafka/producer.rb
-- lib/kafka.rb
 homepage: https://github.com/joekiller/jruby-kafka
 licenses:
 - Apache 2.0
@@ -47,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: jruby Kafka wrapper

data/lib/jruby-kafka/client.rb

@@ -1,6 +0,0 @@
-require "java"
-require "jruby-kafka/namespace"
-
-class Kafka::Client
-
-end

data/lib/jruby-kafka/config.rb

@@ -1,8 +0,0 @@
-require "java"
-require "jruby-kafka/namespace"
-
-class Kafka::Config
-  def initialize(options={})
-
-  end
-end

data/lib/kafka.rb

@@ -1,5 +0,0 @@
-require "jruby-kafka/client"
-
-module Kafka
-
-end