fluent-plugin-aws-sqs 1.0.24 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 591cf5490fff99a3a2e9a9ef03160fcd59031d9a503c6a4c99c39493368762c3
-  data.tar.gz: 10a8d4b28c92b6b56ab4e5cbceee85caf33b22fc362654b9bf3275420c3c2fe4
+  metadata.gz: 2e9dc458959b7a2a2c015187d920c3452b63c4cd828e0365b0594025420ebebe
+  data.tar.gz: 5741b1585fe3ebe0d47e9dc5c9930aa0a53b46119b9f71875a5267e37fa00c45
 SHA512:
-  metadata.gz: 24233ffb06c65fce9b5fd76a44ed1c87ce2b9034abfb64a63d3a3d93ef669752e1771343e61f971b9f70cd458625f6bfaf730ab4bc4c5dc4f5066cd07d9bda12
-  data.tar.gz: ceed064bf5d745f382d55c687a13dd171bf80ceabb2e18f0544f08ab9a2a39a33000a57321d37a97db5cb133fd5ad3a01f85b6a73dfdaa23aa5fbbc33ff462dd
+  metadata.gz: 405b2d086e908f03d644985fc037ce71256bd2c1b05d98788c5e9f5c6ee9037e5d4e0a0e2352a792f2a80b60da633fc93c407160606e80eca4d6a030c5f0e8cf
+  data.tar.gz: da44111a8fee4463b957e64874daf12c28edf4d004589679e892cba90f9b54568ab458dd27767ebee25f75186c450ab1c7cc4ecbf94784a0415316101a92487c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-aws-sqs (1.0.7)
+    fluent-plugin-aws-sqs (1.0.24)
       aws-sdk-sqs (>= 1.22.0)
       fluentd (>= 0.14.0)
 

data/README.md

@@ -24,9 +24,14 @@ This plugin can read data from an AWS SQS.
 
   # following attributes are optional
   
-  attribute_name_to_extract {message custom attribute name, will be extract the string value}
-　
-  region {your_region}
+  parse_body_as_json {try to parse message.body field as json, if it fails the original field is used} default: false
+  attribute_name_to_extract {message custom attribute name, will be extract the string value} default: nil
+  add_receipt_handle {adds amazon receipt_handle field to the record} default: false
+  add_message_id {adds amazon unique message id} default: false
+  add_md5_of_body {adds the md5 of the message body} default: false
+  add_queue_url {adds the url of the queue the message came from} default: false
+
+  region {your_region} default: nil
 
   ### region list ###
   # Asia Pacific (Tokyo) [Default] : ap-northeast-1
@@ -37,13 +42,13 @@ This plugin can read data from an AWS SQS.
   # EU-West (Ireland)              : eu-west-1
   # South America (São Paulo)      : sa-east-1
 
-  receive_interval {receive_interval_seconds}
+  receive_interval {receive interval in seconds} default: 0.1
 
-  max_number_of_messages {max_number_of_messages}
+  max_number_of_messages {the max number of messages per pull} default: 10
 
-  wait_time_seconds {receive_message_wait_time_seconds}
+  wait_time_seconds {the receive message wait time in seconds} default: 10
 
-  delete_message {delete_message_after_receiving}
+  delete_message {delete the message from the queue after the plugin processing and before the 'router.emit' call} default: false
 
 </source>
 ```

data/lib/fluent/plugin/in_sqs.rb

@@ -19,6 +19,11 @@ module Fluent::Plugin
     config_param :delete_message, :bool, default: false
     config_param :stub_responses, :bool, default: false
     config_param :attribute_name_to_extract, :string, default: nil
+    config_param :add_receipt_handle, :bool, default: false
+    config_param :add_message_id, :bool, default: false
+    config_param :add_md5_of_body, :bool, default: false
+    config_param :add_queue_url, :bool, default: false
+    config_param :parse_body_as_json, :bool, default: false
 
     def configure(conf)
       super
@@ -75,14 +80,42 @@ module Fluent::Plugin
       log.warn_backtrace ex.backtrace
     end
 
+    def prase_json_string(jsonStr)
+      response = jsonStr
+
+      begin
+        response = JSON.parse(jsonStr)
+      rescue => ex
+        # unable to pase json str (str is not a valid json)
+      end
+
+      response
+    end
+
     def parse_message(message)
-      record = {
-        'body' => message.body.to_s,
-        'receipt_handle' => message.receipt_handle.to_s,
-        'message_id' => message.message_id.to_s,
-        'md5_of_body' => message.md5_of_body.to_s,
-        'queue_url' => message.queue_url.to_s
-      }
+      record = {}
+
+      if @parse_body_as_json == true
+        record['body'] = prase_json_string(message.body.to_s)
+      else
+        record['body'] = message.body.to_s
+      end
+
+      if @add_receipt_handle == true
+        record['receipt_handle'] = message.receipt_handle.to_s
+      end
+
+      if @add_message_id == true
+        record['message_id'] = message.message_id.to_s
+      end
+
+      if @add_md5_of_body == true
+        record['md5_of_body'] = message.md5_of_body.to_s
+      end
+
+      if @add_queue_url == true
+        record['queue_url'] = message.queue_url.to_s
+      end
 
       if @attribute_name_to_extract.to_s.strip.length > 0
         record[@attribute_name_to_extract] = message.message_attributes[@attribute_name_to_extract].string_value.to_s

data/lib/fluent/plugin/version.rb

@@ -1,3 +1,3 @@
 module SQS
-    VERSION = "1.0.24"
+    VERSION = "1.0.25"
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-aws-sqs
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
 platform: ruby
 authors:
 - Shai Moria
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd