logstash-input-kinesis 1.4.3-java → 1.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e3ea8c6324844f371148a1e1bf7743e0bb5cfe
-  data.tar.gz: 7be846fcd88272b49885cf60b6256b46a3c8b68f
+  metadata.gz: 03bbacd8aa1c1ead7454666582fa2ec84cd79d86
+  data.tar.gz: ae48dab34705083645faff5c7b7c3674ef658a8e
 SHA512:
-  metadata.gz: b1d06f224b074e9db2a8df3f0720610d416109ed39da7ab2bfff171453bbc5f5e11d740b008463d4f09f2d9bd5e88c721d49d813fe714b623c2d83855c959f38
-  data.tar.gz: 20a09f5d185eb7a14f30fdf07d93256df689b6d25fd00284ee24cff4e08eee55a50cf89bec92d08f244369652293c3bf81510f75cb82c78b3ecc472ae4492c5e
+  metadata.gz: 04342e5d1a6e34138995d89cb894b732997d0d1b51378e46fd4db49823c7b0d8707fbe9bdbbb647b527240372a0ff59360f558866092cff849e91fca8a8b8fda
+  data.tar.gz: 86232000df97f16996c078caf62c6cd35f676c411ce1901966d4edb8da372267867a65739a75ab3a40267e4b6ac3c607702a8bdc69fa9e9e1288c4ca5a26b159

data/CONTRIBUTORS

@@ -0,0 +1,14 @@
+The following is a list of people who have contributed ideas, code, bug
+reports, or in general have helped logstash along its way.
+
+Maintainers:
+* Brian Palmer (codekitchen)
+
+Contributors:
+* Brian Palmer (codekitchen)
+* Samuel García Martínez (samuelgmartinez)
+
+Note: If you've sent us patches, bug reports, or otherwise contributed to
+Logstash, and you aren't on the list above and want to be, please let us know
+and we'll make sure you're here. Contributions from folks like you are what make
+open source awesome.

data/README.md

@@ -1,12 +1,12 @@
 # Logstash AWS Kinesis Input Plugin
 
