semantic_logger_ecs_addon 0.1.7 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4015b55b1cb91fd4cb92b6e8e1000a3516128fecf4070988f69dfcbe8cd44a
-  data.tar.gz: '0849c201922f70ad1f7cef19354a648d10b433352f9d3737eb5ac15c3424e651'
+  metadata.gz: e8352af461ec411f9248c88450b7a7740f67f6a645fe108f3392809e7ac7ac71
+  data.tar.gz: 021a3c454c560442a1cc0a240b6c5cdb8a9e8f2f8134819094f99405d6dac0eb
 SHA512:
-  metadata.gz: a6a62ae9c3e5a4971c60d079bd311efa1a0c2f62a2ca3a52d7fe3ee342a4eac0da8f35a6c748af7c0ab51b692656ed96db79917bceea2afd951da3852bc50120
-  data.tar.gz: fe6ce8a9344ed8242fc1bbc0a604df8a94bc1ffe53de6359b9913acba44c990fe4690c30e21282248d4622b6b3c40b2b9bf77086210e768298b1fe9117c54c4a
+  metadata.gz: '09c1d3cddb5070315d393739fd083e0e16788c509c7f5ec29411b581d2cea865e494bec4215208ad2f10e404cd9c45ea419b8d6d07efe150587b179a9ec25762'
+  data.tar.gz: dfe937ccff617890e4fa6a4854cfecc5d5b63a49173051629d49f273baf18830ddf3e577c11e82e26e1b55f638e8da26f19d08b08d485741ec1a8be348070263

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/identity.rb

@@ -5,7 +5,7 @@ module SemanticLoggerEcsAddon
   module Identity
     NAME = "semantic_logger_ecs_addon"
     LABEL = "Semantic Logger Ecs Addon"
-    VERSION = "0.1.7"
+    VERSION = "0.1.11"
     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

data.tar.gz.sig

@@ -1,4 +1,3 @@
-<P�,JtI����=�#�@P������ڄ_P] �uc�D��G��X��;eq`�t��۝Huawq�KW��	�,��Fv6�U�ۛ�n�;8�x
-E"x��q��T�z��5	���I]B:J�H�p��;]�%���DG1��gޗ`3|��I����t�m&7�]XH���T��pq:r�#��8�R"S��<��A���zn}[��W�*���!���$&�scyһmq�vWݨ�͋Ψ|�@n��Rm,.��
-gG�
B���O�F"�cn��+sɼ3u\`2A�`KÀ&P�4�.R�
-�	�]|㹨�y��}��D��}�=�9���R:#��)�O�����yc-lN��yA�ϑ��a��
+jz��&=�o�
���%k�5"ȥr�o�f��u�\ﰆ+��b�2:�y�^Xm��0�XT�c�Nm
+u�“���A�Sl3��>.��0��}�,���|!
+�@RS�P��{�XS)��mw�Mp���$q䓎�F�������?���4֡5�۝~����]��˒Pp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.11
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -34,7 +34,7 @@ cert_chain:
   vYrYpx2LhW5Xd0nPdr4aI+5BUqGdI7Ypl3BqNHZljUUlieiWu7rU0MhIZgQ1lIMa
   pQreMxz5itbb+2KmpdBlkm8nuRoFv0jrL5LR+7+UBRknGsHXaEQQcQ==
   -----END CERTIFICATE-----
-date: 2021-08-31 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