logstash-filter-fix_protocol 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01e4c787451d2df8a4d094719f6773f41dc32b48
-  data.tar.gz: 59d92aec02f3566804710507b42e046814817100
+  metadata.gz: 454431f7e36a07d087e15a1b6c2f18ea274557de
+  data.tar.gz: 997359c4fab37712934c8252bf209039ee782b56
 SHA512:
-  metadata.gz: 1c20c43d362899f2423da2799621d48c5af3f9c2775313a33ddac837ca68d93098b34ed098aa2a214235f0d931a0aa615699a5c22651fd455ff2ef16cb0681fb
-  data.tar.gz: 27940ad87626f23d13428a78fc243ede4f453551d35404f5af3592a8ec75b508aaaf494769b0a108424864ce0c1db1d7bbf8be701661e60654ff287c39d98c09
+  metadata.gz: 841e0c9cbbfc740092d1f52a7d9aab62c54a94370d447d9109a73e179eb8a57fdd4e04d396caec903bf2f8a2f4d52155a24785fca77417501b6ea2bc98ffed17
+  data.tar.gz: 2b45940ea8d8100286a47f35317daca43a0d244a10e179835c2b3ecac71eb3855ee9bf2a1bc90f9d6820ff62ba185cb7120ce3f8b7d8c805ff6032da94f04c1d

data/README.md

@@ -23,11 +23,11 @@ $ /opt/logstash/bin/plugin install logstash-filter-fix_protocol
 
 | Setting                 | Input type      | Required | Default Value      |
 | ----------------------- | ----------------| ---------| ------------------ |
-| message                 | string/variable | Yes      | "Fix String"       |
+| fix_message             | string/variable | Yes      | "message"          |
 | data_dictionary_path    | string          | Yes      | "/PATH/TO/YOUR/DD" |
 | session_dictionary_path | string          | No       | nil                |
 
-**message**
+**fix_message**
 + value type is a string
 + required
 
