semantic_logger_ecs_addon 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab99edd113429d3c6cee4a9dbcf983943d49d0549321bb65f88200497d6c2ba
-  data.tar.gz: 48a33c3fcd050b88ce0057f53f7a2e7476f63eeda114ec215c59c070bdd665ff
+  metadata.gz: 6de6d3610f967c99762b807469d81909758aa27eec64991281ddec0825acc6dd
+  data.tar.gz: fdf7ca5413e9f41a3b521a2321b8fbf258d222343155991532c0a7fff45e4edc
 SHA512:
-  metadata.gz: 0a5c0a63ededccc7dffc86b6f1ab108c96813c5ef1b9c49143b0215341b4297789d94103744bc105fcbe961e9fbc589aaf1e219aacb8700cecccafea1360fcc6
-  data.tar.gz: 5e6c4d3144b8f53a3acc88ef384023c4ad871fa8449aea0ee8893cfcb51796371fb42d455567e830fd37bb4da38751d0df4393142fa3ffb36bb039332d38a624
+  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
@@ -176,13 +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
-        hash[:"http.request.body.content"] = hash[:"http.request.body.content"].to_json if hash[:"http.request.body.content"].respond_to?(:to_json)
+        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
-        hash[:"http.response.body.content"] = hash[:"http.response.body.content"].to_json if hash[:"http.response.body.content"].respond_to?(:to_json)
+        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
 

data/lib/semantic_logger_ecs_addon/formatters/json.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "oj"
+require "semantic_logger_ecs_addon/formatters/raw"
 
 module SemanticLoggerEcsAddon
   module Formatters
@@ -14,7 +15,14 @@ module SemanticLoggerEcsAddon
       def call log, logger
         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)
+        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
@@ -92,7 +94,9 @@ module SemanticLoggerEcsAddon
       end
 
       def extras
-        return unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty? && formatted_payload.respond_to?(:has_key?)
+        unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty? && formatted_payload.respond_to?(:has_key?)
+          return
+        end
 
         hash.merge!(safe_jsonify(formatted_payload.except(:request, :response, :user)))
       end

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.14"
+    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.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -34,7 +34,7 @@ cert_chain:
   KosCvruZx0i+xfBhrTh6f5uQ4T57DUvWiUcdHqv98HqAqyyiPuSiI46/yQgU/4D+
   ApIuwzlhHr30wJqOI8K003+GUsnMkf/7aBmCfedz5dC1EF+2J2SCdg==
   -----END CERTIFICATE-----
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -51,19 +51,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.13'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: request_store_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +78,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 description:
 email:
 - thorion3006@gmail.com
@@ -109,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
@@ -122,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: