semantic_logger_ecs_addon 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba75d521a4ff9817c0f359bf045b0cb1387cfc9d9c04655761c550cba1e3a064
-  data.tar.gz: 0e9625582f4f182129e8791dff144b2f46d36db717dd293b677ba1aac4787451
+  metadata.gz: ce4015b55b1cb91fd4cb92b6e8e1000a3516128fecf4070988f69dfcbe8cd44a
+  data.tar.gz: '0849c201922f70ad1f7cef19354a648d10b433352f9d3737eb5ac15c3424e651'
 SHA512:
-  metadata.gz: fe0fe150b4eef28b9df59b1ca9964e72b18d340308eeac146e75c3a57363b830e4eb82d7a74f28e384dce1c139bfb3284e759e718f4ac0520183b111421619b6
-  data.tar.gz: 4f4fcfcc2836b2a8d6018aee71b802b136091888104350649a0cbcd5bf975e4106a75a762e89e5366cb2b7aab91dd0aa230d76fc75cc58de3846db4f1f23d9ff
+  metadata.gz: a6a62ae9c3e5a4971c60d079bd311efa1a0c2f62a2ca3a52d7fe3ee342a4eac0da8f35a6c748af7c0ab51b692656ed96db79917bceea2afd951da3852bc50120
+  data.tar.gz: fe6ce8a9344ed8242fc1bbc0a604df8a94bc1ffe53de6359b9913acba44c990fe4690c30e21282248d4622b6b3c40b2b9bf77086210e768298b1fe9117c54c4a

data/lib/rails_semantic_logger/sequel/log_subscriber.rb

@@ -1,89 +1,91 @@
 # frozen_string_literal: true
 
-module RailsSemanticLogger
-  module Sequel
-    class LogSubscriber < ActiveSupport::LogSubscriber
-      class << self
-        attr_reader :logger
-      end
+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
+        def self.runtime= value
+          # ::ActiveRecord::RuntimeRegistry.sql_runtime = value
+          RequestStore.store[:sql_runtime] = value
+        end
 
-      def self.runtime
-        # ::ActiveRecord::RuntimeRegistry.sql_runtime ||= 0
-        RequestStore.fetch(:sql_runtime) { 0 }
-      end
+        def self.runtime
+          # ::ActiveRecord::RuntimeRegistry.sql_runtime ||= 0
+          RequestStore.fetch(:sql_runtime) { 0 }
+        end
 
-      def self.count= value
-        RequestStore.store[:sql_count] = value
-      end
+        def self.count= value
+          RequestStore.store[:sql_count] = value
+        end
 
-      def self.count
-        RequestStore.fetch(:sql_count) { 0 }
-      end
+        def self.count
+          RequestStore.fetch(:sql_count) { 0 }
+        end
 
-      def self.reset_runtime
-        previous = runtime
-        self.runtime = 0
-        previous
-      end
+        def self.reset_runtime
+          previous = runtime
+          self.runtime = 0
+          previous
+        end
 
-      def self.reset_count
-        previous = count
-        self.count = 0
-        previous
-      end
+        def self.reset_count
+          previous = count
+          self.count = 0
+          previous
+        end
 
-      def sql event
-        self.class.runtime += event.duration
-        self.class.count += 1
-        return unless logger.debug?
+        def sql event
+          self.class.runtime += event.duration
+          self.class.count += 1
+          return unless logger.debug?
 
-        payload = event.payload
-        name = payload[:name]
+          payload = event.payload
+          name = payload[:name]
 
-        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_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 = {message: name, payload: log_payload, duration: event.duration}
+          log = {message: name, payload: log_payload, duration: event.duration}
 
-        # 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 the location of the query itself.
+          if logger.send(:level_index) >= SemanticLogger.backtrace_level_index
+            log[:backtrace] = SemanticLogger::Utils.strip_backtrace caller
+          end
 
-        logger.debug log
-      end
+          logger.debug log
+        end
 
-      private
+        private
 
-      @logger = SemanticLogger["Sequel"]
+        @logger = SemanticLogger["Sequel"]
 
-      # 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
+        # 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 logger
-        self.class.logger
-      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
+        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
   end
-end
 
-RailsSemanticLogger::Sequel::LogSubscriber.attach_to :sequel
+  RailsSemanticLogger::Sequel::LogSubscriber.attach_to :sequel
+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.6"
+    VERSION = "0.1.7"
     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

@@ -6,9 +6,7 @@ if defined?(Sequel)
   if defined? ActiveSupport::LogSubscriber
     require_relative "rails_semantic_logger/sequel/log_subscriber"
   end
-  if defined?(ActiveSupport::Notifications)
-    require_relative "sequel/database/active_support_notification"
-  end
+  require_relative "sequel/database" if defined?(ActiveSupport::Notifications)
   require_relative "sequel/railties/controller_runtime" if defined?(ActionController)
 end
 

data/lib/sequel/database.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+if defined?(Sequel) && defined?(ActiveSupport::Notifications)
+  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?
+        end
+      end
+
+      def log_yield sql, args = nil, &block
+        log_connection_yield(sql, nil, args, &block)
+      end
+    end
+  end
+end

data/lib/sequel/railties/controller_runtime.rb

@@ -1,63 +1,65 @@
 # 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
+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
-
-      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)
+  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
-          messages
         end
-      end
 
-      private
+        private
 
-      attr_internal :db_runtime, :db_query_count
+        attr_internal :db_runtime, :db_query_count
 
-      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 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
+        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
-      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
+        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 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
   end
-end
 
-ActionController::Base.include Sequel::Railties::ControllerRuntime
-ActionController::API.include Sequel::Railties::ControllerRuntime
+  ActionController::Base.include Sequel::Railties::ControllerRuntime
+  ActionController::API.include Sequel::Railties::ControllerRuntime
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -34,7 +34,7 @@ cert_chain:
   vYrYpx2LhW5Xd0nPdr4aI+5BUqGdI7Ypl3BqNHZljUUlieiWu7rU0MhIZgQ1lIMa
   pQreMxz5itbb+2KmpdBlkm8nuRoFv0jrL5LR+7+UBRknGsHXaEQQcQ==
   -----END CERTIFICATE-----
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -97,7 +97,7 @@ files:
 - lib/semantic_logger_ecs_addon/identity.rb
 - lib/semantic_logger_ecs_addon/utils/backtrace_cleaner.rb
 - lib/semantic_logger_ecs_addon/utils/hash.rb
-- lib/sequel/database/active_support_notification.rb
+- lib/sequel/database.rb
 - lib/sequel/railties/controller_runtime.rb
 homepage: https://github.com/thorion3006/semantic_logger_ecs_addon
 licenses:

data/lib/sequel/database/active_support_notification.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "sequel/database/logging"
-require "active_support/notifications"
-
-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
-  end
-end