logstash-filter-google_appengine 0.114.0 → 0.115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27a839dfddd28233d7102ec387dd1b0c636c4eda
-  data.tar.gz: 474b42f1249f6d3cb37d714fbbc999a93828ab05
+  metadata.gz: 215b39c49fa14a4c0a9d64493dfaf9f858d34b47
+  data.tar.gz: 49324f32a208857e16d95ead80ab1fb7d21673ea
 SHA512:
-  metadata.gz: f0d7b9fde3ef1923cd90d31d3a51261a4e088f0d5259d90b2bc2589a005e4f6f1607e1c9cc3a76a7424d8f7ebd0e95d4d314f09b771c6776c3b221c231cbef77
-  data.tar.gz: 27460940786e5df458a9097255c8085b80af66d7ae0bd5b62a4ee86762a2a60779139cfab9166c3d565b7afeb9f4fb7cef20424156f29b9bcc3c020d5c5ccf57
+  metadata.gz: db3ecb57bb93a0f90a651ec72b5dd17ffad71916c56940ba8cc8ccb5da3f2f5760291dcd09e05c57b2ecf5ad0cc83cf6792905e7567da92d6abdbf3ac59bb597
+  data.tar.gz: d88a4044518e010764182af1a280753056e3d5973446f1ad1ce934eab03f040e93e634f2337ff13f6cf7a8577ed6c3265ad35efff8e7615a39a66b41cfe902cd

data/README.md

@@ -71,16 +71,6 @@ gem build logstash-filter-google_appengine.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+bin/plugin install /your/local/plugin/logstash-filter-google_appengine-*.gem
 ```
-- Start Logstash and proceed to test the plugin
-
-## Contributing
-
-All contributions are welcome: ideas, patches, documentation, bug reports, complaints, and even something you drew up on a napkin.
-
-Programming is not a required skill. Whatever you've seen about open source and maintainers or community members  saying "send patches or die" - you will not see that here.
-
-It is more important to the community that you are able to contribute.
-
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
+- Start Logstash and proceed to test the plugin

data/lib/logstash/filters/google_appengine.rb

@@ -20,7 +20,11 @@ class LogStash::Filters::GoogleAppengine < LogStash::Filters::Base
     payload = event['protoPayload']
     payload.delete '@type'
     payload['type'] = event['type']
+    payload['latencyS'] = to_number(payload['latency'])
+    payload['pendingTimeS'] = to_number(payload['pendingTime'])
+
     lines = payload.delete 'line'
+
     if lines
       lines.each_with_index { |line, i|
         yield create_event(collect_line_data(i, line, payload))
@@ -33,6 +37,10 @@ class LogStash::Filters::GoogleAppengine < LogStash::Filters::Base
 
   private
   # noinspection RubyStringKeysInHashInspection
+  def to_number(string)
+    string ? string.delete("s").to_f : 0.0
+  end
+
   def collect_line_data(i, line, payload)
     {
         'id' => get_id(payload['requestId'] + i.to_s),
@@ -61,7 +69,7 @@ class LogStash::Filters::GoogleAppengine < LogStash::Filters::Base
 
   def get_id(source)
     @semaphore.synchronize {
-      @md5.hexdigest(source)
+      @md5.hexdigest(source) #md5 isn't threadsafe :(
     }
   end
 

data/logstash-filter-google_appengine.gemspec

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

@@ -16,6 +16,7 @@ describe LogStash::Filters::GoogleAppengine do
   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
+      LATENCY_OF_REQUEST = 0.115752
       insist { subject.length } == 3
 
       insist { subject[0]["message"] }=="IdentityFilter logUserIdentity: [[meta]] <anonymous:true>\n"
@@ -23,12 +24,15 @@ describe LogStash::Filters::GoogleAppengine do
       insist { subject[0]["time"] } == "2015-09-03T10:59:40.589Z"
       insist { subject[0]["position"] } == 0
       insist { subject[0]["@type"] } == nil
+      insist { subject[0]["latencyS"] } == LATENCY_OF_REQUEST
+      insist { subject[0]["pendingTimeS"] } == 0.0
 
       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]["position"] } == 1
+      insist { subject[0]["pendingTimeS"] } == 0.0
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-google_appengine
 version: !ruby/object:Gem::Version
-  version: 0.114.0
+  version: 0.115.0
 platform: ruby
 authors:
 - Small Improvements
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core