semlogr-rack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8852ad6ae671ebb357fe72a56bb4503a8a81036
-  data.tar.gz: cff7e94ca94b4ad998f358f7798059af089adc35
+  metadata.gz: 58aca5397f40069689c71225fb0b7902de8912b7
+  data.tar.gz: 77c856b53fd9943fea5557d307f15e3cca1fc79a
 SHA512:
-  metadata.gz: e6e584576b47e0092a05db965775d377f2d1df2c7bed1129c0c75a7c56d5f3586a70e280515c0b3a878cb983db32e7db0bbbc7e14445ae8736d7e2d35c668bc7
-  data.tar.gz: 17a6e1be8abe34e7f69d205c0420f432ddcaac789b3243122759162089c64c23147538d790f9e9724929eae5424cd58a60fc0e87beb9deacbe4db5828bc837e4
+  metadata.gz: 5ceef19026b527ab771bd4ce8c394cbb6e8cc7b2e6f8d7496ad9f0cfcda0d69c8d9c0fb7932cb46e04cd264addd3a4091bef173c63694b96ea7ea798fb065ba0
+  data.tar.gz: 30a3e4529dc6e76ec8cba1e0580cea031dceb362b9386a2841c16f04809ef8009a1e6466e59c522cd45c0474783d62bea73ddaa6f9744e52216625c40a8f0cc7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.1.1
+
+- Add support for filtering requests by path for the request logger
+- Add log correlator middleware which provides the ability to propogate a correlation id from a request header to the Semlogr ambient log context
+
 ### 0.1.0
 
 - Initial release

data/lib/semlogr/rack/request_correlator.rb

@@ -0,0 +1,33 @@
+require 'semlogr'
+require 'securerandom'
+
+module Semlogr
+  module Rack
+    class RequestCorrelator
+      def initialize(app, opts = {})
+        @app = app
+        @id_header = opts[:id_header] || 'X-Correlation-Id'
+        @id_generator = opts[:id_generator] || -> { SecureRandom.uuid }
+      end
+
+      def call(env)
+        id_header = env_header_name(@id_header)
+        correlation_id = env[id_header] || @id_generator.call
+        status, headers, body =
+          Semlogr::Context::LogContext.push_property(correlation_id: correlation_id) do
+            @app.call(env)
+          end
+
+        headers[@id_header] = correlation_id
+
+        [status, headers, body]
+      end
+
+      private
+
+      def env_header_name(header)
+        'HTTP_' + header.tr('-', '_').upcase
+      end
+    end
+  end
+end

data/lib/semlogr/rack/request_logger.rb

@@ -1,12 +1,16 @@
 module Semlogr
   module Rack
     class RequestLogger
-      def initialize(app, logger = nil)
+      def initialize(app, logger: nil, path_filters: [])
         @app = app
         @logger = logger
+        @path_filters = path_filters
       end
 
       def call(env)
+        path = env['REQUEST_URI']
+        return @app.call(env) if filtered?(path)
+
         start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         status, headers, body = @app.call(env)
         finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -14,7 +18,7 @@ module Semlogr
         logger.info(
           'HTTP {method} {path} - {status} ({duration}s)',
           method: env['REQUEST_METHOD'],
-          path: env['REQUEST_URI'],
+          path: path,
           status: status,
           duration: (finish - start).round(4)
         )
@@ -27,6 +31,10 @@ module Semlogr
       def logger
         @logger || Semlogr.logger
       end
+
+      def filtered?(path)
+        @path_filters.any? { |filter| filter =~ path }
+      end
     end
   end
 end

data/lib/semlogr/rack/version.rb

@@ -1,5 +1,5 @@
 module Semlogr
   module Rack
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/lib/semlogr/rack.rb

@@ -1,4 +1,5 @@
 require 'semlogr/rack/request_logger'
+require 'semlogr/rack/request_correlator'
 
 module Semlogr
   module Rack

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semlogr-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Stefan Sedich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semlogr
@@ -112,6 +112,7 @@ files:
 - bin/console
 - bin/setup
 - lib/semlogr/rack.rb
+- lib/semlogr/rack/request_correlator.rb
 - lib/semlogr/rack/request_logger.rb
 - lib/semlogr/rack/version.rb
 - semlogr-rack.gemspec