semantic_logger_ecs_addon 0.1.10 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1677a75a257917ecbb954b3ee5bccecc0c3a7299d81b9bf03948fb015c7eb43a
-  data.tar.gz: 4a11524cc91d6a095943ad2a83cb2635c53df165c9b8cfcfff68343d3a749e20
+  metadata.gz: fab99edd113429d3c6cee4a9dbcf983943d49d0549321bb65f88200497d6c2ba
+  data.tar.gz: 48a33c3fcd050b88ce0057f53f7a2e7476f63eeda114ec215c59c070bdd665ff
 SHA512:
-  metadata.gz: 239a689dbb7161c6d8e85cd9f9bf1f3818a2d54f6f8141d60793fe8305821d6499dfebcee734c07788b09c7d8db4037b244b74a1fd229e06159e2970fb7deceb
-  data.tar.gz: 24d90fe68301ce67a7c8a57c785d5d90eee7527a8f28b919cba6b9f0c8870532ec56d0af5744a2fcb07a3f51433a5f9c30fe8d95d5e6b1f4c2934a8a77a9070e
+  metadata.gz: 0a5c0a63ededccc7dffc86b6f1ab108c96813c5ef1b9c49143b0215341b4297789d94103744bc105fcbe961e9fbc589aaf1e219aacb8700cecccafea1360fcc6
+  data.tar.gz: 5e6c4d3144b8f53a3acc88ef384023c4ad871fa8449aea0ee8893cfcb51796371fb42d455567e830fd37bb4da38751d0df4393142fa3ffb36bb039332d38a624

data/lib/semantic_logger_ecs_addon/formatters/base.rb

@@ -164,7 +164,7 @@ module SemanticLoggerEcsAddon
       end
 
       def format_payload
-        if log.payload.respond_to?(:empty?) && !log.payload.empty?
+        if log.payload.respond_to?(:empty?) && !log.payload.empty? && log.payload.respond_to?(:has_key?)
           self.formatted_payload = Utils::Hash[**log.payload]
 
           rack_extract
@@ -176,11 +176,13 @@ module SemanticLoggerEcsAddon
       def request
         hash[:"http.request.id"] = formatted_payload.dig :request, :request_id
         hash[:"http.request.body.content"] = formatted_payload.dig :request, :body
+        hash[:"http.request.body.content"] = hash[:"http.request.body.content"].to_json if hash[:"http.request.body.content"].respond_to?(:to_json)
         hash[:"http.request.method"] = formatted_payload.dig :request, :method
       end
 
       def response
         hash[:"http.response.body.content"] = formatted_payload.dig :response, :body
+        hash[:"http.response.body.content"] = hash[:"http.response.body.content"].to_json if hash[:"http.response.body.content"].respond_to?(:to_json)
         hash[:"http.response.status_code"] = formatted_payload.dig :response, :status
       end
 
@@ -203,7 +205,7 @@ module SemanticLoggerEcsAddon
       def apm_agent_present_and_running?
         return false unless defined?(::ElasticAPM)
 
-        ElasticAPM.running?
+        ::ElasticAPM.running?
       end
     end
   end

data/lib/semantic_logger_ecs_addon/formatters/json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "json"
+require "oj"
 
 module SemanticLoggerEcsAddon
   module Formatters
@@ -12,7 +12,9 @@ module SemanticLoggerEcsAddon
 
       # Returns log messages in JSON format
       def call log, logger
-        super(log, logger).to_json
+        Oj.dump(super(log, logger), nilnil: true, escape_mode: :json, mode: :rails)
+      rescue SystemStackError => _error
+        Oj.dump(super(log, logger).transform_keys {|key| key.to_s }, nilnil: true, escape_mode: :json, mode: :object)
       end
     end
   end

data/lib/semantic_logger_ecs_addon/formatters/raw.rb

@@ -29,6 +29,8 @@ module SemanticLoggerEcsAddon
             root = root[:"error.cause"]
           end
         end
+      rescue SystemStackError => _error
+        root.merge! exception_hash exception
       end
 
       def event
@@ -81,10 +83,18 @@ module SemanticLoggerEcsAddon
         hash[:"user.domain"] = formatted_payload.dig :user, :type
       end
 
+      def safe_jsonify hash
+        hash.each do |k, v|
+          hash[k] = v.respond_to?(:to_json) ? v.to_json : v.inspect
+        rescue SystemStackError => _error
+          hash[k] = v.inspect
+        end
+      end
+
       def extras
-        return unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty?
+        return unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty? && formatted_payload.respond_to?(:has_key?)
 
-        hash.merge! formatted_payload.except(:request, :response, :user)
+        hash.merge!(safe_jsonify(formatted_payload.except(:request, :response, :user)))
       end
 
       # Returns log messages in Hash format

data/lib/semantic_logger_ecs_addon/identity.rb

@@ -5,7 +5,7 @@ module SemanticLoggerEcsAddon
   module Identity
     NAME = "semantic_logger_ecs_addon"
     LABEL = "Semantic Logger Ecs Addon"
-    VERSION = "0.1.10"
+    VERSION = "0.1.14"
     VERSION_LABEL = "#{LABEL} #{VERSION}"
     SUMMARY = "A semantic logger formatter that formats the logs according to Elastic Common Schema, adds APM trace data if ElasticAPM is enabled and instruments sequel logs for rails if available."
   end

data/lib/semantic_logger_ecs_addon.rb

@@ -4,9 +4,9 @@ require "pathname"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem
-loader.ignore "rails_semantic_logger"
-loader.ignore "sequel"
-loader.ignore "semantic_logger_ecs_addon/sequel.rb"
+loader.ignore "#{__dir__}/rails_semantic_logger"
+loader.ignore "#{__dir__}/sequel"
+loader.ignore "#{__dir__}/semantic_logger_ecs_addon/sequel.rb"
 loader.setup
 
 # Main namespace.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.14
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -11,31 +11,45 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  aG9yaW9uMzAwNkBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGBANEGgdbZAeSN
+  6NzJb0qO8Z/cd0QoPVjV5Bws9KUJHBrk8ldQWbk6vwrLxvYQgo5J8MTm80mqedfI
+  nuFWKBHXEUkzQc3zgRTXDnc6PwviSza/b/uh99Jra67GiTGiTB9XVNg+Wm1QX+SZ
+  I1LKIZNnySWiGKFCr3iPXw6Oj90G+vIjXpQ9lCAV/1FeKsxyuqURUD9ZDlhVyp32
+  agCjJz/VzVFo87BW8MYB1UlMJo5B9HKGG7jipzKlrfm683DYEwx/EnML/w7Lgryx
+  /u37RDsXpnnVpSaDaxL1HHMkuzxiMUGtYQk5KnJ21yRFn0ZAhavACArJj0/6zFdI
+  eomelpV08j/RaaK4j0w7TPHtB9zfLc4LG9AeGN/K97pZ2P5qteoezyhb4sdKulT+
+  KosCvruZx0i+xfBhrTh6f5uQ4T57DUvWiUcdHqv98HqAqyyiPuSiI46/yQgU/4D+
+  ApIuwzlhHr30wJqOI8K003+GUsnMkf/7aBmCfedz5dC1EF+2J2SCdg==
   -----END CERTIFICATE-----
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A semantic logger formatter that formats the logs according to Elastic Common