logstash-filter-google_appengine 0.104.0 → 0.105.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7909f8aa545e453ee8c441019032b4c3348c785
-  data.tar.gz: 2726919212fa72009da9f20f3e27bd1f28a0ee4f
+  metadata.gz: 0e1e6c994bf36f5d7ec9d62843bb0108cb1f4fbc
+  data.tar.gz: 7adf185fbcb159dd37e9a4b1b157b7ea873d2a20
 SHA512:
-  metadata.gz: 932b7985b0d333342896ba8a2e6c6fa031bd72a27bec8b15e04dfb35c1f61cdc4e48abb2f0198481f1c60b85f9b58cee6c25c7712e85e91e6760196a52ae9458
-  data.tar.gz: 91e05ec7a017048973824067cabff94d4414766188bbcc6f6b96088eb22799a3b65aee1fbf464039db9728c1216bce7bed56ec0fb28c75efe52a5b35fba595bb
+  metadata.gz: 4ad6b05101512292f48886d68a570aafefe08dd985ab410f718505dc1becedb9c50eedf5468fe78f263822c7cb3a6402087b73d9ec98671ea663613943e5b5c2
+  data.tar.gz: 6580ac9dd91cfecd13b59bd4dd4f4675a40373d0d6907e9b96de70deac781d9b26eb2afeb3e7ae31673f645d2037d7faa5ad195dd4cc9e342766ef0b561cf972

data/lib/logstash/filters/google_appengine.rb

@@ -10,43 +10,50 @@ class LogStash::Filters::GoogleAppengine < LogStash::Filters::Base
   public
   def register
     @md5 = Digest::MD5.new
-  end  # def register
+  end
 
-  public
   def filter(event)
     return unless filter?(event)
-
     payload = event['protoPayload']
     payload.delete '@type'
     payload['type'] = 'gae'
     lines = payload.delete 'line'
-
     if lines
       lines.each_with_index { |line, i|
-        # noinspection RubyStringKeysInHashInspection
-        line_data = {
-            '_id' => @md5.hexdigest(payload['requestId'] + i.to_s),
-            'message' => line.delete('logMessage')
-        }
-                        .merge(payload)
-                        .merge(line)
-
-        yield create_event(line_data)
-
+        yield create_event(collect_line_data(i, line, payload))
       }
     else
-      payload['_id'] = @md5.hexdigest payload['requestId']
-      payload['time'] = payload['endTime']
-      yield create_event(payload)
+      yield create_event(collect_resource_request_data(payload))
     end
     event.cancel
-  end # def filter
+  end
 
   private
+  # noinspection RubyStringKeysInHashInspection
+  def collect_line_data(i, line, payload)
+    {
+        '_id' => @md5.hexdigest(payload['requestId'] + i.to_s),
+        'message' => line.delete('logMessage'),
+        'position' => i
+    }
+        .merge(payload)
+        .merge(line)
+  end
+
+  # noinspection RubyStringKeysInHashInspection
+  def collect_resource_request_data(payload)
+    {
+        '_id' => @md5.hexdigest(payload['requestId']),
+        'time' => payload['endTime'],
+        'position' => 0
+    }
+        .merge(payload)
+  end
+
   def create_event(payload)
     new_event = LogStash::Event::new(payload)
     filter_matched(new_event)
     new_event
-  end # def filter
+  end
 
 end # class LogStash::Filters::GoogleAppengine

data/logstash-filter-google_appengine.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name = 'logstash-filter-google_appengine'
-  s.version = '0.104.0'
+  s.version = '0.105.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"

data/spec/filters/google_appengine_spec.rb

@@ -7,13 +7,13 @@ describe LogStash::Filters::GoogleAppengine do
 
   md5 = Digest::MD5.new
 
-  describe "should merge the request payload with the reuest lines data" do
-    config <<-CONFIG
+  config <<-CONFIG
         filter {
           google_appengine { }
          }
-    CONFIG
+  CONFIG
 
+  describe "should merge the request payload with the reuest lines data" do
     test_sample = LogStash::Json::load(File.open("spec/filters/appengine.logs.jsonl", "rb").read)
     sample (test_sample) do
       insist { subject.length } == 3
@@ -21,6 +21,7 @@ describe LogStash::Filters::GoogleAppengine do
       insist { subject[0]["message"] }=="IdentityFilter logUserIdentity: [[meta]] <anonymous:true>\n"
       insist { subject[0]["_id"] }== md5.hexdigest(subject[0]["requestId"] + "0")
       insist { subject[0]["time"] } == "2015-09-03T10:59:40.589Z"
+      insist { subject[0]["position"] } == 0
 
       insist { subject[0]["type"] } == "gae"
 
@@ -31,15 +32,11 @@ describe LogStash::Filters::GoogleAppengine do
       insist { subject[1]["@type"] } == nil
       insist { subject[1]["time"] } =="2015-09-03T10:59:40.65Z"
       insist { subject[1]["type"] } == "gae"
+      insist { subject[1]["position"] } == 1
     end
   end
 
   describe "should handle logs even when they have no lines" do
-    config <<-CONFIG
-        filter {
-          google_appengine { }
-         }
-    CONFIG
     test_sample = LogStash::Json.load(File.open("spec/filters/appengine.logs-without-lines.jsonl", "rb").read)
     sample (test_sample) do
 

metadata

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