logstash-input-beats 2.0.3 → 2.1.1

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,146 +28,162 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.9.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
-  name: concurrent-ruby
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
+        version: 0.3.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
-  name: logstash-codec-multiline
+        version: 0.3.5
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-multiline
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
-- !ruby/object:Gem::Dependency
+        version: 2.0.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
-  name: flores
+        version: 2.0.5
   prerelease: false
-  type: :development
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: flores
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.6
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rspec
+        version: 0.0.6
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: stud
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-wait
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec-wait
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.18
-  name: logstash-devutils
+        version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.18
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-codec-json
+        version: 0.0.18
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
@@ -183,17 +197,26 @@ files:
 - NOTICE.TXT
 - PROTOCOL.md
 - README.md
-- lib/logstash/circuit_breaker.rb
 - lib/logstash/inputs/beats.rb
-- lib/logstash/sized_queue_timeout.rb
+- lib/logstash/inputs/beats_support/circuit_breaker.rb
+- lib/logstash/inputs/beats_support/codec_callback_listener.rb
+- lib/logstash/inputs/beats_support/connection_handler.rb
+- lib/logstash/inputs/beats_support/decoded_event_transform.rb
+- lib/logstash/inputs/beats_support/event_transform_common.rb
+- lib/logstash/inputs/beats_support/raw_event_transform.rb
+- lib/logstash/inputs/beats_support/synchronous_queue_with_offer.rb
 - lib/lumberjack/beats.rb
 - lib/lumberjack/beats/client.rb
 - lib/lumberjack/beats/server.rb
 - logstash-input-beats.gemspec
 - spec/inputs/beats_spec.rb
+- spec/inputs/beats_support/circuit_breaker_spec.rb
+- spec/inputs/beats_support/codec_callback_listener_spec.rb
+- spec/inputs/beats_support/connection_handler_spec.rb
+- spec/inputs/beats_support/decoded_event_transform_spec.rb
+- spec/inputs/beats_support/event_transform_common_spec.rb
+- spec/inputs/beats_support/raw_event_transform_spec.rb
 - spec/integration_spec.rb
-- spec/logstash/circuit_breaker_spec.rb
-- spec/logstash/size_queue_timeout_spec.rb
 - spec/lumberjack/beats/acking_protocol_v1_spec.rb
 - spec/lumberjack/beats/acking_protocol_v2_spec.rb
 - spec/lumberjack/beats/client_spec.rb
@@ -201,6 +224,7 @@ files:
 - spec/lumberjack/beats/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/logstash_test.rb
+- spec/support/shared_examples.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -229,9 +253,13 @@ specification_version: 4
 summary: Receive events using the lumberjack protocol.
 test_files:
 - spec/inputs/beats_spec.rb
+- spec/inputs/beats_support/circuit_breaker_spec.rb
+- spec/inputs/beats_support/codec_callback_listener_spec.rb
+- spec/inputs/beats_support/connection_handler_spec.rb
+- spec/inputs/beats_support/decoded_event_transform_spec.rb
+- spec/inputs/beats_support/event_transform_common_spec.rb
+- spec/inputs/beats_support/raw_event_transform_spec.rb
 - spec/integration_spec.rb
-- spec/logstash/circuit_breaker_spec.rb
-- spec/logstash/size_queue_timeout_spec.rb
 - spec/lumberjack/beats/acking_protocol_v1_spec.rb
 - spec/lumberjack/beats/acking_protocol_v2_spec.rb
 - spec/lumberjack/beats/client_spec.rb
@@ -239,3 +267,4 @@ test_files:
 - spec/lumberjack/beats/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/logstash_test.rb
+- spec/support/shared_examples.rb

data/lib/logstash/sized_queue_timeout.rb

