heavylog 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d938340a9fc57747dc46c35aadb0a9b92c08da6466f3d333479e7b0c4de63d4
-  data.tar.gz: f31b3c1ec5566d8de8c6199b21dfae45b00b22c5710dd1eecb07e676a55b3a2e
+  metadata.gz: 1e5698a7bfa3d9476d9b35f0a0da99a7faeeb230df8889599cf343b017745488
+  data.tar.gz: 74d24b9be2f75463929bc5de1cb076fca87cb7b707a7123474a95682b3899e4a
 SHA512:
-  metadata.gz: 44fa9815cb453c895d70db9912558f9b16cf775caaa83d1d723fde9252ced6a6c4a07072d0b0db8b352236a11701330af9ec0adf7de8bc94c41a89e96c6e5dfa
-  data.tar.gz: 993f3cb991245997f89827c4bd6581060b35eadd64d4c229419c5dbe6cbc1f8467319e66514c91af9d445bd683231144d8393419729b4ab513f7a7996ffe1854
+  metadata.gz: 1dde2fc6a5912a2345729bd7150d1a6c39b55ab4f90800ee2cbe61acb3f351c978ecadea820981ba1cc94180140d8ddbab0f0f6890901c6251a906b2be9343a7
+  data.tar.gz: b7a5930b2cba4fa6501798ac200978a5c172cda4af2b0d1dd55dc23bf0373edde9c722b1b3cbf658f68163d03adee190814f3d342bf621bf5d11c7eeab03dbaa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heavylog (0.0.20)
+    heavylog (0.0.21)
       actionpack (>= 5)
       activesupport (>= 5)
       railties (>= 5)

data/lib/heavylog/formatters/ecs.rb

@@ -11,7 +11,8 @@ module Heavylog
         "messages"           => "message",
         "request_id"         => "http.request.id",
         "method"             => "http.request.method",
-        "format"             => "http.request.mime_type",
+        "referrer"           => "http.request.referrer",
+        "format"             => "http.response.format",
         "status"             => "http.response.status_code",
         "location"           => "http.response.location",
         "ip"                 => "source.address",
@@ -27,22 +28,38 @@ module Heavylog
 
       def call(data)
         ECS_MAP.each do |original, correct|
-          data[correct] = data.delete(original) if data[original]
+          dig_set(data, correct.split("."), data.delete(original)) if data[original]
         end
 
-        data["event.module"] = "heavylog"
-        data["event.category"] = "web"
-        data["event.dataset"] ||= data["heavylog.controller"] == "SidekiqLogger" ? "heavylog.sidekiq" : "heavylog.rails"
+        dig_set(data, %w[event module], "heavylog")
+        dig_set(data, %w[event category], "web")
 
-        if data["http.response.status_code"]
-          data["event.outcome"] = (200..399).cover?(data["http.response.status_code"]) ? "success" : "failure"
+        unless data.dig("event", "dataset")
+          value = data.dig("heavylog", "controller") == "SidekiqLogger" ? "heavylog.sidekiq" : "heavylog.rails"
+          dig_set(data, %w[event dataset], value)
         end
 
-        data["source.ip"] ||= data["source.address"]
-        data["url.path"] ||= data["url.original"]
+        if (code = data.dig("http", "response", "status_code"))
+          dig_set(data, %w[event outcome], (200..399).cover?(code) ? "success" : "failure")
+        end
+
+        dig_set(data, %w[source ip], data.dig("source", "address")) unless data.dig("source", "ip")
+        dig_set(data, %w[url path], data.dig("url", "original")) unless data.dig("url", "path")
 
         ::JSON.dump(data)
       end
+
+      private
+
+      def dig_set(obj, keys, value)
+        key = keys.first
+        if keys.length == 1
+          obj[key] = value
+        else
+          obj[key] = {} unless obj[key]
+          dig_set(obj[key], keys.slice(1..-1), value)
+        end
+      end
     end
   end
 end

data/lib/heavylog/log_subscriber.rb

@@ -31,6 +31,7 @@ module Heavylog
       data.merge!(extract_runtimes(event, payload))
       data.merge!(extract_location)
       data.merge!(extract_unpermitted_params)
+      data.merge!(extract_referrer(payload))
       data.merge!(custom_options(event))
     end
 
@@ -101,5 +102,13 @@ module Heavylog
       RequestStore.store[:heavylog_unpermitted_params] = nil
       { unpermitted_params: unpermitted_params }
     end
+
+    def extract_referrer(payload)
+      if payload[:request].is_a?(ActionDispatch::Request) && payload[:request].referrer
+        return { referrer: payload[:request].referrer }
+      end
+
+      {}
+    end
   end
 end

data/lib/heavylog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Heavylog
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heavylog
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Kristjan Rang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler