logstash-codec-google_appengine 1.7.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db4c3cf8aa0ba60ea6f2f5bb4245b53d1e92844
-  data.tar.gz: 3bea6324986e9c18fe6e37f14d7ea45846d6b849
+  metadata.gz: a2b1bc67fc13ef96f2bb83e55e6495188c273113
+  data.tar.gz: 5b70cef5fe5e5e980474a6de5c471a5ca5d45d72
 SHA512:
-  metadata.gz: e106b9a96bf7f6c603a6dccc9f5c2b318834a6dadb17285c7274cbd58fa49577abca97641bb89fc8a483c8db1fcc31719779c6157b1df8e6a1a1ae70ad5b7ff2
-  data.tar.gz: 0522f90a6f35d125889e9b7f3174092b5110a31ae931a7dff19735ff99dd04e2488a95a57d36d2c6f0931ba3a128dabc0daf408b878cced269d1e97d0b99b358
+  metadata.gz: c2bc8f5341b32a0569103fa35f99dc90515d1ac8084042664c1ec7759eef4a6aef3455766f6ed2fa37e607003a770437158c2d75471daa7402625f7c54355aff
+  data.tar.gz: 850eb74ad21fdeb58be75805665d01917f987f24b0e31a7ef28c8f7e89e2447d38ae944484b081ce245f1229fc6e96c0d6d92cc96a1ad43e8899a7f1f85980cf

data/lib/logstash/codecs/google_appengine.rb

@@ -15,17 +15,17 @@ class LogStash::Codecs::GoogleAppengine < LogStash::Codecs::Base
 
   def decode(data)
     begin
-      @json.decode(data) do |json|
-        if is_parse_failure(json)
-          return @logger.error("Failed to process data", :data => json)
+      @json.decode data do |json|
+        if is_parse_failure json
+          @logger.error("Failed to process data", :data => json)
+        else
+          flatten(json).each { |flattenedJson|
+            yield LogStash::Event.new flattenedJson
+          }
         end
-
-        flatten(json).each { |flattenedJson|
-          yield LogStash::Event.new(flattenedJson)
-        }
       end
     rescue => e
-      @logger.error("Failed to process data", :error => e, :data => data)
+      @logger.error "Failed to process data", :error => e, :data => data
     end
   end
 end
@@ -39,17 +39,20 @@ end
 def flatten(event)
   payload = event['protoPayload']
   lines = payload['line']
-  payload.delete('@type')
+
+  payload.delete '@type'
+  payload['id'] = payload['requestId']
+
   if lines
-    payload.delete('line')
+    payload.delete 'line'
     lines.map.with_index { |line, i|
-      merged = payload.merge(line)
-      merged['lineId'] = merged['requestId'] + i.to_s
+      merged = payload.merge line
+      merged['id'] = merged['id'] + i.to_s
+      merged['message'] = merged.delete 'logMessage'
       merged
     }
   else
     payload['time'] = payload['endTime']
-    payload['lineId'] = payload['requestId']
     [payload]
   end
 end

data/logstash-codec-google_appengine.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name = 'logstash-codec-google_appengine'
-  s.version = '1.7.0'
+  s.version = '1.10.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This codec 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/codecs/google_appengine_spec.rb

@@ -30,11 +30,13 @@ context "#decode" do
 
     expect(collector.size).to eq(3)
 
-    expect(collector[0]["logMessage"]).to eq("IdentityFilter logUserIdentity: [[meta]] <anonymous:true>\n")
-    expect(collector[0]["lineId"]).to eq(collector[0]["requestId"] + "0")
+    expect(collector[0]["message"]).to eq("IdentityFilter logUserIdentity: [[meta]] <anonymous:true>\n")
+    expect(collector[0]["id"]).to eq(collector[0]["requestId"] + "0")
+    expect(collector[0]["@type"]).to be_nil
 
-    expect(collector[1]["logMessage"]).to eq("HttpOnlyFilter getSession: add additional Set-Cookie with httpOnly-flag for JSESSIONID\n")
-    expect(collector[1]["lineId"]).to eq(collector[1]["requestId"] + "1")
+    expect(collector[1]["message"]).to eq("HttpOnlyFilter getSession: add additional Set-Cookie with httpOnly-flag for JSESSIONID\n")
+    expect(collector[1]["id"]).to eq(collector[1]["requestId"] + "1")
+    expect(collector[1]["@type"]).to be_nil
   end
 
   it "should handle logs even when they have no lines" do
@@ -50,8 +52,9 @@ context "#decode" do
     expect(collector.size).to eq(1)
 
     expect(collector[0]["resource"]).to eq("/images/website/welcome/keyFeatures/objectives.jpg")
-    expect(collector[0]["lineId"]).to eq(collector[0]["requestId"])
+    expect(collector[0]["id"]).to eq(collector[0]["requestId"])
     expect(collector[0]["time"]).to eq(collector[0]["endTime"])
+    expect(collector[0]["@type"]).to be_nil
   end
 
   it "falls not emit an event when it can't be parsed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-google_appengine
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Small Improvements