@@ -1,64 +0,0 @@
-require "thread"
-require "concurrent"
-
-module LogStash
-  # Minimal subset implement of a SizedQueue supporting
-  # a timeout option on the lock.
-  #
-  # This will be part of the main Logstash's sized queue
-  class SizedQueueTimeout
-    class TimeoutError < StandardError; end
-
-    DEFAULT_TIMEOUT = 5 # in seconds
-
-    def initialize(max_size, options = {})
-      # `concurrent-ruby` are deprecating the `Condition`
-      # in favor of a Synchonization class that you need to implement.
-      # this was bit overkill to only check if the wait did a timeout.
-      @condition_in = ConditionVariable.new
-      @condition_out = ConditionVariable.new
-
-      @max_size = max_size
-      @queue = []
-      @mutex = Mutex.new
-    end
-
-    def push(obj, timeout = DEFAULT_TIMEOUT)
-      @mutex.synchronize do
-        while full? # wake up check
-          start_time = Concurrent.monotonic_time
-          @condition_out.wait(@mutex, timeout) 
-          if start_time + timeout - Concurrent.monotonic_time  < 0
-            raise TimeoutError
-          end
-        end
-
-        @queue << obj
-        @condition_in.signal
-
-        return obj
-      end
-    end
-    alias_method :<<, :push
-
-    def size
-      @mutex.synchronize { @queue.size }
-    end
-
-    def pop_no_timeout
-      @mutex.synchronize do
-        @condition_in.wait(@mutex) while @queue.empty? # Wake up check
-
-        obj = @queue.shift
-        @condition_out.signal
-
-        return obj
-      end
-    end
-
-    private
-    def full?
-      @queue.size == @max_size
-    end
-  end
-end

data/spec/logstash/size_queue_timeout_spec.rb

@@ -1,100 +0,0 @@
-require_relative "../spec_helper"
-require "logstash/sized_queue_timeout"
-require "flores/random"
-require "stud/try"
-
-describe "LogStash::SizedQueueTimeout" do
-  let(:max_size) { Flores::Random.integer(2..100) }
-  let(:element) { Flores::Random.text(0..100) }
-
-  subject { LogStash::SizedQueueTimeout.new(max_size) }
-  
-  it "adds element to the queue" do
-    subject << element
-    expect(subject.size).to eq(1)
-  end
-
-  it "allow to pop element from the queue" do
-    subject << element
-    subject << "awesome"
-
-    expect(subject.pop_no_timeout).to eq(element)
-  end
-  
-  context "when the queue is full" do
-    before do
-      max_size.times { subject << element }
-    end
-
-    it "block with a timeout" do
-      expect {
-        subject << element
-      }.to raise_error(LogStash::SizedQueueTimeout::TimeoutError)
-    end
-
-    it "unblock when we pop" do
-      blocked = Thread.new do
-        subject << element
-      end
-      sleep(0.1) until blocked.stop?
-
-      expect(blocked.status).to eq("sleep")
-
-      th = Thread.new do
-        subject.pop_no_timeout
-      end
-      sleep(0.1) until th.stop?
-
-      expect(blocked.status).to eq(false)
-
-      blocked.join
-      th.join
-    end
-  end
-
-  context "when the queue is empty" do
-    it "block on pop" do
-      blocked = Thread.new do
-        subject.pop_no_timeout
-      end
-      sleep(0.1) until blocked.stop?
-
-      expect(blocked.status).to eq("sleep")
-
-      th = Thread.new do
-        subject << element
-      end
-      sleep(0.1) until th.stop?
-
-      expect(blocked.status).to eq(false)
-      th.join
-      blocked.join
-    end
-  end
-
-  context "when the queue is occupied but not full" do
-    before :each do
-      Flores::Random.iterations(1..max_size-1) { subject << "hurray" } 
-    end
-
-    it "doesnt block on pop" do
-      th = Thread.new do
-        subject.pop_no_timeout
-      end
-      sleep(0.1) until th.stop?
-
-      expect(th.status).to eq(false)
-      th.join
-    end
-
-    it "doesnt block on push" do
-      th = Thread.new do
-        subject << element
-      end
-      sleep(0.1) until th.stop?
-
-      expect(th.status).to eq(false)
-      th.join
-    end
-  end
-end