logstash-filter-google_appengine 0.98.0 → 0.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a330869aa33d8ffbf96055612809a640d56784d4
-  data.tar.gz: 47a2afa07322d7ea4a0367e5bc36357df31b8ceb
+  metadata.gz: 44623b65f761aae3ff1c0b34d030ddb786fe72b9
+  data.tar.gz: f342e63af3325fd32d4791a3eb82aa1ca16b78f5
 SHA512:
-  metadata.gz: 58ff621ea3780091f968915d9febdfc94df8a39636f4bac3f65871c200a802ae885ca3e3b50663eff4b3088e91c39d1f20e43317ae373431f6632b94bdd97440
-  data.tar.gz: 6650303bafa273460f87a1029a2beb6a446a9d9e0c97d180632f43fc3c946e6622423fac3320d1411905d8ce8b2bee8cb743359e3c998e1ab39ad80e462bc2a3
+  metadata.gz: d93b3dcc3673424879005c86cfe379480f84f22f091172766a22731e4320a92d78798f77a45f2a967c8663be06c9a79cbbc6d8d4b32e6e4efbcbe4499da6581f
+  data.tar.gz: 5f6485dbf403713b8ce062028e9bbf28ac0e6fa2af731f5331fc197efba1ef2195416b1dec149e24d06f383eda090a96e365dd8ed2e48a812cdc2eb45e22e8d2

data/lib/logstash/filters/google_appengine.rb

@@ -18,27 +18,26 @@ class LogStash::Filters::GoogleAppengine < LogStash::Filters::Base
 
     payload = event['protoPayload']
     payload.delete '@type'
+    payload['type'] = 'gae'
     lines = payload.delete 'line'
     if lines
       lines.each_with_index { |line, i|
         next if line.empty?
-        line_data = {}
+        data = {}
+        data = data.merge(payload)
+        data = data.merge(line)
+        data['_id'] = @md5.hexdigest data['requestId'] + i.to_s
+        data['message'] = data.delete 'logMessage'
 
-        line_data = line_data.merge(payload)
-        line_data = line_data.merge(line)
-        line_data['_id'] = @md5.hexdigest line_data['requestId'] + i.to_s
-        line_data['message'] = line_data.delete 'logMessage'
-        line_data.delete 'logMessage'
-
-        new_event = LogStash::Event::new(line_data)
+        new_event = LogStash::Event::new(data)
         filter_matched(new_event)
         yield(new_event)
       }
     else
-      payload['_id'] = @md5.hexdigest payload['requestId']
-      payload['time'] = payload['endTime']
-
-      new_event = LogStash::Event::new(payload)
+      data = payload
+      data['_id'] = @md5.hexdigest payload['requestId']
+      data['time'] = payload['endTime']
+      new_event = LogStash::Event::new(data)
       filter_matched(new_event)
 
       yield new_event

data/logstash-filter-google_appengine.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name = 'logstash-filter-google_appengine'
-  s.version = '0.98.0'
+  s.version = '0.102.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This filter may be used to decode via inputs appengine logs"
   s.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"
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split($\)
 
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.test_files = s.files.grep(%r{^spec/})
 
   s.metadata = {"logstash_plugin" => "true", "logstash_group" => "filter"}
 

data/spec/filters/google_appengine_spec.rb

@@ -22,12 +22,15 @@ describe LogStash::Filters::GoogleAppengine do
       insist { subject[0]["_id"] }== md5.hexdigest(subject[0]["requestId"] + "0")
       insist { subject[0]["time"] } == "2015-09-03T10:59:40.589Z"
 
+      insist { subject[0]["type"] } == "gae"
+
       insist { subject[0]["@type"] } == nil
 
       insist { subject[1]["message"] }=="HttpOnlyFilter getSession: add additional Set-Cookie with httpOnly-flag for JSESSIONID\n"
       insist { subject[1]["_id"] } == md5.hexdigest(subject[1]["requestId"] + "1")
       insist { subject[1]["@type"] } == nil
       insist { subject[1]["time"] } =="2015-09-03T10:59:40.65Z"
+      insist { subject[1]["type"] } == "gae"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-google_appengine
 version: !ruby/object:Gem::Version
-  version: 0.98.0
+  version: 0.102.0
 platform: ruby
 authors:
 - Small Improvements
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core