logstash-input-kinesis 2.1.2-java → 2.2.0-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -1
  3. data/README.md +1 -1
  4. data/lib/logstash/inputs/kinesis.rb +38 -0
  5. data/lib/logstash/inputs/kinesis/worker.rb +1 -1
  6. data/logstash-input-kinesis.gemspec +3 -3
  7. data/spec/inputs/kinesis/worker_spec.rb +42 -0
  8. data/spec/inputs/kinesis_spec.rb +23 -0
  9. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/amazon-kinesis-client/{1.9.2/amazon-kinesis-client-1.9.2.jar → 1.13.3/amazon-kinesis-client-1.13.3.jar} +0 -0
  10. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-cloudwatch/1.11.728/aws-java-sdk-cloudwatch-1.11.728.jar +0 -0
  11. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-core/1.11.1034/aws-java-sdk-core-1.11.1034.jar +0 -0
  12. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-dynamodb/{1.11.400/aws-java-sdk-dynamodb-1.11.400.jar → 1.11.728/aws-java-sdk-dynamodb-1.11.728.jar} +0 -0
  13. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kinesis/1.11.728/aws-java-sdk-kinesis-1.11.728.jar +0 -0
  14. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kms/1.11.728/aws-java-sdk-kms-1.11.728.jar +0 -0
  15. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-s3/1.11.728/aws-java-sdk-s3-1.11.728.jar +0 -0
  16. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-sts/1.11.1034/aws-java-sdk-sts-1.11.1034.jar +0 -0
  17. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/jmespath-java/1.11.1034/jmespath-java-1.11.1034.jar +0 -0
  18. data/vendor/jar-dependencies/runtime-jars/com/fasterxml/jackson/core/jackson-databind/{2.6.7.1/jackson-databind-2.6.7.1.jar → 2.6.7.4/jackson-databind-2.6.7.4.jar} +0 -0
  19. data/vendor/jar-dependencies/runtime-jars/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar +0 -0
  20. data/vendor/jar-dependencies/runtime-jars/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar +0 -0
  21. data/vendor/jar-dependencies/runtime-jars/com/google/guava/guava/26.0-jre/guava-26.0-jre.jar +0 -0
  22. data/vendor/jar-dependencies/runtime-jars/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar +0 -0
  23. data/vendor/jar-dependencies/runtime-jars/commons-codec/commons-codec/1.15/commons-codec-1.15.jar +0 -0
  24. data/vendor/jar-dependencies/runtime-jars/logstash-input-kinesis_jars.rb +46 -36
  25. data/vendor/jar-dependencies/runtime-jars/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar +0 -0
  26. data/vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar +0 -0
  27. data/vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar +0 -0
  28. data/vendor/jar-dependencies/runtime-jars/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.jar +0 -0
  29. data/vendor/jar-dependencies/runtime-jars/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar +0 -0
  30. metadata +25 -20
  31. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-cloudwatch/1.11.400/aws-java-sdk-cloudwatch-1.11.400.jar +0 -0
  32. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-core/1.11.414/aws-java-sdk-core-1.11.414.jar +0 -0
  33. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kinesis/1.11.400/aws-java-sdk-kinesis-1.11.400.jar +0 -0
  34. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kms/1.11.400/aws-java-sdk-kms-1.11.400.jar +0 -0
  35. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-s3/1.11.400/aws-java-sdk-s3-1.11.400.jar +0 -0
  36. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-sts/1.11.414/aws-java-sdk-sts-1.11.414.jar +0 -0
  37. data/vendor/jar-dependencies/runtime-jars/com/amazonaws/jmespath-java/1.11.414/jmespath-java-1.11.414.jar +0 -0
  38. data/vendor/jar-dependencies/runtime-jars/com/google/guava/guava/18.0/guava-18.0.jar +0 -0
  39. data/vendor/jar-dependencies/runtime-jars/commons-codec/commons-codec/1.10/commons-codec-1.10.jar +0 -0
  40. data/vendor/jar-dependencies/runtime-jars/commons-lang/commons-lang/2.6/commons-lang-2.6.jar +0 -0
  41. data/vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpclient/4.5.5/httpclient-4.5.5.jar +0 -0
  42. data/vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpcore/4.4.9/httpcore-4.4.9.jar +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 245ff794a871cf62045b673be84a549cda2ccba7ff84bb1c07f946e7a4d7ee81