@@ -58,10 +58,10 @@ input {
 }
 filter {
   grok {
-    match => ["message","%{TIMESTAMP_ISO8601:timestamp} %{GREEDYDATA:fix_string}: %{GREEDYDATA:fix_message}"]
+    match => ["message","%{TIMESTAMP_ISO8601:timestamp} %{GREEDYDATA:fix_session}: %{GREEDYDATA:fix_string}"]
   }
   fix_protocol {
-    message => fix_message
+    fix_message => fix_string
     session_dictionary_path => "/PATH/TO/FIX/5.0/SESSION/DICTIONARY/FIX.xml"
     data_dictionary_path => "/PATH/TO/FIX/5.0/DATA/DICTIONARY/FIX.xml"
   }

data/lib/logstash/filters/fix_protocol.rb

@@ -12,7 +12,7 @@ module LogStash
 
       config_name "fix_protocol"
 
-      config :message, validate: :string, default: "Hello"
+      config :fix_message, validate: :string, default: "message"
 
       config :data_dictionary_path, validate: :string, default: "/PATH/TO/YOUR/DD"
       config :session_dictionary_path, validate: :string, default: nil
@@ -34,22 +34,32 @@ module LogStash
       end
 
       def filter(event)
-        if event["fix_message"]
-          fix_message = FixMessage.new(event["fix_message"], data_dictionary, session_dictionary)
-
-          fix_hash = fix_message.to_hash
-
-          fix_hash.each do |key, value|
-            begin
-              event[key] = value
-            rescue NoMethodError => e
-              puts "********"
-              puts "WARNING: Could not correctly parse #{event["fix_message"]}"
-              puts JSON.pretty_generate(fix_hash)
-              puts "Message: #{e.message}"
-              puts "********"
-            ensure
-              next
+        message_string = event[config["fix_message"]]
+
+        if message_string
+          fix_message = nil
+
+          begin
+            fix_message = FixMessage.new(message_string, data_dictionary, session_dictionary)
+          rescue Java::Quickfix::InvalidMessage
+            event["tags"] = ["_fix_parse_failure"]
+          end
+
+          if fix_message
+            fix_hash = fix_message.to_hash
+
+            fix_hash.each do |key, value|
+              begin
+                event[key] = value
+              rescue NoMethodError => e
+                puts "********"
+                puts "WARNING: Could not correctly parse #{event["fix_message"]}"
+                puts JSON.pretty_generate(fix_hash)
+                puts "Message: #{e.message}"
+                puts "********"
+              ensure
+                next
+              end
             end
           end
         end

data/{logstash-filter-fix_message_filter.gemspec → logstash-filter-fix_protocol.gemspec}

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = "logstash-filter-fix_protocol"
-  s.version       = "0.1.1"
+  s.version       = "0.1.2"
   s.authors       = ["Connamara Systems"]
   s.email         = ["info@connamara.com"]
 

data/spec/filters/fix_protocol_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe LF::FixProtocol do
   let(:fix_5_config) do
     {
-      "message" => "fix_message",
+      "fix_message" => "message",
       "session_dictionary_path" => load_fixture("FIXT11.xml"),
       "data_dictionary_path" => load_fixture("FIX50SP1.xml")
     }
@@ -11,7 +11,7 @@ describe LF::FixProtocol do
 
   let(:fix_4_config) do
     {
-      "message" => "fix_message",
+      "fix_message" => "message",
       "data_dictionary_path" => load_fixture("FIX42.xml")
     }
   end
@@ -36,12 +36,23 @@ describe LF::FixProtocol do
     end
   end
 
+  context 'invalid message' do
+    config fix_4_configuration
+
+    invalid_msg = "8=invalid_stuff"
+
+    sample(invalid_msg) do
+      insist { subject["tags"] } == ["_fix_parse_failure"]
+      insist { subject["message"] } == invalid_msg
+    end
+  end
+
   context 'an incoming execution report' do
     config fix_4_configuration
 
     execution = "8=FIXT.1.1\x0135=8\x0149=ITG\x0156=SILO\x01315=8\x016=100.25\x01410=50.25\x01424=23.45\x01411=Y\x0143=N\x0140=1\x015=N\x01"
 
-    sample("fix_message" => execution) do
+    sample(execution) do
       filtered_event = subject
       insist { filtered_event["BeginString"] } == "FIXT.1.1"
       insist { filtered_event["MsgType"] } == "ExecutionReport"
@@ -57,7 +68,7 @@ describe LF::FixProtocol do
 
     execution = "8=FIX.4.2\x019=240\x0135=8\x0134=6\x0149=DUMMY_INC\x0152=20150826-23:10:17.744\x0156=ANOTHER_INC\x0157=Firm_B\x011=Inst_B\x016=0\x0111=151012569\x0117=ITRZ1201508261_24\x0120=0\x0122=8\x0131=1010\x0132=5\x0137=ITRZ1201508261_12\x0138=5\x0139=2\x0140=2\x0141=best_buy\x0144=1011\x0154=1\x0155=ITRZ1\x0160=20150826-23:10:15.547\x01150=2\x01151=0\x0110=227\x01"
 
-    sample("fix_message" => execution) do
+    sample(execution) do
       expect { subject }.to output.to_stdout
       filtered_event = subject
       insist { filtered_event["BeginString"] } == "FIX.4.2"

data/spec/support/fix_configuration.rb

@@ -7,7 +7,7 @@ module FixConfiguration
     <<-CONFIG
       filter {
         fix_protocol {
-          message => fix_message
+          fix_message => message
           session_dictionary_path => "#{ load_fixture("FIXT11.xml") }"
           data_dictionary_path => "#{ load_fixture("FIX50SP1.xml") }"
         }
@@ -19,7 +19,7 @@ module FixConfiguration
     <<-CONFIG
       filter {
         fix_protocol {
-          message => fix_message
+          fix_message => message
           data_dictionary_path => "#{ load_fixture("FIX42.xml") }"
         }
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-fix_protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Connamara Systems
@@ -158,7 +158,7 @@ files:
 - lib/logstash/filters/data_dictionary.rb
 - lib/logstash/filters/fix_message.rb
 - lib/logstash/filters/fix_protocol.rb
-- logstash-filter-fix_message_filter.gemspec
+- logstash-filter-fix_protocol.gemspec
 - spec/filters/fix_message_spec.rb
 - spec/filters/fix_protocol_spec.rb
 - spec/fixtures/FIX42.xml