Skip to content

Commit f1a3fda

Browse files
plugin-api 2.0 migration
1 parent c980fe9 commit f1a3fda

File tree

4 files changed

+31
-20
lines changed

4 files changed

+31
-20
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
sudo: false
2+
jdk:
3+
- oraclejdk8
24
language: ruby
35
cache: bundler
46
rvm:
5-
- jruby-1.7.23
6-
script:
7+
- jruby-1.7.25
8+
before_install:
9+
- git clone -b feature/event_interface https://github.com/elastic/logstash
10+
script:
711
- bundle exec rspec spec

Gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
source 'https://rubygems.org'
22
gemspec
3+
4+
# this is temporary for the feature/plugin-api-2_0 branch and is meant for travis testing
5+
gem "logstash-core", :path => "./logstash/logstash-core"
6+
gem "logstash-core-plugin-api", :path => "./logstash/logstash-core-plugin-api"
7+
gem "logstash-core-event-java", :path => "./logstash/logstash-core-event-java"
8+
gem "logstash-devutils", :github => "elastic/logstash-devutils", :branch => "feature/plugin-api-2_0"
9+
gem "logstash-codec-line", :github => "logstash-plugins/logstash-codec-line", :branch => "feature/plugin-api-2_0"

logstash-codec-json_lines.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
2121

2222
# Gem dependencies
23-
s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
23+
s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
2424

2525
s.add_runtime_dependency 'logstash-codec-line', '>= 2.1.0'
2626

spec/codecs/json_lines_spec.rb

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
data = {"foo" => "bar", "baz" => {"bah" => ["a","b","c"]}}
1717
subject.decode(LogStash::Json.dump(data) + "\n") do |event|
1818
insist { event.is_a? LogStash::Event }
19-
insist { event["foo"] } == data["foo"]
20-
insist { event["baz"] } == data["baz"]
21-
insist { event["bah"] } == data["bah"]
19+
insist { event.get("foo") } == data["foo"]
20+
insist { event.get("baz") } == data["baz"]
21+
insist { event.get("bah") } == data["bah"]
2222
end
2323
end
2424

@@ -29,9 +29,9 @@
2929
end
3030
subject.decode("\n") do |event|
3131
insist { event.is_a? LogStash::Event }
32-
insist { event["foo"] } == data["foo"]
33-
insist { event["baz"] } == data["baz"]
34-
insist { event["bah"] } == data["bah"]
32+
insist { event.get("foo") } == data["foo"]
33+
insist { event.get("baz") } == data["baz"]
34+
insist { event.get("bah") } == data["bah"]
3535
end
3636
end
3737

@@ -44,9 +44,9 @@
4444
result = []
4545
subject.decode(line) { |event| result << event }
4646
expect(result.size).to eq(3)
47-
expect(result[0]["hey"]).to eq(1)
48-
expect(result[1]["hey"]).to eq(2)
49-
expect(result[2]["hey"]).to eq(3)
47+
expect(result[0].get("hey")).to eq(1)
48+
expect(result[1].get("hey")).to eq(2)
49+
expect(result[2].get("hey")).to eq(3)
5050
end
5151
end
5252

@@ -56,8 +56,8 @@
5656
subject.decode("something that isn't json\n") do |event|
5757
decoded = true
5858
insist { event.is_a?(LogStash::Event) }
59-
insist { event["message"] } == "something that isn't json"
60-
insist { event["tags"] }.include?("_jsonparsefailure")
59+
insist { event.get("message") } == "something that isn't json"
60+
insist { event.get("tags") }.include?("_jsonparsefailure")
6161
end
6262
insist { decoded } == true
6363
end
@@ -71,7 +71,7 @@
7171
subject.decode("\n") do |event|
7272
decoded = true
7373
insist { event.is_a?(LogStash::Event) }
74-
insist { event["message"].encoding.to_s } == "UTF-8"
74+
insist { event.get("message").encoding.to_s } == "UTF-8"
7575
end
7676
insist { decoded } == true
7777
end
@@ -88,13 +88,13 @@
8888

8989
it "uses an array to store the tags" do
9090
subject.decode(message) do |event|
91-
expect(event['tags']).to be_a Array
91+
expect(event.get('tags')).to be_a Array
9292
end
9393
end
9494

9595
it "add a json parser failure tag" do
9696
subject.decode(message) do |event|
97-
expect(event['tags']).to include "_jsonparsefailure"
97+
expect(event.get('tags')).to include "_jsonparsefailure"
9898
end
9999
end
100100
end
@@ -162,7 +162,7 @@
162162
collector.push(event)
163163
end
164164
expect(collector.size).to eq(1)
165-
expect(collector.first['field']).to eq('value1')
165+
expect(collector.first.get('field')).to eq('value1')
166166
end
167167
end
168168

@@ -180,8 +180,8 @@
180180
collector.push(event)
181181
end
182182
expect(collector.size).to eq(2)
183-
expect(collector.first['field']).to eq('value1')
184-
expect(collector.last['field']).to eq('value2')
183+
expect(collector.first.get('field')).to eq('value1')
184+
expect(collector.last.get('field')).to eq('value2')
185185
end
186186
end
187187

0 commit comments

Comments
 (0)