semantic_logger_ecs_addon 0.1.8 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d97e95704e7b702f7b074ca810b708b2ed4525f724d513aa8c1a85b96b0946b4
-  data.tar.gz: d3d1a40446ac60bfa744475a08bb7a1e788d886bb540a09cf015a61ebb8ee3c4
+  metadata.gz: 1e0a6e782e73897614ae1bd76e9b7c59f94d28a3a60e2cfbf22ed2209e505ac7
+  data.tar.gz: 47eed3029664c86ebd8bac1dd16146b9685787c064e6048af62f28e4cfc43df5
 SHA512:
-  metadata.gz: 6b71ec9ad44a55906324767394a92c622b69f877c80d4d8b2b7460cd10247ae6ec29f6eb438a803598160e37fc1f3a86d80e47d7d186998fcce0b17f4920db52
-  data.tar.gz: 7b1c09644d4618f74a4e487468dc8059986221bc013f1024ef6b9fd33bb436237486612483b6247823b89bd3644959ecf898431af41fce0b029c2981319d94b7
+  metadata.gz: 767d6b40db82d541e7292ac2467f4d355e6dacdac7102bb1b7fe0576337d41129e2f70766ab0bb7d5729702a7ae8479708947489e4c1d892af03ca67de892835
+  data.tar.gz: 4777970e9fd90fb3e0706305548364e3a3d4ac1974536eb45df1627c73f12598d28fd2ce944f2bfdf26ae8149a47f5ddf92ab27ac6c88382ac99566d71837974

data/lib/rails_semantic_logger/sequel/log_subscriber.rb

@@ -1,91 +1,89 @@
 # frozen_string_literal: true
 
-if defined?(Sequel) && defined? ActiveSupport::LogSubscriber
-  module RailsSemanticLogger
-    module Sequel
-      class LogSubscriber < ActiveSupport::LogSubscriber
-        class << self
-          attr_reader :logger
-        end
-
-        def self.runtime= value
-          # ::ActiveRecord::RuntimeRegistry.sql_runtime = value
-          RequestStore.store[:sql_runtime] = value
-        end
+module RailsSemanticLogger
+  module Sequel
+    class LogSubscriber < ActiveSupport::LogSubscriber
+      class << self
+        attr_reader :logger
+      end
 
-        def self.runtime
-          # ::ActiveRecord::RuntimeRegistry.sql_runtime ||= 0
-          RequestStore.fetch(:sql_runtime) { 0 }
-        end
+      def self.runtime= value
+        # ::ActiveRecord::RuntimeRegistry.sql_runtime = value
+        RequestStore.store[:sql_runtime] = value
+      end
 
-        def self.count= value
-          RequestStore.store[:sql_count] = value
-        end
+      def self.runtime
+        # ::ActiveRecord::RuntimeRegistry.sql_runtime ||= 0
+        RequestStore.fetch(:sql_runtime) { 0 }
+      end
 
-        def self.count
-          RequestStore.fetch(:sql_count) { 0 }
-        end
+      def self.count= value
+        RequestStore.store[:sql_count] = value
+      end
 
-        def self.reset_runtime
-          previous = runtime
-          self.runtime = 0
-          previous
-        end
+      def self.count
+        RequestStore.fetch(:sql_count) { 0 }
+      end
 
-        def self.reset_count
-          previous = count
-          self.count = 0
-          previous
-        end
+      def self.reset_runtime
+        previous = runtime
+        self.runtime = 0
+        previous
+      end
 
-        def sql event
-          self.class.runtime += event.duration
-          self.class.count += 1
-          return unless logger.debug?
+      def self.reset_count
+        previous = count
+        self.count = 0
+        previous
+      end
 
-          payload = event.payload
-          name = payload[:name]
+      def sql event
+        self.class.runtime += event.duration
+        self.class.count += 1
+        return unless logger.debug?
 
-          log_payload = {sql: payload[:sql].squeeze(" ")}
-          log_payload[:binds] = bind_values payload unless (payload[:binds] || []).empty?
-          log_payload[:allocations] = event.allocations if event.respond_to? :allocations
-          log_payload[:cached] = event.payload[:cached]
+        payload = event.payload
+        name = payload[:name]
 
-          log = {message: name, payload: log_payload, duration: event.duration}
+        log_payload = {sql: payload[:sql].squeeze(" ")}
+        log_payload[:binds] = bind_values payload unless (payload[:binds] || []).empty?
+        log_payload[:allocations] = event.allocations if event.respond_to? :allocations
+        log_payload[:cached] = event.payload[:cached]
 
