semantic_logger_ecs_addon 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8352af461ec411f9248c88450b7a7740f67f6a645fe108f3392809e7ac7ac71
-  data.tar.gz: 021a3c454c560442a1cc0a240b6c5cdb8a9e8f2f8134819094f99405d6dac0eb
+  metadata.gz: 6de6d3610f967c99762b807469d81909758aa27eec64991281ddec0825acc6dd
+  data.tar.gz: fdf7ca5413e9f41a3b521a2321b8fbf258d222343155991532c0a7fff45e4edc
 SHA512:
-  metadata.gz: '09c1d3cddb5070315d393739fd083e0e16788c509c7f5ec29411b581d2cea865e494bec4215208ad2f10e404cd9c45ea419b8d6d07efe150587b179a9ec25762'
-  data.tar.gz: dfe937ccff617890e4fa6a4854cfecc5d5b63a49173051629d49f273baf18830ddf3e577c11e82e26e1b55f638e8da26f19d08b08d485741ec1a8be348070263
+  metadata.gz: 77df9bbedd9cf76463a41c521fc10bbd806064f958a77ed0fa54af5751cc47fcf0c5ba63b84ebd6d3008227b0f6e6f1af057c0626e96be36416a88e9cd718c30
+  data.tar.gz: 06caa6e1d16ab15c73e33d0d510a6d8299bec9d4ee502d261d8b3581a2574b1d2d6a55b66b8296b10db5e4d28c2d34530117137372793040fd38c54df3f96687

data/lib/rails_semantic_logger/sequel/log_subscriber.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "request_store_rails"
+require "semantic_logger"
+
 module RailsSemanticLogger
   module Sequel
     class LogSubscriber < ActiveSupport::LogSubscriber
@@ -9,20 +12,20 @@ module RailsSemanticLogger
 
       def self.runtime= value
         # ::ActiveRecord::RuntimeRegistry.sql_runtime = value
-        RequestStore.store[:sql_runtime] = value
+        RequestLocals.store[:sql_runtime] = value
       end
 
       def self.runtime
         # ::ActiveRecord::RuntimeRegistry.sql_runtime ||= 0
-        RequestStore.fetch(:sql_runtime) { 0 }
+        RequestLocals.fetch(:sql_runtime) { 0 }
       end
 
       def self.count= value
-        RequestStore.store[:sql_count] = value
+        RequestLocals.store[:sql_count] = value
       end
 
       def self.count
-        RequestStore.fetch(:sql_count) { 0 }
+        RequestLocals.fetch(:sql_count) { 0 }
       end
 
       def self.reset_runtime

data/lib/semantic_logger_ecs_addon/formatters/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "semantic_logger/formatters/base"
+require "semantic_logger_ecs_addon/utils/hash"
 
 module SemanticLoggerEcsAddon
   module Formatters
@@ -164,7 +165,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 +177,17 @@ module SemanticLoggerEcsAddon
       def request
         hash[:"http.request.id"] = formatted_payload.dig :request, :request_id
         hash[:"http.request.body.content"] = formatted_payload.dig :request, :body
+        if hash[:"http.request.body.content"].respond_to?(:to_json)
+          hash[:"http.request.body.content"] = hash[:"http.request.body.content"].to_json
+        end
         hash[:"http.request.method"] = formatted_payload.dig :request, :method
       end
 
       def response
         hash[:"http.response.body.content"] = formatted_payload.dig :response, :body
+        if hash[:"http.response.body.content"].respond_to?(:to_json)
+          hash[:"http.response.body.content"] = hash[:"http.response.body.content"].to_json
+        end
         hash[:"http.response.status_code"] = formatted_payload.dig :response, :status
       end
 
@@ -203,7 +210,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,7 @@
 # frozen_string_literal: true
 
-require "json"
+require "oj"
+require "semantic_logger_ecs_addon/formatters/raw"
 
 module SemanticLoggerEcsAddon
   module Formatters
@@ -12,7 +13,16 @@ 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 do |key|
+            key.to_s
+          end,
+          nilnil: true,
+          escape_mode: :json,
+          mode: :object
+        )
       end
     end
   end

data/lib/semantic_logger_ecs_addon/formatters/raw.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "semantic_logger_ecs_addon/formatters/base"
+
 module SemanticLoggerEcsAddon
   module Formatters
     class Raw < Base
@@ -29,6 +31,8 @@ module SemanticLoggerEcsAddon
             root = root[:"error.cause"]
           end
         end
+      rescue SystemStackError => _error
+        root.merge! exception_hash exception
       end
 
       def event
@@ -81,10 +85,20 @@ 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?
+        unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty? && formatted_payload.respond_to?(:has_key?)
+          return
+        end
 
-        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.11"
+    VERSION = "0.1.15"
     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

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require "pathname"
-require "zeitwerk"
-
-loader = Zeitwerk::Loader.for_gem
-loader.ignore "#{__dir__}/rails_semantic_logger"
-loader.ignore "#{__dir__}/sequel"
-loader.ignore "#{__dir__}/semantic_logger_ecs_addon/sequel.rb"
-loader.setup
+require "semantic_logger_ecs_addon/utils/backtrace_cleaner"
+require "semantic_logger_ecs_addon/utils/hash"
+require "semantic_logger_ecs_addon/formatters/base"
+require "semantic_logger_ecs_addon/formatters/json"
+require "semantic_logger_ecs_addon/formatters/raw"
 
 # Main namespace.
 module SemanticLoggerEcsAddon

