ruby-kafka 0.3.15 → 0.3.16.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e781eb534c5c2ee94905fe5665270df1d688689
-  data.tar.gz: a95297b844741019599e14bae2ca7afa34304538
+  metadata.gz: 84b67d149d2ec1a2e2099aebc3372e5519d9085c
+  data.tar.gz: b77bdd543fe069d3758227e649834125abd60fc2
 SHA512:
-  metadata.gz: f3d32a672b934ccaa48e49b2af92220d2bc7d435a642e43b1161f0a57e419f495c4a569c738cc85a24c0c719da608284164f9f83e96ba2a46c06e13e436d2700
-  data.tar.gz: 5283ffa3ba2f5968acf24ae73eb5b300ad38dd78907a8524e22d5d45e4ba20ac9caaa9efd6458cf7fddca3b897c1f6ff7344efd7bf55536b178c9c427e669854
+  metadata.gz: 6b41d4f4a6620e75eb4d9416d4255ca99c05ff36c98e7c350b57a7deb045a68b8028efb43e6510f54dc43294af0ac1d7738d1c7b481240895212b6df1e25d53a
+  data.tar.gz: aba814998139f29f69205669045b765dd1031cb0e35749603b6063d000d8d091e910e110cd2927804ec2f986432e9b411d78fbd75d40a72fba93e08597d89c06

data/CHANGELOG.md

@@ -4,6 +4,12 @@ Changes and additions to the library will be listed here.
 
 ## Unreleased
 
