semantic_logger_ecs_addon 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d97e95704e7b702f7b074ca810b708b2ed4525f724d513aa8c1a85b96b0946b4
-  data.tar.gz: d3d1a40446ac60bfa744475a08bb7a1e788d886bb540a09cf015a61ebb8ee3c4
+  metadata.gz: f53530b3500cfdea92d84066a209c2c3f449b44adea38e425d88bed41424bf3e
+  data.tar.gz: b766fb2e188d3e65efe102c32f917f005278220be28ce8110b7a9026d8610356
 SHA512:
-  metadata.gz: 6b71ec9ad44a55906324767394a92c622b69f877c80d4d8b2b7460cd10247ae6ec29f6eb438a803598160e37fc1f3a86d80e47d7d186998fcce0b17f4920db52
-  data.tar.gz: 7b1c09644d4618f74a4e487468dc8059986221bc013f1024ef6b9fd33bb436237486612483b6247823b89bd3644959ecf898431af41fce0b029c2981319d94b7
+  metadata.gz: 4117727bccc4493029e20622f19ce10c284a39a73d680fdc76f4e6e875734a3d76f8343bf1a90ef77fed2b65b99db19f593fbb98b6bf1dcdee09eb9b5657f66f
+  data.tar.gz: 98ae627d2a8793e7b00c30f4da865c81dfef64642402a070cc436ebefbaf9d62ec74973fd6be736e190383d78295efea09adb02ff9ca535e4c8d9dfc33064e92

data/lib/rails_semantic_logger/sequel/log_subscriber.rb

@@ -1,91 +1,91 @@
-# 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
-
-        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
-          RequestStore.fetch(:sql_count) { 0 }
-        end
-
-        def self.reset_runtime
-          previous = runtime
-          self.runtime = 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?
-
-          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 = {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
-
-          logger.debug log
-        end
-
-        private
-
-        @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
-
-        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
-  end
-
-  RailsSemanticLogger::Sequel::LogSubscriber.attach_to :sequel
-end
+# # 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
+
+#         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
+#           RequestStore.fetch(:sql_count) { 0 }
+#         end
+
+#         def self.reset_runtime
+#           previous = runtime
+#           self.runtime = 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?
+
+#           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 = {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
+
+#           logger.debug log
+#         end
+
+#         private
+
+#         @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
+
+#         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
+#   end
+
+#   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.8"
+    VERSION = "0.1.9"
     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/sequel/database.rb

@@ -1,35 +1,35 @@
-# frozen_string_literal: true
+# # frozen_string_literal: true
 
-if defined?(Sequel) && defined?(ActiveSupport::Notifications)
-  require "sequel/database/logging"
+# 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
+#   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
+#       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,65 +1,65 @@
-# frozen_string_literal: true
+# # 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
+# 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 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
+#         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
+#         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 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
-            super
-          end
-        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
+#             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
+#         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
 
-  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
+# end

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.9
 platform: ruby
 authors:
 - Sajeev Ramasamy