data/lib/sequel/railties/controller_runtime.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/module/attr_internal"
-unless defined?(RailsSemanticLogger::Sequel::LogSubscriber)
-  require_relative "../../rails_semantic_logger/sequel/log_subscriber"
-end
+require "rails_semantic_logger/sequel/log_subscriber"
 
 module Sequel
   module Railties

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.15
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -11,73 +11,73 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  aW9uMzAwNi9EQz1nbWFpbC9EQz1jb20wHhcNMjEwODIzMTIxMzE2WhcNMjIwODIz
-  MTIxMzE2WjAmMSQwIgYDVQQDDBt0aG9yaW9uMzAwNi9EQz1nbWFpbC9EQz1jb20w
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC82tKwQZ/1Lr/8zSDcxJlI
-  4+bjQ/Q7Em96Bu3bwkwJWFhCTWPAaktyjNlM/8IpSdkiVVsn4RyFYU/jua0U4Yeg
-  kzCXKONxDMZK92z5LoNMCEC6f7d5ZVHMIf/1XoLU181Spd39bkfqqwxWJyGojERv
-  AUHmMm4kOniHMjIn+NMY81NXdf2HM84H1SCV6FKjvfZb7vQOEkkjDN4TI2gOnW63
-  QRPNzlJ9QO3FVf1G/YEVHgWcrsio/ivf/KT0NNUzktN/uk/a+cEjyENWtTNGGLv/
-  o7xSoPP9o/pjnLfKhk44F6R9efoG1CVTa3n71Q+KgrOfLhfYBeIC0HjdcB91RXw1
-  fO9+2/aeecHhlqJZOmAMhOHT+aruuNvyyh74YBr1Gw1It7b1rSvnIoCcPt6k7TVK
-  lYSpQyp66AnSITEDUyBmhKhEp4LQFqalaiTXD7NfxmOjV9obV9qUgbwq5GQZjzsE
-  wIhEbAt2EiPLBQn7rzEjzeezE4hs2w55atwguyfxNrkCAwEAAaN9MHswCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJTGpSljUdzxn3EOCDgPFO2QmTsu
+  aW9uMzAwNi9EQz1nbWFpbC9EQz1jb20wHhcNMjExMjI3MTM0MjUwWhcNMjIxMjI3
+  MTM0MjUwWjAmMSQwIgYDVQQDDBt0aG9yaW9uMzAwNi9EQz1nbWFpbC9EQz1jb20w
+  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDeX3rgR2zbho9dxRC2QDMz
+  l3YDVoyyr6odDSzXge6jzbEPfV3/pWkieL7CogpK1r84SvrKMmFlslwfhSpOLxDe
+  Ct0/GA2IUIgB5q3iyXMU+GMGPTt6Jbe7Nih9Wak0c2qVZEkzQ91Ytz6zxQYH4GHf
+  pl14CZ3HZLb/pOL6YbRCj7y3ii3FBM0PpzkysGn6UkfvJPJF7RyLdUDER+tvM5D1
+  /1a9wiBO/UBDJ8+fHdE+zXIizP7XqIGEyiGB1cjNX0OYir9iJf7jEA0NWnJA6JS9
+  2PHv6ikBoE8/8clQSxnrQlD/mtWWSYtNRJ0TbtjEjv3QwdwTPsic+a8lT94FWHFg
+  tl3bPYKbrFhueAsHCsppHW8FS8hFFCYb64Iy6hTIgZ5pZF850vEBygq6kiYWHyDh
+  5QBrJ6QWiVoAF53rLVrVWUqNM7llx014T20SC5xHtZLnUSW0fFLgTpzrBOIMU/bM
+  iLl1IKFClUE3rBvhdT+0HLSHe4a3RQh1sx8/ifuvEJUCAwEAAaN9MHswCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEu6GRQxnNJ7xDgCKtb58to+lm+6
   MCAGA1UdEQQZMBeBFXRob3Jpb24zMDA2QGdtYWlsLmNvbTAgBgNVHRIEGTAXgRV0
-  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
+  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
   -----END CERTIFICATE-----
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
-  name: semantic_logger
+  name: request_store_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.4'
 description:
 email:
 - thorion3006@gmail.com
@@ -95,7 +95,7 @@ files:
 - lib/semantic_logger_ecs_addon/formatters/json.rb
 - lib/semantic_logger_ecs_addon/formatters/raw.rb
 - lib/semantic_logger_ecs_addon/identity.rb
-- lib/semantic_logger_ecs_addon/sequel.rb
+- lib/semantic_logger_ecs_addon/sequel_rails.rb
 - lib/semantic_logger_ecs_addon/utils/backtrace_cleaner.rb
 - lib/semantic_logger_ecs_addon/utils/hash.rb
 - lib/sequel/database.rb
@@ -108,6 +108,7 @@ metadata:
   changelog_uri: https://github.com/thorion3006/semantic_logger_ecs_addon/blob/master/CHANGES.md
   documentation_uri: https://github.com/thorion3006/semantic_logger_ecs_addon
   source_code_uri: https://github.com/thorion3006/semantic_logger_ecs_addon
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -126,7 +127,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