logstash-codec-google_appengine 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5fb3af88d07784e2036635333aab73f34b06777
-  data.tar.gz: 9327c06b5e466c1bd53f12fc160b239c71559a38
+  metadata.gz: 6db4c3cf8aa0ba60ea6f2f5bb4245b53d1e92844
+  data.tar.gz: 3bea6324986e9c18fe6e37f14d7ea45846d6b849
 SHA512:
-  metadata.gz: 652a4759ceb5d12bd694a7fdeadf38d1e9a6d2ad4d3f31504d259b166cc31e98758d592a64a09c2cba1dbb1b028964c5538918530b08742ebbb9c232328aea65
-  data.tar.gz: 902b7ed73f9f26cc8bff117cf8f1504f37e63b421a010c6bc1409d7218adc8948303c6269afd2113d9624ed3e00d68e2a995c409a941ecfd038a9c175d6e2efb
+  metadata.gz: e106b9a96bf7f6c603a6dccc9f5c2b318834a6dadb17285c7274cbd58fa49577abca97641bb89fc8a483c8db1fcc31719779c6157b1df8e6a1a1ae70ad5b7ff2
+  data.tar.gz: 0522f90a6f35d125889e9b7f3174092b5110a31ae931a7dff19735ff99dd04e2488a95a57d36d2c6f0931ba3a128dabc0daf408b878cced269d1e97d0b99b358

data/lib/logstash/codecs/google_appengine.rb

@@ -2,6 +2,7 @@
 require "logstash/codecs/base"
 require "logstash/namespace"
 require "logstash/codecs/json"
+require 'securerandom'
 
 class LogStash::Codecs::GoogleAppengine < LogStash::Codecs::Base
   config_name "google_appengine"
@@ -16,8 +17,9 @@ class LogStash::Codecs::GoogleAppengine < LogStash::Codecs::Base
     begin
       @json.decode(data) do |json|
         if is_parse_failure(json)
-          return yield json
+          return @logger.error("Failed to process data", :data => json)
         end
+
         flatten(json).each { |flattenedJson|
           yield LogStash::Event.new(flattenedJson)
         }
@@ -37,11 +39,17 @@ end
 def flatten(event)
   payload = event['protoPayload']
   lines = payload['line']
+  payload.delete('@type')
   if lines
     payload.delete('line')
-    lines.map { |line| payload.merge(line) }
+    lines.map.with_index { |line, i|
+      merged = payload.merge(line)
+      merged['lineId'] = merged['requestId'] + i.to_s
+      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.4.0'
+  s.version = '1.7.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"
@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-codec-json'
- #s.add_development_dependency 'logstash-codec-json_lines'
 end
 

data/spec/codecs/google_appengine_spec.rb

@@ -30,11 +30,11 @@ context "#decode" do
 
     expect(collector.size).to eq(3)
 
-    expect(collector[0]["@type"]).to eq("type.googleapis.com/google.appengine.logging.v1.RequestLog")
     expect(collector[0]["logMessage"]).to eq("IdentityFilter logUserIdentity: [[meta]] <anonymous:true>\n")
+    expect(collector[0]["lineId"]).to eq(collector[0]["requestId"] + "0")
 
-    expect(collector[1]["@type"]).to eq("type.googleapis.com/google.appengine.logging.v1.RequestLog")
     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")
   end
 
   it "should handle logs even when they have no lines" do
@@ -49,19 +49,17 @@ context "#decode" do
 
     expect(collector.size).to eq(1)
 
-    expect(collector[0]["@type"]).to eq("type.googleapis.com/google.appengine.logging.v1.RequestLog")
     expect(collector[0]["resource"]).to eq("/images/website/welcome/keyFeatures/objectives.jpg")
+    expect(collector[0]["lineId"]).to eq(collector[0]["requestId"])
+    expect(collector[0]["time"]).to eq(collector[0]["endTime"])
   end
 
-  it "falls back to plain text" do
+  it "falls not emit an event when it can't be parsed" do
     decoded = false
     subject.decode("something that isn't json") do |event|
       decoded = true
-      insist { event.is_a? LogStash::Event }
-      insist { event["message"] } == "something that isn't json"
-      insist { event["tags"] }.include?("_jsonparsefailure")
     end
-    insist { decoded } == true
+    insist { decoded } == false
   end
 end
 

metadata

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