-          # Log the location of the query itself.
-          if logger.send(:level_index) >= SemanticLogger.backtrace_level_index
-            log[:backtrace] = SemanticLogger::Utils.strip_backtrace caller
-          end
+        log = {message: name, payload: log_payload, duration: event.duration}
 
-          logger.debug log
+        # Log the location of the query itself.
+        if logger.send(:level_index) >= SemanticLogger.backtrace_level_index
+          log[:backtrace] = SemanticLogger::Utils.strip_backtrace caller
         end
 
-        private
+        logger.debug log
+      end
 
-        @logger = SemanticLogger["Sequel"]
+      private
 
-        # When multiple values are received for a single bound field, it is converted into an array
-        def add_bind_value binds, key, value
-          key = key.downcase.to_sym unless key.nil?
-          value = (Array(binds[key]) << value) if binds.key? key
-          binds[key] = value
-        end
+      @logger = SemanticLogger["Sequel"]
 
-        def logger
-          self.class.logger
-        end
+      # When multiple values are received for a single bound field, it is converted into an array
+      def add_bind_value binds, key, value
+        key = key.downcase.to_sym unless key.nil?
+        value = (Array(binds[key]) << value) if binds.key? key
+        binds[key] = value
+      end
 
-        def bind_values payload
-          binds = {}
-          binds = "  " + payload[:binds].map { |col, v| [col.name, v] }
-                                        .inspect
-          payload[:binds].each { |col, value| add_bind_value binds, col.name, value }
-          binds
-        end
+      def logger
+        self.class.logger
+      end
+
+      def bind_values payload
+        binds = {}
+        binds = "  " + payload[:binds].map { |col, v| [col.name, v] }
+                                      .inspect
+        payload[:binds].each { |col, value| add_bind_value binds, col.name, value }
+        binds
       end
     end
   end
-
-  RailsSemanticLogger::Sequel::LogSubscriber.attach_to :sequel
 end
+
+RailsSemanticLogger::Sequel::LogSubscriber.attach_to :sequel

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
@@ -203,7 +203,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/identity.rb

@@ -5,7 +5,7 @@ module SemanticLoggerEcsAddon
   module Identity
     NAME = "semantic_logger_ecs_addon"
     LABEL = "Semantic Logger Ecs Addon"
-    VERSION = "0.1.8"
+    VERSION = "0.1.12"
     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/sequel.rb

@@ -0,0 +1,3 @@
+require "rails_semantic_logger/sequel/log_subscriber" if defined? ActiveSupport::LogSubscriber
+require "sequel/database" if defined?(ActiveSupport::Notifications)
+require "sequel/railties/controller_runtime" if defined?(ActionController)

data/lib/semantic_logger_ecs_addon.rb

@@ -2,15 +2,11 @@
 
 require "pathname"
 require "zeitwerk"
-# if defined?(Sequel)
-#   if defined? ActiveSupport::LogSubscriber
-#     require_relative "rails_semantic_logger/sequel/log_subscriber"
-#   end
-#   require_relative "sequel/database" if defined?(ActiveSupport::Notifications)
-#   require_relative "sequel/railties/controller_runtime" if defined?(ActionController)
-# end
 
 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
 
 # Main namespace.

data/lib/sequel/database.rb

@@ -1,35 +1,33 @@
 # frozen_string_literal: true
 
-if defined?(Sequel) && defined?(ActiveSupport::Notifications)
-  require "sequel/database/logging"
+require "sequel/database/logging"
 
-  module Sequel
-    class Database
-      def log_connection_yield sql, conn, args = nil
-        log_connection_info = (connection_info conn if conn && log_connection_info)
-        log_args = ("; #{args.inspect}" if args)
-        sql_for_log = "#{log_connection_info}#{sql}#{log_args}"
-        start = Time.now
-        begin
-          ::ActiveSupport::Notifications.instrument(
-            "sql.sequel",
-            sql: sql,
-            name: self.class,
-            binds: args
-          ) do
-            yield
-          end
-        rescue StandardError => error
-          log_exception error, sql_for_log unless @loggers.empty?
-          raise
-        ensure
-          log_duration Time.now - start, sql_for_log unless error || @loggers.empty?
+module Sequel
+  class Database
+    def log_connection_yield sql, conn, args = nil
+      log_connection_info = (connection_info conn if conn && log_connection_info)
+      log_args = ("; #{args.inspect}" if args)
+      sql_for_log = "#{log_connection_info}#{sql}#{log_args}"
+      start = Time.now
+      begin
+        ::ActiveSupport::Notifications.instrument(
+          "sql.sequel",
+          sql: sql,
+          name: self.class,
+          binds: args
+        ) do
+          yield
         end
+      rescue StandardError => error
+        log_exception error, sql_for_log unless @loggers.empty?
+        raise
+      ensure
+        log_duration Time.now - start, sql_for_log unless error || @loggers.empty?
       end