-[![Build Status](https://travis-ci.org/codekitchen/logstash-input-kinesis.svg)](https://travis-ci.org/codekitchen/logstash-input-kinesis)
+[![Build Status](https://travis-ci.org/logstash-plugins/logstash-input-kinesis.svg)](https://travis-ci.org/logstash-plugins/logstash-input-kinesis)
 
 This is a [AWS Kinesis](http://docs.aws.amazon.com/kinesis/latest/dev/introduction.html) input plugin for [Logstash](https://github.com/elasticsearch/logstash). Under the hood uses the [Kinesis Client Library](http://docs.aws.amazon.com/kinesis/latest/dev/kinesis-record-processor-implementation-app-java.html).
 
 ## Installation
 
-This plugin requires Logstash >= 1.5, and can be installed by Logstash
+This plugin requires Logstash >= 2.0, and can be installed by Logstash
 itself.
 
 ```sh
@@ -39,7 +39,7 @@ This are the properties you can configure and what are the default values:
 * `checkpoint_interval_seconds`: How many seconds between worker checkpoints to DynamoDB. A low value ussually means lower message replay in case of node failure/restart but it increases CPU+network ussage (which increases the AWS costs).
     * **required**: false
     * **default value**: `60`
-* `metrics`: Worker metric tracking. By default this is disabled, set it to "cloudwatch" to enable the cloudwatch integration in the Kinesis Client Library. 
+* `metrics`: Worker metric tracking. By default this is disabled, set it to "cloudwatch" to enable the cloudwatch integration in the Kinesis Client Library.
     * **required**: false
     * **default value**: `nil`
 
@@ -61,7 +61,8 @@ Look at the [documentation](https://docs.aws.amazon.com/AWSJavaSDK/latest/javado
 
 ## Contributing
 
-1. Fork it ( https://github.com/codekitchen/logstash-input-kinesis/fork )
+0. https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md#contribution-steps
+1. Fork it ( https://github.com/logstash-plugins/logstash-input-kinesis/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/logstash/inputs/kinesis.rb

@@ -85,7 +85,7 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
     end
   end
 
-  def teardown
+  def stop
     @kcl_worker.shutdown if @kcl_worker
   end
 

data/lib/logstash/inputs/kinesis/version.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
 module Logstash
   module Input
     module Kinesis
-      VERSION = "1.4.3"
+      VERSION = "1.5.0"
     end
   end
 end

data/lib/logstash/inputs/kinesis/worker.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LogStash::Inputs::Kinesis::Worker
   include com.amazonaws.services.kinesis.clientlibrary.interfaces.v2::IRecordProcessor
 

data/logstash-input-kinesis.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |spec|
   spec.email         = ["brian@codekitchen.net"]
   spec.summary       = %q{Logstash plugin for Kinesis input}
   spec.description   = %q{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}
-  spec.homepage      = "https://github.com/codekitchen/logstash-input-kinesis"
+  spec.homepage      = "https://github.com/logstash-plugins/logstash-input-kinesis"
   spec.licenses      = ['Apache License (2.0)']
 
-  spec.files         = `git ls-files`.split($\)
+  spec.files         = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
@@ -22,9 +22,14 @@ Gem::Specification.new do |spec|
 
   spec.platform      = 'java'
 
+  spec.requirements << "jar 'com.amazonaws:amazon-kinesis-client', '1.6.1'"
+  spec.requirements << "jar 'org.apache.httpcomponents:httpclient', '4.5.1'"
+
+  spec.add_development_dependency 'jar-dependencies', '0.3.2'
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2.0"
-  spec.add_development_dependency "logstash-core", ">= 1.5.1"
+  spec.add_development_dependency "logstash-core", "~> 2.4.0"
   spec.add_development_dependency "logstash-codec-json"
 end

data/spec/inputs/kinesis/worker_spec.rb

@@ -48,6 +48,7 @@ RSpec.describe "LogStash::Inputs::Kinesis::Worker" do
     describe "#processRecords" do
       it "decodes and queues each record with decoration" do
         worker.processRecords(process_input)
+        expect(queue.size).to eq(2)
         m1 = queue.pop
         m2 = queue.pop
         expect(m1).to be_kind_of(LogStash::Event)

data/spec/inputs/kinesis_spec.rb

@@ -43,11 +43,22 @@ RSpec.describe "inputs/kinesis" do
     end
   end
 
+  context "#stop" do
+    it "stops the KCL worker" do
+      expect(kinesis).to receive(:kcl_builder).with(queue).and_return(stub_builder)
+      expect(kcl_worker).to receive(:run).with(no_args)
+      expect(kcl_worker).to receive(:shutdown).with(no_args)
+      kinesis.run(queue)
+      kinesis.do_stop # do_stop calls stop internally
+    end
+  end
+
   context "#worker_factory" do
     it "clones the codec for each worker" do
-      expect(codec).to receive(:clone).once
       worker = kinesis.worker_factory(queue).call()
       expect(worker).to be_kind_of(LogStash::Inputs::Kinesis::Worker)
+      expect(worker.codec).to_not eq(kinesis.codec)
+      expect(worker.codec).to be_kind_of(codec.class)
     end
 
     it "generates a valid worker" do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-kinesis
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: java
 authors:
 - Brian Palmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  name: jar-dependencies
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -55,17 +69,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.4.0
   name: logstash-core
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -87,26 +101,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
 - lib/logstash-input-kinesis_jars.rb
+- lib/com/amazonaws/amazon-kinesis-client/1.6.1/amazon-kinesis-client-1.6.1.jar
+- lib/com/amazonaws/aws-java-sdk-cloudwatch/1.10.20/aws-java-sdk-cloudwatch-1.10.20.jar
+- lib/com/amazonaws/aws-java-sdk-core/1.10.20/aws-java-sdk-core-1.10.20.jar
+- lib/com/amazonaws/aws-java-sdk-dynamodb/1.10.20/aws-java-sdk-dynamodb-1.10.20.jar
+- lib/com/amazonaws/aws-java-sdk-kinesis/1.10.20/aws-java-sdk-kinesis-1.10.20.jar
+- lib/com/amazonaws/aws-java-sdk-kms/1.10.20/aws-java-sdk-kms-1.10.20.jar
+- lib/com/amazonaws/aws-java-sdk-s3/1.10.20/aws-java-sdk-s3-1.10.20.jar
+- lib/com/fasterxml/jackson/core/jackson-annotations/2.5.0/jackson-annotations-2.5.0.jar
+- lib/com/fasterxml/jackson/core/jackson-core/2.5.3/jackson-core-2.5.3.jar
+- lib/com/fasterxml/jackson/core/jackson-databind/2.5.3/jackson-databind-2.5.3.jar
+- lib/com/google/guava/guava/18.0/guava-18.0.jar
+- lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
+- lib/commons-codec/commons-codec/1.9/commons-codec-1.9.jar
+- lib/commons-lang/commons-lang/2.6/commons-lang-2.6.jar
+- lib/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
+- lib/joda-time/joda-time/2.8.1/joda-time-2.8.1.jar
 - lib/logstash/inputs/kinesis.rb
 - lib/logstash/inputs/kinesis/version.rb
 - lib/logstash/inputs/kinesis/worker.rb
-- logstash-input-kinesis.gemspec
-- pom.xml
-- spec/inputs/kinesis/worker_spec.rb
-- spec/inputs/kinesis_spec.rb
+- lib/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1.jar
+- lib/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3.jar
 - spec/spec_helper.rb
+- spec/inputs/kinesis_spec.rb
+- spec/inputs/kinesis/worker_spec.rb
 - vendor/jar-dependencies/runtime-jars/amazon-kinesis-client-1.6.1.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatch-1.10.20.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-core-1.10.20.jar
-- vendor/jar-dependencies/runtime-jars/aws-java-sdk-core-1.10.50.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-dynamodb-1.10.20.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-kinesis-1.10.20.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-kms-1.10.20.jar
@@ -122,7 +144,11 @@ files:
 - vendor/jar-dependencies/runtime-jars/jackson-databind-2.5.3.jar
 - vendor/jar-dependencies/runtime-jars/joda-time-2.8.1.jar
 - vendor/jar-dependencies/runtime-jars/protobuf-java-2.6.1.jar
-homepage: https://github.com/codekitchen/logstash-input-kinesis
+- logstash-input-kinesis.gemspec
+- README.md
+- CONTRIBUTORS
+- Gemfile
+homepage: https://github.com/logstash-plugins/logstash-input-kinesis
 licenses:
 - Apache License (2.0)
 metadata:
@@ -142,13 +168,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- jar 'com.amazonaws:amazon-kinesis-client', '1.6.1'
+- jar 'org.apache.httpcomponents:httpclient', '4.5.1'
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Logstash plugin for Kinesis input
 test_files:
-- spec/inputs/kinesis/worker_spec.rb
-- spec/inputs/kinesis_spec.rb
 - spec/spec_helper.rb
+- spec/inputs/kinesis_spec.rb
+- spec/inputs/kinesis/worker_spec.rb

data/.gitignore

@@ -1,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - jruby-19mode

data/LICENSE.txt

@@ -1,14 +0,0 @@
-Copyright (c) 2015 Brian Palmer
-
-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.
-

data/Rakefile

@@ -1,15 +0,0 @@
-require "bundler/gem_tasks"
-
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-end
-
-task default: "spec"
-
-task "vendor_jars" do
-  sh "mvn dependency:copy-dependencies -DoutputDirectory=vendor/jar-dependencies/runtime-jars/"
-end
-
-task build: "vendor_jars"

data/pom.xml

@@ -1,32 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>codekitchen</groupId>
-  <artifactId>logstash-input-kinesis</artifactId>
-  <version>dev</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>amazon-kinesis-client</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>