+## v0.3.16.beta1
+
+- Fix SSL socket timeout (#283).
+- Update to the latest Datadog gem (#296).
+- Automatically detect private key type (#297).
+
 ## v0.3.15
 
 - Allow setting a timeout on a partition pause (#272).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-kafka (0.3.15.beta2)
+    ruby-kafka (0.3.15)
 
 GEM
   remote: https://rubygems.org/
@@ -17,12 +17,12 @@ GEM
     coderay (1.1.0)
     colored (1.2)
     diff-lcs (1.2.5)
-    docker-api (1.25.0)
+    docker-api (1.32.1)
       excon (>= 0.38.0)
       json
-    dogstatsd-ruby (1.6.0)
+    dogstatsd-ruby (2.1.0)
     dotenv (2.1.0)
-    excon (0.45.4)
+    excon (0.54.0)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
@@ -67,7 +67,7 @@ DEPENDENCIES
   bundler (>= 1.9.5)
   colored
   docker-api
-  dogstatsd-ruby
+  dogstatsd-ruby (>= 2.0.0)
   dotenv
   pry
   rake (~> 10.0)
@@ -79,5 +79,8 @@ DEPENDENCIES
   snappy
   timecop
 
+RUBY VERSION
+   ruby 2.2.3p173
+
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/README.md

@@ -626,7 +626,7 @@ By default, nothing is logged.
 
 ### Instrumentation
 
-Most operations are instrumented using [Active Support Notifications](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html). In order to subscribe to notifications, make sure to require the notifications library _before_ you require ruby-kafka, e.g.
+Most operations are instrumented using [Active Support Notifications](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html). In order to subscribe to notifications, make sure to require the notifications library:
 
 ```ruby
 require "active_support/notifications"

data/lib/kafka/client.rb

@@ -437,7 +437,7 @@ module Kafka
       if client_cert && client_cert_key
         ssl_context.set_params(
           cert: OpenSSL::X509::Certificate.new(client_cert),
-          key: OpenSSL::PKey::RSA.new(client_cert_key)
+          key: OpenSSL::PKey.read(client_cert_key)
         )
       elsif client_cert && !client_cert_key
         raise ArgumentError, "Kafka client initialized with `ssl_client_cert` but no `ssl_client_cert_key`. Please provide both."
@@ -458,14 +458,13 @@ module Kafka
       if seed_brokers.is_a?(String)
         seed_brokers = seed_brokers.split(",")
       end
-      brokers = []
-      seed_brokers.each do |connection|
-        connection.prepend("kafka://") unless connection =~ /:\/\//
+
+      seed_brokers.map do |connection|
+        connection = "kafka://" + connection unless connection =~ /:\/\//
         uri = URI.parse(connection)
         uri.port ||= 9092 # Default Kafka port.
-        brokers << uri
+        uri
       end
-      brokers
     end
   end
 end

data/lib/kafka/datadog.rb

@@ -1,5 +1,5 @@
 begin
-  require "statsd"
+  require "datadog/statsd"
 rescue LoadError
   $stderr.puts "In order to report Kafka client metrics to Datadog you need to install the `dogstatsd-ruby` gem."
   raise
@@ -28,7 +28,7 @@ module Kafka
     STATSD_NAMESPACE = "ruby_kafka"
 
     def self.statsd
-      @statsd ||= Statsd.new(Statsd::DEFAULT_HOST, Statsd::DEFAULT_HOST, namespace: STATSD_NAMESPACE)
+      @statsd ||= ::Datadog::Statsd.new(::Datadog::Statsd::DEFAULT_HOST, ::Datadog::Statsd::DEFAULT_HOST, namespace: STATSD_NAMESPACE)
     end
 
     def self.host=(host)
@@ -43,6 +43,10 @@ module Kafka
       statsd.namespace = namespace
     end
 
+    def self.tags=(tags)
+      statsd.tags = tags
+    end
+
     class StatsdSubscriber < ActiveSupport::Subscriber
       private
 

data/lib/kafka/ssl_socket_with_timeout.rb

@@ -23,6 +23,7 @@ module Kafka
       addr = Socket.getaddrinfo(host, nil)
       sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
 
+      @connect_timeout = connect_timeout
       @timeout = timeout
 
       @tcp_socket = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
@@ -35,10 +36,10 @@ module Kafka
         # indicating the connection is in progress.
         @tcp_socket.connect_nonblock(sockaddr)
       rescue IO::WaitWritable
-        # IO.select will block until the socket is writable or the timeout
+        # select will block until the socket is writable or the timeout
         # is exceeded, whichever comes first.
-        unless IO.select(nil, [@tcp_socket], nil, connect_timeout)
-          # IO.select returns nil when the socket is not ready before timeout 
+        unless select_with_timeout(@tcp_socket, :connect_write)
+          # select returns nil when the socket is not ready before timeout 
           # seconds have elapsed
           @tcp_socket.close
           raise Errno::ETIMEDOUT
@@ -64,11 +65,20 @@ module Kafka
         # Instead, you have to retry.
         @ssl_socket.connect_nonblock
       rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
-        IO.select([@ssl_socket])
-        retry
+        if select_with_timeout(@ssl_socket, :connect_read)
+          retry
+        else
+          @ssl_socket.close
+          close
+          raise Errno::ETIMEDOUT
+        end
       rescue IO::WaitWritable
-        IO.select(nil, [@ssl_socket])
-        retry
+        if select_with_timeout(@ssl_socket, :connect_write)
+          retry
+        else
+          close
+          raise Errno::ETIMEDOUT
+        end
       end
     end
 
@@ -88,15 +98,17 @@ module Kafka
           # our read buffer.
           buffer << @ssl_socket.read_nonblock(num_bytes - buffer.length)
         rescue IO::WaitReadable
-          unless IO.select([@ssl_socket], nil, nil, @timeout)
+          if select_with_timeout(@ssl_socket, :read)
+            retry
+          else
             raise Errno::ETIMEDOUT
           end
-          retry
         rescue IO::WaitWritable
-          unless IO.select(nil, [@ssl_socket], nil, @timeout)
+          if select_with_timeout(@ssl_socket, :write)
+            retry
+          else
             raise Errno::ETIMEDOUT
           end
-          retry
         end
       end
       buffer
@@ -121,7 +133,7 @@ module Kafka
             raise error
         rescue OpenSSL::SSL::SSLError, Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable => error
           if error.is_a?(OpenSSL::SSL::SSLError) && error.message == 'write would block'
-            if IO.select(nil, [@ssl_socket], nil, @timeout)
+            if select_with_timeout(@ssl_socket, :write)
               retry
             else
               raise Errno::ETIMEDOUT
@@ -154,5 +166,18 @@ module Kafka
     def set_encoding(encoding)
       @tcp_socket.set_encoding(encoding)
     end
+
+    def select_with_timeout(socket, type)
+      case type
+      when :connect_read
+        IO.select([socket], nil, nil, @connect_timeout)
+      when :connect_write
+        IO.select(nil, [socket], nil, @connect_timeout)
+      when :read
+        IO.select([socket], nil, nil, @timeout)
+      when :write
+        IO.select(nil, [socket], nil, @timeout)
+      end
+    end
   end
 end

data/lib/kafka/version.rb

@@ -1,3 +1,3 @@
 module Kafka
-  VERSION = "0.3.15"
+  VERSION = "0.3.16.beta1"
 end

data/ruby-kafka.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "snappy"
   spec.add_development_dependency "colored"
   spec.add_development_dependency "rspec_junit_formatter", "0.2.2"
-  spec.add_development_dependency "dogstatsd-ruby"
+  spec.add_development_dependency "dogstatsd-ruby", ">= 2.0.0"
   spec.add_development_dependency "ruby-prof"
   spec.add_development_dependency "timecop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16.beta1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -317,9 +317,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1