+    end
 
-      def log_yield sql, args = nil, &block
-        log_connection_yield(sql, nil, args, &block)
-      end
+    def log_yield sql, args = nil, &block
+      log_connection_yield(sql, nil, args, &block)
     end
   end
 end

data/lib/sequel/railties/controller_runtime.rb

@@ -1,65 +1,63 @@
 # frozen_string_literal: true
 
-if defined?(Sequel) && defined?(ActionController)
-  require "active_support/core_ext/module/attr_internal"
-  unless defined?(RailsSemanticLogger::Sequel::LogSubscriber)
-    require_relative "../../rails_semantic_logger/sequel/log_subscriber"
-  end
-
-  module Sequel
-    module Railties
-      module ControllerRuntime
-        extend ActiveSupport::Concern
+require "active_support/core_ext/module/attr_internal"
+unless defined?(RailsSemanticLogger::Sequel::LogSubscriber)
+  require_relative "../../rails_semantic_logger/sequel/log_subscriber"
+end
 
-        module ClassMethods
-          def log_process_action payload
-            messages = super
-            db_runtime = payload[:db_runtime]
-            db_query_count = payload[:db_query_count]
-            if db_runtime && db_query_count
-              messages << (format "Sequel: %.1fms & %d queries", db_runtime.to_f, db_query_count)
-            end
-            messages
+module Sequel
+  module Railties
+    module ControllerRuntime
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def log_process_action payload
+          messages = super
+          db_runtime = payload[:db_runtime]
+          db_query_count = payload[:db_query_count]
+          if db_runtime && db_query_count
+            messages << (format "Sequel: %.1fms & %d queries", db_runtime.to_f, db_query_count)
           end
+          messages
         end
+      end
 
-        private
-
-        attr_internal :db_runtime, :db_query_count
+      private
 
-        def process_action action, *args
-          # We also need to reset the runtime before each action
-          # because of queries in middleware or in cases we are streaming
-          # and it won't be cleaned up by the method below.
-          RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
-          RailsSemanticLogger::Sequel::LogSubscriber.reset_count
-          super
-        end
+      attr_internal :db_runtime, :db_query_count
 
-        def cleanup_view_runtime
-          if logger && logger.info?
-            db_rt_before_render = RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
-            self.db_runtime = (db_runtime || 0) + db_rt_before_render
-            runtime = super
-            db_rt_after_render = RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
-            self.db_runtime += db_rt_after_render
-            runtime - db_rt_after_render
-          else
-            super
-          end
-        end
+      def process_action action, *args
+        # We also need to reset the runtime before each action
+        # because of queries in middleware or in cases we are streaming
+        # and it won't be cleaned up by the method below.
+        RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
+        RailsSemanticLogger::Sequel::LogSubscriber.reset_count
+        super
+      end
 
-        def append_info_to_payload payload
+      def cleanup_view_runtime
+        if logger && logger.info?
+          db_rt_before_render = RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
+          self.db_runtime = (db_runtime || 0) + db_rt_before_render
+          runtime = super
+          db_rt_after_render = RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
+          self.db_runtime += db_rt_after_render
+          runtime - db_rt_after_render
+        else
           super
-          payload[:db_runtime] =
-            (db_runtime || 0) + RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
-          payload[:db_query_count] =
-            (db_query_count || 0) + RailsSemanticLogger::Sequel::LogSubscriber.reset_count
         end
       end
+
+      def append_info_to_payload payload
+        super
+        payload[:db_runtime] =
+          (db_runtime || 0) + RailsSemanticLogger::Sequel::LogSubscriber.reset_runtime
+        payload[:db_query_count] =
+          (db_query_count || 0) + RailsSemanticLogger::Sequel::LogSubscriber.reset_count
+      end
     end
   end
-
-  ActionController::Base.include Sequel::Railties::ControllerRuntime
-  ActionController::API.include Sequel::Railties::ControllerRuntime
 end
+
+ActionController::Base.include Sequel::Railties::ControllerRuntime
+ActionController::API.include Sequel::Railties::ControllerRuntime

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.12
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -34,7 +34,7 @@ cert_chain:
   vYrYpx2LhW5Xd0nPdr4aI+5BUqGdI7Ypl3BqNHZljUUlieiWu7rU0MhIZgQ1lIMa
   pQreMxz5itbb+2KmpdBlkm8nuRoFv0jrL5LR+7+UBRknGsHXaEQQcQ==
   -----END CERTIFICATE-----
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -95,6 +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/utils/backtrace_cleaner.rb
 - lib/semantic_logger_ecs_addon/utils/hash.rb
 - lib/sequel/database.rb