semantic_logger_ecs_addon 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c737f17a901802f4dc4489f49060bc1905d29bac92978d044ed819325b470589
-  data.tar.gz: 87d0e96cddceefaa89f3fdcf98e33be743c74d4513bbbdd2f07dd76cd6b85ce0
+  metadata.gz: eadf8edfbe1cf5c37a68f71eebb0d809f0cb9420c1e449902fe7c0a2bfbc0017
+  data.tar.gz: fbb28cdbcedff8afffeae986ffec6a1df19d6da9c325563388235ea6b81de7f6
 SHA512:
-  metadata.gz: c0492a1e95e2d56ff67313adbab5c06de1e6a27468f17fc5c688d8993fe5fa645dbdf2282f89fd7297c8d9b6581bb125129284c3e48dc02bcfc1e2a52a4cc92a
-  data.tar.gz: 4e72ea15867334218bda97eda2f74025ff522226d41bec7fd366c455e2fc5d0a9c050be2a909ee6ce68d257a8301397f668c91704b1e757ea13d40ca4ace36d8
+  metadata.gz: 1d3dd9fa46fd383916609202e3fa68d405bff42debbbba4cea4e87fe1825707485abc4b94e89cb73a7036fbf9e08cc93be523b16a030f4aa7ee92095b6b4046a
+  data.tar.gz: 539f0eb6e805d1db8923762fbd96d402b99a005cf7f97cd4cdbe49c571bdedc2c1ee7d8e5b741b8c543b0501256091485609180d3faf6fd4ca424b0827686346

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-/}�)5|�On�RF5�6��������^�Z�P�[W{C�0m4����j���V�#-��p�$�]X�O����P�Y]�n��J����c�����42�`�i�{�c�jA�����p*�ֽ6i�%��7:��э#�?�xn�ڽ�wU�j������j�{)X�-/��:�)OF'PA�6Y�?0��%l�z�4�]�}V(����!��88~[��e�z꺺�����IA�VN�Y�'��8`��b��L=��2-�t����1�3W�
+3]��@
+Q��~��#`C�m�G�ލ
+�K����#����Foԟ��kz��.��F*8��"�}�ӎ[V�.�6�\*i���5��

data/lib/rails_semantic_logger/sequel/log_subscriber.rb

@@ -0,0 +1,87 @@
+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

@@ -145,7 +145,9 @@ module SemanticLoggerEcsAddon
       end
 
       def rack_metrics
-        metrics_keys = formatted_payload.keys.select { |k| k.to_s.end_with?("_runtime") }
+        metrics_keys = formatted_payload.keys.select do |k|
+          k.to_s.end_with? "_runtime", "_count"
+        end
         formatted_payload[:metrics].merge! formatted_payload.extract!(:allocations, *metrics_keys)
         formatted_payload[:metrics][:object_allocations] =
           formatted_payload[:metrics].delete :allocations

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.1"
+    VERSION = "0.1.4"
     VERSION_LABEL = "#{LABEL} #{VERSION}"
     SUMMARY = "A semantic logger formatter that formats the logs according to Elastic Common Schema and adds APM trace data if ElasticAPM is enabled."
   end

data/lib/semantic_logger_ecs_addon.rb

@@ -2,6 +2,13 @@
 
 require "pathname"
 require "zeitwerk"
+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/railties/controller_runtime" if defined?(ActionController)
 
 loader = Zeitwerk::Loader.for_gem
 loader.setup

data/lib/sequel/database/active_support_notification.rb

@@ -0,0 +1,32 @@
+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

data/lib/sequel/railties/controller_runtime.rb

@@ -0,0 +1,63 @@
+# 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

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�4K�#�
-o��1���i}����
+=l�T����!ܴ=-Q��� �R�����K�����n�]�@����s�J0����KKL��g�NfM�|G���N�
+mW�S�����%͂����u�8Ɏ
7�`��y�V�S��ݠV���"粅�8�H/��'�n6��K*�7��i#پ��)�ܓe������s/٫��{`H5�/

metadata

@@ -1,40 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger_ecs_addon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Sajeev Ramasamy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  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
   -----END CERTIFICATE-----
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger
@@ -64,7 +64,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description: 
+description:
 email:
 - thorion3006@gmail.com
 executables: []
@@ -75,6 +75,7 @@ extra_rdoc_files:
 files:
 - LICENSE.md
 - README.md
+- lib/rails_semantic_logger/sequel/log_subscriber.rb
 - lib/semantic_logger_ecs_addon.rb
 - lib/semantic_logger_ecs_addon/formatters/base.rb
 - lib/semantic_logger_ecs_addon/formatters/json.rb
@@ -82,6 +83,8 @@ 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/railties/controller_runtime.rb
 homepage: https://github.com/thorion3006/semantic_logger_ecs_addon
 licenses:
 - MIT
@@ -90,7 +93,7 @@ metadata:
   changelog_uri: https://github.com/thorion3006/semantic_logger_ecs_addon/blob/master/CHANGES.md
   documentation_uri: https://github.com/thorion3006/semantic_logger_ecs_addon
   source_code_uri: https://github.com/thorion3006/semantic_logger_ecs_addon
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A semantic logger formatter that formats the logs according to Elastic Common
   Schema and adds APM trace data if ElasticAPM is enabled.