semantic_logger_ecs_addon 0.1.9 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53530b3500cfdea92d84066a209c2c3f449b44adea38e425d88bed41424bf3e
-  data.tar.gz: b766fb2e188d3e65efe102c32f917f005278220be28ce8110b7a9026d8610356
+  metadata.gz: ce08af24030c70387cfde3b983fe760d9dffc7cb40fb474e6869c4b0e40c9e47
+  data.tar.gz: 92d2b5bf3a20403aac49fb04ef3f3db1b7153e44cd8137c9a4b1c9981a89e3d9
 SHA512:
-  metadata.gz: 4117727bccc4493029e20622f19ce10c284a39a73d680fdc76f4e6e875734a3d76f8343bf1a90ef77fed2b65b99db19f593fbb98b6bf1dcdee09eb9b5657f66f
-  data.tar.gz: 98ae627d2a8793e7b00c30f4da865c81dfef64642402a070cc436ebefbaf9d62ec74973fd6be736e190383d78295efea09adb02ff9ca535e4c8d9dfc33064e92
+  metadata.gz: 013e4c5ea2cc2b4e2dcdd7bbbd81e5b5fba592c7aa88edea58bef7968bb5e042e1be27e7895c424b0f6b3e05c3b2fb4c2281444f544789cfaef93327fb4bfa86
+  data.tar.gz: 5abe959f84462b47d8375711968e98e9b55ba5b2937974dbd72f80aada8ef2871924894381dc0cb101b66803afac15a9308dac630a7b7cc2fc9aa20532513c29

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
-
-#         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
+
+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

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
@@ -176,11 +176,13 @@ 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)
         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)
         hash[:"http.response.status_code"] = formatted_payload.dig :response, :status
       end
 
@@ -203,7 +205,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/formatters/json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "json"
+require "oj"
 
 module SemanticLoggerEcsAddon
   module Formatters
@@ -12,7 +12,7 @@ module SemanticLoggerEcsAddon
 
       # Returns log messages in JSON format
       def call log, logger
-        super(log, logger).to_json
+        Oj.dump(super(log, logger), nilnil: true, symbol_keys: true, escape_mode: :json, mode: :rails)
       end
     end
   end

data/lib/semantic_logger_ecs_addon/formatters/raw.rb

@@ -82,7 +82,7 @@ module SemanticLoggerEcsAddon
       end
 
       def extras
-        return unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty?
+        return unless formatted_payload.respond_to?(:empty?) && !formatted_payload.empty? && formatted_payload.respond_to?(:has_key?)
 
         hash.merge! 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.9"
+    VERSION = "0.1.13"
     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
+# 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?
-#         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

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
-
-#         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
-
-#         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 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
+# 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
+
+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
+
+      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 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.13
 platform: ruby
 authors:
 - Sajeev Ramasamy
@@ -34,8 +34,22 @@ cert_chain:
   vYrYpx2LhW5Xd0nPdr4aI+5BUqGdI7Ypl3BqNHZljUUlieiWu7rU0MhIZgQ1lIMa
   pQreMxz5itbb+2KmpdBlkm8nuRoFv0jrL5LR+7+UBRknGsHXaEQQcQ==
   -----END CERTIFICATE-----
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,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