logstash-codec-google_appengine 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b1bc67fc13ef96f2bb83e55e6495188c273113
-  data.tar.gz: 5b70cef5fe5e5e980474a6de5c471a5ca5d45d72
+  metadata.gz: 77d4a1ef7e15934b7ddea3bf376306d074f5def7
+  data.tar.gz: 22f26fa78986bd8115c9b71368f4ee8b543e3df7
 SHA512:
-  metadata.gz: c2bc8f5341b32a0569103fa35f99dc90515d1ac8084042664c1ec7759eef4a6aef3455766f6ed2fa37e607003a770437158c2d75471daa7402625f7c54355aff
-  data.tar.gz: 850eb74ad21fdeb58be75805665d01917f987f24b0e31a7ef28c8f7e89e2447d38ae944484b081ce245f1229fc6e96c0d6d92cc96a1ad43e8899a7f1f85980cf
+  metadata.gz: 51f5f16d825d82820364b0cc07d5059d5cdaaaeb9aed790245b850382f14b1180750da2161c08800f8fdbdec622c8280ef387f8d52e427950372c4a082cac3e1
+  data.tar.gz: 36d1de93d54a0253afabcd02582fc7e1c7dbee77e2ea8d3f5930392df632086a2ff791e65eb8b67f3d95d21c0d722056748ea113ca546389fd0c56f85084f958

data/lib/logstash/codecs/google_appengine.rb

@@ -2,7 +2,7 @@
 require "logstash/codecs/base"
 require "logstash/namespace"
 require "logstash/codecs/json"
-require 'securerandom'
+require 'digest'
 
 class LogStash::Codecs::GoogleAppengine < LogStash::Codecs::Base
   config_name "google_appengine"
@@ -11,6 +11,7 @@ class LogStash::Codecs::GoogleAppengine < LogStash::Codecs::Base
 
   def register
     @json = LogStash::Codecs::JSON.new
+    @md5 = Digest::MD5.new
   end
 
   def decode(data)
@@ -41,17 +42,18 @@ def flatten(event)
   lines = payload['line']
 
   payload.delete '@type'
-  payload['id'] = payload['requestId']
+
 
   if lines
     payload.delete 'line'
     lines.map.with_index { |line, i|
       merged = payload.merge line
-      merged['id'] = merged['id'] + i.to_s
+      merged['id'] = @md5.hexdigest merged['requestId'] + i.to_s
       merged['message'] = merged.delete 'logMessage'
       merged
     }
   else
+    payload['id'] = @md5.hexdigest payload['requestId']
     payload['time'] = payload['endTime']
     [payload]
   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.10.0'
+  s.version = '1.11.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

@@ -3,6 +3,7 @@ require "logstash/codecs/google_appengine"
 require "logstash/event"
 require "logstash/json"
 require "insist"
+require 'digest'
 
 describe LogStash::Codecs::GoogleAppengine do
   subject do
@@ -12,6 +13,7 @@ describe LogStash::Codecs::GoogleAppengine do
 
 
 context "#decode" do
+  md5 = Digest::MD5.new
 
   it "should return an event from json data" do
     data = File.open("spec/codecs/appengine.logs.jsonl", "rb").read
@@ -31,11 +33,11 @@ context "#decode" do
     expect(collector.size).to eq(3)
 
     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]["id"]).to eq(md5.hexdigest collector[0]["requestId"] + "0")
     expect(collector[0]["@type"]).to be_nil
 
     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]["id"]).to eq(md5.hexdigest collector[1]["requestId"] + "1")
     expect(collector[1]["@type"]).to be_nil
   end
 
@@ -52,7 +54,7 @@ context "#decode" do
     expect(collector.size).to eq(1)
 
     expect(collector[0]["resource"]).to eq("/images/website/welcome/keyFeatures/objectives.jpg")
-    expect(collector[0]["id"]).to eq(collector[0]["requestId"])
+    expect(collector[0]["id"]).to eq(md5.hexdigest  collector[0]["requestId"])
     expect(collector[0]["time"]).to eq(collector[0]["endTime"])
     expect(collector[0]["@type"]).to be_nil
   end

metadata

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