4
- data.tar.gz: ddf9cc491568333d6b69cd155f68d27ec22a27229dfcbd1b138c697cf496028d
3
+ metadata.gz: 9006cbd2a28773fd6135e1359fee5165a473a9b43fbcb662f27ff9a41a5661b6
4
+ data.tar.gz: bf63c441cbf2e46dd3017dcbc1f56342e63b9df9233015ef8a3a26269c073c16
5
5
  SHA512:
6
- metadata.gz: f264b7d24dbfaa1dde8a601f26bc54aed3654ff204fe1e74874599b8b013bfab29a9bf754d3f3a9cea8fe0b8807ad8095b1cbf964309ddb5f1646537dd2e465d
7
- data.tar.gz: d60dd23223e523c4edde978fcb6e5a264bf09e4ad3c1e5a4aa6c882d869af07dc2cee7963f93fd4b3eb039385842441e774b82f251e9fc3ec9787d6874ab1804
6
+ metadata.gz: 6e5a6c89c64337e1d4f36fdf82ffa6e63dba3763ce1766fd18c080bd94d6cba193a08edef2885bcb8d747cd4cb8e7677bf1ae0c07d10c6c79969f4c8b15ee727
7
+ data.tar.gz: cf9221b5973fa5f07441bcec545e5046180fe79d103ecc392e816fa486a2666ee5116411b719e5dba746ee0b013bea1abf0a25dbbe30f31cc9590f2a88a2beb7
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
+ ## 2.2.0
2
+ - Proxy support for Kinesis, DynamoDB, and CloudWatch clients [#84](https://github.com/logstash-plugins/logstash-input-kinesis/issues/84)
3
+ - Upgrade AWS SDK for WebIdentityTokenCredentialsProvider Support [#82](https://github.com/logstash-plugins/logstash-input-kinesis/issues/82)
4
+ - Don't overwrite existing event metadata [#69](https://github.com/logstash-plugins/logstash-input-kinesis/issues/69)
5
+ - [Docs] additional_settings does not need comma [#75](https://github.com/logstash-plugins/logstash-input-kinesis/issues/75)
6
+
1
7
  ## 2.1.2
2
- - Fixed logging level setup to use JUL and JCL loggers backend [#87](https://github.com/logstash-plugins/logstash-input-kinesis/issue/87)
8
+ - Fixed logging level setup to use JUL and JCL loggers backend [#87](https://github.com/logstash-plugins/logstash-input-kinesis/issues/87)
3
9
 
4
10
  ## 2.1.1
5
11
  - Added helpful content from readme to doc file for publishing [#63](https://github.com/logstash-plugins/logstash-input-kinesis/pull/63)
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Logstash AWS Kinesis Input Plugin
2
2
 
3
- [![Build Status](https://travis-ci.org/logstash-plugins/logstash-input-kinesis.svg)](https://travis-ci.org/logstash-plugins/logstash-input-kinesis)
3
+ [![Build Status](https://travis-ci.com/logstash-plugins/logstash-input-kinesis.svg)](https://travis-ci.com/logstash-plugins/logstash-input-kinesis)
4
4
 
5
5
  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).
6
6
 
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require "socket"
4
+ require "uri"
4
5
  require "logstash/inputs/base"
5
6
  require "logstash/errors"
6
7
  require "logstash/environment"
@@ -68,6 +69,12 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
68
69
  # Any additional arbitrary kcl options configurable in the KinesisClientLibConfiguration
69
70
  config :additional_settings, :validate => :hash, :default => {}
70
71
 
72
+ # Proxy for Kinesis, DynamoDB, and CloudWatch (if enabled)
73
+ config :http_proxy, :validate => :string, :default => nil
74
+
75
+ # Hosts that should be excluded from proxying
76
+ config :non_proxy_hosts, :validate => :string, :default => nil
77
+
71
78
  def initialize(params = {})
72
79
  super(params)
73
80
  end
@@ -90,6 +97,8 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
90
97
  raise "Can't configure WARN log level for logger wrapper class #{lg.class}"
91
98
  end
92
99
 
100
+ @logger.info("Registering logstash-input-kinesis")
101
+
93
102
  hostname = Socket.gethostname
94
103
  uuid = java.util::UUID.randomUUID.to_s
95
104
  worker_id = "#{hostname}:#{uuid}"
@@ -129,6 +138,19 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
129
138
  fn = "with_#{key}"
130
139
  @kcl_config.send(fn, value)
131
140
  end
141
+
142
+ unless @http_proxy.to_s.empty?
143
+ proxy_uri = URI(@http_proxy)
144
+ @logger.info("Using proxy #{proxy_uri.scheme}://#{proxy_uri.user}:*****@#{proxy_uri.host}:#{proxy_uri.port}")
145
+ clnt_cfg = @kcl_config.get_kinesis_client_configuration
146
+ set_client_proxy_settings(clnt_cfg, proxy_uri)
147
+ clnt_cfg = @kcl_config.get_dynamo_db_client_configuration
148
+ set_client_proxy_settings(clnt_cfg, proxy_uri)
149
+ clnt_cfg = @kcl_config.get_cloud_watch_client_configuration
150
+ set_client_proxy_settings(clnt_cfg, proxy_uri)
151
+ end
152
+
153
+ @logger.info("Registered logstash-input-kinesis")
132
154
  end
133
155
 
134
156
  def run(output_queue)
@@ -165,4 +187,20 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
165
187
  nil # default in the underlying library
166
188
  end
167
189
  end
190
+
191
+ def set_client_proxy_settings(clnt_cfg, proxy_uri)
192
+ protocol = nil
193
+ case proxy_uri.scheme
194
+ when "http"
195
+ protocol = com.amazonaws.Protocol::HTTP
196
+ when "https"
197
+ protocol = com.amazonaws.Protocol::HTTPS
198
+ end
199
+ clnt_cfg.set_proxy_protocol(protocol) if protocol
200
+ clnt_cfg.set_proxy_username(proxy_uri.user)
201
+ clnt_cfg.set_proxy_password(proxy_uri.password)
202
+ clnt_cfg.set_proxy_host(proxy_uri.host)
203
+ clnt_cfg.set_proxy_port(proxy_uri.port)
204
+ clnt_cfg.set_non_proxy_hosts(@non_proxy_hosts) unless @non_proxy_hosts.to_s.empty?
205
+ end
168
206
  end
@@ -49,7 +49,7 @@ class LogStash::Inputs::Kinesis::Worker
49
49
  metadata = build_metadata(record)
50
50
  @codec.decode(raw) do |event|
51
51
  @decorator.call(event)
52
- event.set('@metadata', metadata)
52
+ event.set('@metadata', event.get('@metadata').merge(metadata))
53
53
  @output_queue << event
54
54
  end
55
55
  rescue => error
@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.platform = 'java'
22
22
 
23
- spec.requirements << "jar 'com.amazonaws:amazon-kinesis-client', '1.9.2'"
24
- spec.requirements << "jar 'com.amazonaws:aws-java-sdk-core', '1.11.414'"
25
- spec.requirements << "jar 'com.amazonaws:aws-java-sdk-sts', '1.11.414'"
23
+ spec.requirements << "jar 'com.amazonaws:amazon-kinesis-client', '1.13.3'"
24
+ spec.requirements << "jar 'com.amazonaws:aws-java-sdk-core', '1.11.1034'"
25
+ spec.requirements << "jar 'com.amazonaws:aws-java-sdk-sts', '1.11.1034'"
26
26
 
27
27
  spec.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
28
28
 
@@ -45,6 +45,9 @@ RSpec.describe "LogStash::Inputs::Kinesis::Worker" do
45
45
  ),
46
46
  record(
47
47
  {
48
+ '@metadata' => {
49
+ forwarded: 'record2'
50
+ },
48
51
  id: "record2",
49
52
  message: "test2"
50
53
  },
@@ -55,6 +58,25 @@ RSpec.describe "LogStash::Inputs::Kinesis::Worker" do
55
58
  )
56
59
  .withCheckpointer(checkpointer)
57
60
  }
61
+ let(:collide_metadata_process_input) {
62
+ KCL_TYPES::ProcessRecordsInput.new()
63
+ .withRecords(java.util.Arrays.asList([
64
+ record(
65
+ {
66
+ '@metadata' => {
67
+ forwarded: 'record3',
68
+ partition_key: 'invalid_key'
69
+ },
70
+ id: "record3",
71
+ message: "test3"
72
+ },
73
+ '1.441215410869E9',
74
+ 'partitionKey3',
75
+ '21269319989652663814458848515492872193'
76
+ )].to_java)
77
+ )
78
+ .withCheckpointer(checkpointer)
79
+ }
58
80
  let(:empty_process_input) {
59
81
  KCL_TYPES::ProcessRecordsInput.new()
60
82
  .withRecords(java.util.Arrays.asList([].to_java))
@@ -82,6 +104,26 @@ RSpec.describe "LogStash::Inputs::Kinesis::Worker" do
82
104
  expect(m1.get('decorated')).to eq(true)
83
105
  end
84
106
 
107
+ it "decodes and keeps submitted metadata" do
108
+ worker.processRecords(process_input)
109
+ expect(queue.size).to eq(2)
110
+ m1 = queue.pop
111
+ m2 = queue.pop
112
+ expect(m1).to be_kind_of(LogStash::Event)
113
+ expect(m2).to be_kind_of(LogStash::Event)
114
+ expect(m1.get('@metadata')['forwarded']).to eq(nil)
115
+ expect(m2.get('@metadata')['forwarded']).to eq('record2')
116
+ end
117
+
118
+ it "decodes and does not allow submitted metadata to overwrite internal keys" do
119
+ worker.processRecords(collide_metadata_process_input)
120
+ expect(queue.size).to eq(1)
121
+ m1 = queue.pop
122
+ expect(m1).to be_kind_of(LogStash::Event)
123
+ expect(m1.get('@metadata')['forwarded']).to eq('record3')
124
+ expect(m1.get('@metadata')['partition_key']).to eq('partitionKey3')
125
+ end
126
+
85
127
  it "checkpoints on interval" do
86
128
  expect(checkpointer).to receive(:checkpoint).once
87
129
  worker.processRecords(empty_process_input)
@@ -65,6 +65,19 @@ RSpec.describe "inputs/kinesis" do
65
65
  }
66
66
  }}
67
67
 
68
+ # Config with proxy
69
+ let(:config_with_proxy) {{
70
+ "application_name" => "my-processor",
71
+ "kinesis_stream_name" => "run-specs",
72
+ "codec" => codec,
73
+ "metrics" => metrics,
74
+ "checkpoint_interval_seconds" => 120,
75
+ "region" => "ap-southeast-1",
76
+ "profile" => nil,
77
+ "http_proxy" => "http://user1:pwd1@proxy.example.com:3128/",
78
+ "non_proxy_hosts" => "127.0.0.5",
79
+ }}
80
+
68
81
  # Config hash to test invalid additional_settings where the name is not found
69
82
  let(:config_with_invalid_additional_settings_name_not_found) {{
70
83
  "application_name" => "my-processor",
@@ -153,6 +166,16 @@ RSpec.describe "inputs/kinesis" do
153
166
  expect(kinesis_with_valid_additional_settings.kcl_config.kinesisEndpoint).to eq("http://localhost")
154
167
  end
155
168
 
169
+ subject!(:kinesis_with_proxy) { LogStash::Inputs::Kinesis.new(config_with_proxy) }
170
+
171
+ it "configures the KCL with proxy settings" do
172
+ kinesis_with_proxy.register
173
+ clnt_config = kinesis_with_proxy.kcl_config.kinesis_client_configuration
174
+ expect(clnt_config.get_proxy_username).to eq("user1")
175
+ expect(clnt_config.get_proxy_host).to eq("proxy.example.com")
176
+ expect(clnt_config.get_proxy_port).to eq(3128)
177
+ expect(clnt_config.get_non_proxy_hosts).to eq("127.0.0.5")
178
+ end
156
179
 
157
180
  subject!(:kinesis_with_invalid_additional_settings_name_not_found) { LogStash::Inputs::Kinesis.new(config_with_invalid_additional_settings_name_not_found) }
158
181
 
@@ -2,51 +2,61 @@
2
2
  begin
3
3
  require 'jar_dependencies'
4
4
  rescue LoadError
5
- require 'com/amazonaws/aws-java-sdk-sts/1.11.414/aws-java-sdk-sts-1.11.414.jar'
6
- require 'com/fasterxml/jackson/core/jackson-databind/2.6.7.1/jackson-databind-2.6.7.1.jar'
7
- require 'com/fasterxml/jackson/core/jackson-core/2.6.7/jackson-core-2.6.7.jar'
5
+ require 'com/google/guava/guava/26.0-jre/guava-26.0-jre.jar'
6
+ require 'com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar'
7
+ require 'org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar'
8
8
  require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.7/jackson-dataformat-cbor-2.6.7.jar'
9
- require 'org/apache/httpcomponents/httpclient/4.5.5/httpclient-4.5.5.jar'
10
- require 'com/amazonaws/aws-java-sdk-s3/1.11.400/aws-java-sdk-s3-1.11.400.jar'
11
- require 'com/google/guava/guava/18.0/guava-18.0.jar'
12
- require 'commons-lang/commons-lang/2.6/commons-lang-2.6.jar'
13
- require 'commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar'
9
+ require 'com/amazonaws/aws-java-sdk-cloudwatch/1.11.728/aws-java-sdk-cloudwatch-1.11.728.jar'
10
+ require 'com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar'
11
+ require 'com/amazonaws/aws-java-sdk-kinesis/1.11.728/aws-java-sdk-kinesis-1.11.728.jar'
12
+ require 'org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar'
13
+ require 'org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar'
14
14
  require 'joda-time/joda-time/2.8.1/joda-time-2.8.1.jar'
15
- require 'com/amazonaws/jmespath-java/1.11.414/jmespath-java-1.11.414.jar'
16
- require 'software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar'
17
- require 'com/amazonaws/amazon-kinesis-client/1.9.2/amazon-kinesis-client-1.9.2.jar'
18
- require 'com/amazonaws/aws-java-sdk-kinesis/1.11.400/aws-java-sdk-kinesis-1.11.400.jar'
19
- require 'com/amazonaws/aws-java-sdk-cloudwatch/1.11.400/aws-java-sdk-cloudwatch-1.11.400.jar'
20
- require 'org/apache/httpcomponents/httpcore/4.4.9/httpcore-4.4.9.jar'
21
- require 'com/amazonaws/aws-java-sdk-dynamodb/1.11.400/aws-java-sdk-dynamodb-1.11.400.jar'
22
- require 'com/amazonaws/aws-java-sdk-core/1.11.414/aws-java-sdk-core-1.11.414.jar'
23
- require 'commons-codec/commons-codec/1.10/commons-codec-1.10.jar'
15
+ require 'com/amazonaws/aws-java-sdk-sts/1.11.1034/aws-java-sdk-sts-1.11.1034.jar'
24
16
  require 'com/fasterxml/jackson/core/jackson-annotations/2.6.0/jackson-annotations-2.6.0.jar'
25
- require 'com/amazonaws/aws-java-sdk-kms/1.11.400/aws-java-sdk-kms-1.11.400.jar'
17
+ require 'com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar'
26
18
  require 'com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar'
19
+ require 'com/amazonaws/aws-java-sdk-kms/1.11.728/aws-java-sdk-kms-1.11.728.jar'
20
+ require 'com/amazonaws/aws-java-sdk-core/1.11.1034/aws-java-sdk-core-1.11.1034.jar'
21
+ require 'commons-codec/commons-codec/1.15/commons-codec-1.15.jar'
22
+ require 'com/fasterxml/jackson/core/jackson-core/2.6.7/jackson-core-2.6.7.jar'
23
+ require 'com/amazonaws/aws-java-sdk-dynamodb/1.11.728/aws-java-sdk-dynamodb-1.11.728.jar'
24
+ require 'com/amazonaws/aws-java-sdk-s3/1.11.728/aws-java-sdk-s3-1.11.728.jar'
25
+ require 'commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar'
26
+ require 'org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.jar'
27
+ require 'software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar'
28
+ require 'com/amazonaws/amazon-kinesis-client/1.13.3/amazon-kinesis-client-1.13.3.jar'
29
+ require 'org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar'
30
+ require 'com/fasterxml/jackson/core/jackson-databind/2.6.7.4/jackson-databind-2.6.7.4.jar'
31
+ require 'com/amazonaws/jmespath-java/1.11.1034/jmespath-java-1.11.1034.jar'
27
32
  end
28
33
 
29
34
  if defined? Jars
30
- require_jar 'com.amazonaws', 'aws-java-sdk-sts', '1.11.414'
31
- require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.6.7.1'
32
- require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.6.7'
35
+ require_jar 'com.google.guava', 'guava', '26.0-jre'
36
+ require_jar 'com.google.code.findbugs', 'jsr305', '3.0.2'
37
+ require_jar 'org.apache.httpcomponents', 'httpclient', '4.5.13'
33
38
  require_jar 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.6.7'
34
- require_jar 'org.apache.httpcomponents', 'httpclient', '4.5.5'
35
- require_jar 'com.amazonaws', 'aws-java-sdk-s3', '1.11.400'
36
- require_jar 'com.google.guava', 'guava', '18.0'
37
- require_jar 'commons-lang', 'commons-lang', '2.6'
38
- require_jar 'commons-logging', 'commons-logging', '1.1.3'
39
+ require_jar 'com.amazonaws', 'aws-java-sdk-cloudwatch', '1.11.728'
40
+ require_jar 'com.google.j2objc', 'j2objc-annotations', '1.1'
41
+ require_jar 'com.amazonaws', 'aws-java-sdk-kinesis', '1.11.728'
42
+ require_jar 'org.codehaus.mojo', 'animal-sniffer-annotations', '1.14'
43
+ require_jar 'org.apache.commons', 'commons-lang3', '3.7'
39
44
  require_jar 'joda-time', 'joda-time', '2.8.1'
40
- require_jar 'com.amazonaws', 'jmespath-java', '1.11.414'
41
- require_jar 'software.amazon.ion', 'ion-java', '1.0.2'
42
- require_jar 'com.amazonaws', 'amazon-kinesis-client', '1.9.2'
43
- require_jar 'com.amazonaws', 'aws-java-sdk-kinesis', '1.11.400'
44
- require_jar 'com.amazonaws', 'aws-java-sdk-cloudwatch', '1.11.400'
45
- require_jar 'org.apache.httpcomponents', 'httpcore', '4.4.9'
46
- require_jar 'com.amazonaws', 'aws-java-sdk-dynamodb', '1.11.400'
47
- require_jar 'com.amazonaws', 'aws-java-sdk-core', '1.11.414'
48
- require_jar 'commons-codec', 'commons-codec', '1.10'
45
+ require_jar 'com.amazonaws', 'aws-java-sdk-sts', '1.11.1034'
49
46
  require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.6.0'
50
- require_jar 'com.amazonaws', 'aws-java-sdk-kms', '1.11.400'
47
+ require_jar 'com.google.errorprone', 'error_prone_annotations', '2.1.3'
51
48
  require_jar 'com.google.protobuf', 'protobuf-java', '2.6.1'
49
+ require_jar 'com.amazonaws', 'aws-java-sdk-kms', '1.11.728'
50
+ require_jar 'com.amazonaws', 'aws-java-sdk-core', '1.11.1034'
51
+ require_jar 'commons-codec', 'commons-codec', '1.15'
52
+ require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.6.7'
53
+ require_jar 'com.amazonaws', 'aws-java-sdk-dynamodb', '1.11.728'
54
+ require_jar 'com.amazonaws', 'aws-java-sdk-s3', '1.11.728'
55
+ require_jar 'commons-logging', 'commons-logging', '1.1.3'
56
+ require_jar 'org.checkerframework', 'checker-qual', '2.5.2'
57
+ require_jar 'software.amazon.ion', 'ion-java', '1.0.2'
58
+ require_jar 'com.amazonaws', 'amazon-kinesis-client', '1.13.3'
59
+ require_jar 'org.apache.httpcomponents', 'httpcore', '4.4.13'
60
+ require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.6.7.4'
61
+ require_jar 'com.amazonaws', 'jmespath-java', '1.11.1034'
52
62
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-kinesis
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
4
+ version: 2.2.0
5
5
  platform: java
6
6
  authors:
7
7
  - Brian Palmer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-01 00:00:00.000000000 Z
11
+ date: 2021-06-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,33 @@ files:
92
92
  - spec/inputs/kinesis/worker_spec.rb
93
93
  - spec/inputs/kinesis_spec.rb
94
94
  - spec/spec_helper.rb
95
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/amazon-kinesis-client/1.9.2/amazon-kinesis-client-1.9.2.jar
96
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-cloudwatch/1.11.400/aws-java-sdk-cloudwatch-1.11.400.jar
97
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-core/1.11.414/aws-java-sdk-core-1.11.414.jar
98
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-dynamodb/1.11.400/aws-java-sdk-dynamodb-1.11.400.jar
99
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kinesis/1.11.400/aws-java-sdk-kinesis-1.11.400.jar
100
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kms/1.11.400/aws-java-sdk-kms-1.11.400.jar
101
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-s3/1.11.400/aws-java-sdk-s3-1.11.400.jar
102
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-sts/1.11.414/aws-java-sdk-sts-1.11.414.jar
103
- - vendor/jar-dependencies/runtime-jars/com/amazonaws/jmespath-java/1.11.414/jmespath-java-1.11.414.jar
95
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/amazon-kinesis-client/1.13.3/amazon-kinesis-client-1.13.3.jar
96
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-cloudwatch/1.11.728/aws-java-sdk-cloudwatch-1.11.728.jar
97
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-core/1.11.1034/aws-java-sdk-core-1.11.1034.jar
98
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-dynamodb/1.11.728/aws-java-sdk-dynamodb-1.11.728.jar
99
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kinesis/1.11.728/aws-java-sdk-kinesis-1.11.728.jar
100
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-kms/1.11.728/aws-java-sdk-kms-1.11.728.jar
101
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-s3/1.11.728/aws-java-sdk-s3-1.11.728.jar
102
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/aws-java-sdk-sts/1.11.1034/aws-java-sdk-sts-1.11.1034.jar
103
+ - vendor/jar-dependencies/runtime-jars/com/amazonaws/jmespath-java/1.11.1034/jmespath-java-1.11.1034.jar
104
104
  - vendor/jar-dependencies/runtime-jars/com/fasterxml/jackson/core/jackson-annotations/2.6.0/jackson-annotations-2.6.0.jar
105
105
  - vendor/jar-dependencies/runtime-jars/com/fasterxml/jackson/core/jackson-core/2.6.7/jackson-core-2.6.7.jar
106
- - vendor/jar-dependencies/runtime-jars/com/fasterxml/jackson/core/jackson-databind/2.6.7.1/jackson-databind-2.6.7.1.jar
106
+ - vendor/jar-dependencies/runtime-jars/com/fasterxml/jackson/core/jackson-databind/2.6.7.4/jackson-databind-2.6.7.4.jar
107
107
  - vendor/jar-dependencies/runtime-jars/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.7/jackson-dataformat-cbor-2.6.7.jar
108
- - vendor/jar-dependencies/runtime-jars/com/google/guava/guava/18.0/guava-18.0.jar
108
+ - vendor/jar-dependencies/runtime-jars/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
109
+ - vendor/jar-dependencies/runtime-jars/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar
110
+ - vendor/jar-dependencies/runtime-jars/com/google/guava/guava/26.0-jre/guava-26.0-jre.jar
111
+ - vendor/jar-dependencies/runtime-jars/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar
109
112
  - vendor/jar-dependencies/runtime-jars/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
110
- - vendor/jar-dependencies/runtime-jars/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
111
- - vendor/jar-dependencies/runtime-jars/commons-lang/commons-lang/2.6/commons-lang-2.6.jar
113
+ - vendor/jar-dependencies/runtime-jars/commons-codec/commons-codec/1.15/commons-codec-1.15.jar
112
114
  - vendor/jar-dependencies/runtime-jars/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar
113
115
  - vendor/jar-dependencies/runtime-jars/joda-time/joda-time/2.8.1/joda-time-2.8.1.jar
114
116
  - vendor/jar-dependencies/runtime-jars/logstash-input-kinesis_jars.rb
115
- - vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpclient/4.5.5/httpclient-4.5.5.jar
116
- - vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpcore/4.4.9/httpcore-4.4.9.jar
117
+ - vendor/jar-dependencies/runtime-jars/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar
118
+ - vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
119
+ - vendor/jar-dependencies/runtime-jars/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar
120
+ - vendor/jar-dependencies/runtime-jars/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.jar
121
+ - vendor/jar-dependencies/runtime-jars/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
117
122
  - vendor/jar-dependencies/runtime-jars/software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar
118
123
  homepage: https://github.com/logstash-plugins/logstash-input-kinesis
119
124
  licenses:
@@ -137,9 +142,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
137
142
  - !ruby/object:Gem::Version
138
143
  version: '0'
139
144
  requirements:
140
- - jar 'com.amazonaws:amazon-kinesis-client', '1.9.2'
141
- - jar 'com.amazonaws:aws-java-sdk-core', '1.11.414'
142
- - jar 'com.amazonaws:aws-java-sdk-sts', '1.11.414'
145
+ - jar 'com.amazonaws:amazon-kinesis-client', '1.13.3'
146
+ - jar 'com.amazonaws:aws-java-sdk-core', '1.11.1034'
147
+ - jar 'com.amazonaws:aws-java-sdk-sts', '1.11.1034'
143
148
  rubyforge_project:
144
149
  rubygems_version: 2.6.13
145
150
  signing_key: