md-logstasher 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f47cc71b8a9c6f01e3f12661c11922040c2c0acf6be1882eee182fffca6aba
-  data.tar.gz: dd9494bd0f46ef6b01a9c5df6166794db82a0fdc563e06df0555efb2acba7472
+  metadata.gz: 5f6a2e729c225c8fb2cf06174d9fc5282ae0b2ee660fd89d675a30e7fcd19eb3
+  data.tar.gz: 9a8dea2258d1ed2c0fb1c01227bf7ea6b78421ca342ba122a32cc8f1351b7440
 SHA512:
-  metadata.gz: e486d0d8eef5bd325d700fcf1685bf1d26f8a1764dc32c8e054f35cca64d5a9a2a8aed18bc75441ceeb536902cae59ffd7ea76013aea959dd89e0453d8907f66
-  data.tar.gz: 1d836f746425a75131f82db774c25a6ec5a9fb0ad34680884b88bb4946c4b7413be9a76b231cbc2810f1477e484e655ad596af871dcb9fb2689d66ce20a75e59
+  metadata.gz: d23d146376ea21233a2b1189366586cbecc46f4a5694ffb1b7cae480881098828f7e9e79f171cf7f1c52372b793f53aff40d86dd444a4aee4e8a12e9334e2e7a
+  data.tar.gz: f6a8c91e937935dac803868c098e8b6826cb0b27f72fe5718bf8fcebad2685acdeb899e8055d6ee6cc2a4420bcf3465a7e3557e99875b8b2fbf8fbccd5c90618

data/lib/logstasher/log_subscriber.rb

@@ -21,7 +21,6 @@ module LogStasher
       payload = event.payload
       tags    = extract_tags(payload)
       fields  = extract_request(payload)
-
       fields.merge! extract_status(payload)
       fields.merge! runtimes(event)
       fields.merge! location
@@ -52,7 +51,7 @@ module LogStasher
     end
 
     def extract_request(payload)
-      {
+      result = {
         :action     => payload[:action],
         :controller => payload[:controller],
         :format     => extract_format(payload),
@@ -62,6 +61,9 @@ module LogStasher
         :path       => extract_path(payload),
         :route      => "#{payload[:controller]}##{payload[:action]}"
       }
+      metadata = ::LogStasher.metadata
+      result.merge!(:metadata => metadata) unless metadata&.empty?
+      result
     end
 
     # Monkey patching to enable exception logging
@@ -87,7 +89,6 @@ module LogStasher
     def extract_parameters(payload)
       if LogStasher.include_parameters?
         external_params = payload[:params].except(*INTERNAL_PARAMS)
-
         if LogStasher.serialize_parameters?
           { :params => JSON.generate(external_params) }
         else

data/lib/logstasher/railtie.rb

@@ -8,6 +8,7 @@ module LogStasher
     config.logstasher.logger = nil
     config.logstasher.log_level = ::Logger::INFO
 
+    config.logstasher.metadata  = {}
     config.before_initialize do
       options = config.logstasher
 
@@ -17,6 +18,7 @@ module LogStasher
       ::LogStasher.silence_standard_logging = options.silence_standard_logging
       ::LogStasher.logger                   = options.logger || default_logger
       ::LogStasher.logger.level             = options.log_level
+      ::LogStasher.metadata                 = options.metadata
     end
 
     initializer 'logstasher.load' do

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/logstasher.rb

@@ -8,6 +8,7 @@ module LogStasher
     attr_writer :include_parameters
     attr_writer :serialize_parameters
     attr_writer :silence_standard_logging
+    attr_accessor :metadata
 
     def append_fields(&block)
       @append_fields_callback = block

data/spec/lib/logstasher/log_subscriber_spec.rb

@@ -10,6 +10,12 @@ class MockController
 end
 
 class MockRequest
+  attr_accessor :env
+
+  def initialize
+    @env = { 'action_dispatch.request_id' => 1 }
+  end
+
   def remote_ip
     '127.0.0.1'
   end
@@ -19,6 +25,7 @@ describe LogStasher::LogSubscriber do
   subject { described_class.new }
 
   let(:logger) { ::Logger.new('/dev/null') }
+
   let(:mock_controller) { MockController.new }
   let(:mock_request) { MockRequest.new }
   let(:context) {{ :controller => mock_controller, :request => mock_request }}
@@ -46,10 +53,12 @@ describe LogStasher::LogSubscriber do
       :path       => '/users/1',
       :status     => 200
     }}
+    let(:data) { { "namespace" => "test", "appversion" => "v1" } }
 
     let(:event) { double(:payload => payload, :duration => duration) }
 
     it 'logs the event in logstash format' do
+      ::LogStasher.metadata = data
       expect(logger).to receive(:<<) do |json|
         expect(JSON.parse(json)).to eq({
           '@timestamp' => timestamp,
@@ -64,7 +73,9 @@ describe LogStasher::LogSubscriber do
           'path'       => payload[:path],
           'route'      => "#{payload[:controller]}##{payload[:action]}",
           'status'     => payload[:status],
-          'runtime'    => { 'total' => duration }
+          'runtime'    => { 'total' => duration },
+          'request_id' => 1,
+          'metadata'   => data
         })
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Devin Christensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event