peak_flow_utils 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6ad793f87d038dc928420a3c35e046fa1fcfb4f610e4fd6bd1c9f8fa445a9e
-  data.tar.gz: 9abdb774bfa6fd91896dfdbe55b6d6d7e931804035712aa51e1c576ab9d4d6cf
+  metadata.gz: '081868f49ad19b34e2f89ed3e5eb2e9c0c2339272ad28e4f321d8c6413a503e7'
+  data.tar.gz: 579842b671495755e32aa6c3d9a87fdbaf7cf1882106ef5e827f6aae67604cbb
 SHA512:
-  metadata.gz: ef054a48493eb11175e79cfdac7b9c2ae5258c8d67c3113bb0c61633404df7c6b674dc2fda6809a3c0ded02533f7fe88407bc4b8693a6c982d772f84a1f2de51
-  data.tar.gz: 6b4cd15ee4e07feabc1e0c4b6bb9efc59aff36dad76c8fae97ff9f8d1d486dc570ae5e69997f872105dffc6036e167beb00e0995b5b115561964facc12b63da2
+  metadata.gz: c8a0320f19c325c9c2332a5f8ea005d7419df8f81e1056dde736eccf14feb7c6a71bda53de9b1826d7273367835ec06e9a825f1afe5495f38758e9a49be415f8
+  data.tar.gz: 1332c002f5b338ff04dcabec111e0404741832610f0df4a3eace91bcf85aeedb6b73962dfb69a8a5d84508cd0ddb5ede1d65732836f6578d4bf409862410819b

data/app/services/peak_flow_utils/active_record_query.rb

@@ -0,0 +1,33 @@
+class PeakFlowUtils::ActiveRecordQuery
+  class SlowSQLError < RuntimeError; end
+
+  attr_reader :event
+
+  def initialize(event)
+    @event = event
+  end
+
+  def perform
+    report_slow_sql if duration_seconds >= 3
+  end
+
+  def duration_seconds
+    @duration_seconds ||= event.duration / 1000
+  end
+
+  def report_slow_sql
+    PeakFlowUtils::Notifier.with_parameters(sql: sql, duration_seconds: duration_seconds) do
+      raise SlowSQLError, "Slow SQL: #{sql_as_single_line}"
+    rescue StandardError => e
+      PeakFlowUtils::Notifier.notify(error: e)
+    end
+  end
+
+  def sql
+    @sql ||= event.payload.fetch(:sql)
+  end
+
+  def sql_as_single_line
+    @sql_as_single_line ||= sql.tr("\n", " ")
+  end
+end

data/app/services/peak_flow_utils/parse_json.rb

@@ -0,0 +1,39 @@
+class PeakFlowUtils::ParseJson
+  def initialize(object)
+    @object = object
+  end
+
+  def parse
+    parse_to_json(@object)
+  end
+
+  def active_record?(object)
+    object.class.ancestors.any? do |ancestor|
+      ancestor.name == "ActiveRecord::Base"
+    end
+  end
+
+  def parse_to_json(object)
+    if object.is_a?(Hash)
+      result = {}
+
+      object.each do |key, value|
+        result[key] = parse_to_json(value)
+      end
+
+      return result
+    elsif object.is_a?(Array)
+      return object.map do |value|
+        parse_to_json(value)
+      end
+    elsif active_record?(object)
+      result = "#<#{object.class.name} id: #{object.id}"
+      result << " name: \"#{object.name}\"" if object.respond_to?(:name)
+      result << ">"
+
+      return result
+    end
+
+    object
+  end
+end

data/lib/peak_flow_utils/inherited_local_var.rb

@@ -2,7 +2,9 @@ require "monitor"
 require_relative "thread_callbacks_patch"
 
 Thread.on_initialize do |parent:, thread:|
-  thread.instance_variable_set(:@_inherited_local_vars, parent.instance_variable_get(:@_inherited_local_vars))
+  parent_vars = parent.instance_variable_get(:@_inherited_local_vars)
+  new_cloned_vars = PeakFlowUtils::DeepMerger.execute!(hashes: [parent_vars])
+  thread.instance_variable_set(:@_inherited_local_vars, new_cloned_vars)
 end
 
 Thread.class_eval do
@@ -57,8 +59,13 @@ end
 class PeakFlowUtils::InheritedLocalVar
   attr_reader :identifier
 
+  def self.identifier_for_object_id(object_id)
+    "inherited_local_var_#{object_id}"
+  end
+
   def self.finalize(inherited_local_var_object_id)
-    Thread.inherited_local_vars_delete("inherited_local_var_#{inherited_local_var_object_id}")
+    identifier = PeakFlowUtils::InheritedLocalVar.identifier_for_object_id(inherited_local_var_object_id)
+    Thread.inherited_local_vars_delete(identifier)
   rescue Exception => e # rubocop:disable Lint/RescueException
     puts e.inspect # rubocop:disable Rails/Output
     puts e.backtrace # rubocop:disable Rails/Output
@@ -68,9 +75,7 @@ class PeakFlowUtils::InheritedLocalVar
 
   def initialize(new_value = nil)
     ObjectSpace.define_finalizer(self, PeakFlowUtils::InheritedLocalVar.method(:finalize))
-
-    @identifier = "inherited_local_var_#{__id__}"
-
+    @identifier = PeakFlowUtils::InheritedLocalVar.identifier_for_object_id(__id__)
     Thread.inherited_local_vars_set(identifier => new_value)
   end
 

data/lib/peak_flow_utils/notifier.rb

@@ -54,6 +54,7 @@ class PeakFlowUtils::Notifier
   def initialize(auth_token:)
     @auth_token = auth_token
     @mutex = ::Mutex.new
+    @on_notify_callbacks = []
     @parameters = ::PeakFlowUtils::InheritedLocalVar.new({})
   end
 
@@ -90,6 +91,10 @@ class PeakFlowUtils::Notifier
 
     uri = URI("https://www.peakflow.io/errors/reports")
 
+    @on_notify_callbacks.each do |on_notify_callback|
+      on_notify_callback.call(parameters: merged_parameters)
+    end
+
     data = {
       auth_token: auth_token,
       error: {
@@ -106,7 +111,7 @@ class PeakFlowUtils::Notifier
       }
     }
 
-    send_notify_request(data: data, uri: uri)
+    send_notify_request(data: PeakFlowUtils::ParseJson.new(data).parse, uri: uri)
   end
 
   def notify_message(message, **opts)
@@ -115,6 +120,10 @@ class PeakFlowUtils::Notifier
     notify(error: e, **opts)
   end
 
+  def on_notify(&blk)
+    @on_notify_callbacks << blk
+  end
+
   def send_notify_request(data:, uri:)
     https = ::Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true

data/lib/peak_flow_utils/notifier_active_record.rb

@@ -0,0 +1,8 @@
+class PeakFlowUtils::NotifierActiveRecord
+  def self.configure
+    ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
+      event = ActiveSupport::Notifications::Event.new(*args)
+      PeakFlowUtils::ActiveRecordQuery.new(event).perform
+    end
+  end
+end

data/lib/peak_flow_utils/version.rb

@@ -1,3 +1,3 @@
 module PeakFlowUtils
-  VERSION = "0.1.18".freeze
+  VERSION = "0.1.20".freeze
 end

data/lib/peak_flow_utils.rb

@@ -10,12 +10,14 @@ module PeakFlowUtils
 
   autoload :InheritedLocalVar, "#{path}/inherited_local_var"
   autoload :Notifier, "#{path}/notifier"
+  autoload :NotifierActiveRecord, "#{path}/notifier_active_record"
   autoload :NotifierErrorParser, "#{path}/notifier_error_parser"
   autoload :NotifierRack, "#{path}/notifier_rack"
   autoload :NotifierRails, "#{path}/notifier_rails"
   autoload :NotifierResponse, "#{path}/notifier_response"
   autoload :NotifierSidekiq, "#{path}/notifier_sidekiq"
   autoload :HandlerHelper, "#{path}/handler_helper"
+  autoload :ParseJson, "#{path}/parse_json"
 
   autoload :ApplicationRecord, "#{models_path}/application_record"
   autoload :Group, "#{models_path}/group"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peak_flow_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - kaspernj
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,7 +138,7 @@ dependencies:
         version: '0'
 description: Utilities to be used with PeakFlow.
 email:
-- kaspernj@gmail.com
+- k@spernj.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -158,6 +158,7 @@ files:
 - app/handlers/peak_flow_utils/validations_handler.rb
 - app/handlers/peak_flow_utils/will_paginate_handler.rb
 - app/services/peak_flow_utils/active_job_parameters_logging.rb
+- app/services/peak_flow_utils/active_record_query.rb
 - app/services/peak_flow_utils/application_migration.rb
 - app/services/peak_flow_utils/application_service.rb
 - app/services/peak_flow_utils/attribute_service.rb
@@ -170,6 +171,7 @@ files:
 - app/services/peak_flow_utils/group_service.rb
 - app/services/peak_flow_utils/handlers_finder_service.rb
 - app/services/peak_flow_utils/model_inspector.rb
+- app/services/peak_flow_utils/parse_json.rb
 - app/services/peak_flow_utils/sidekiq_parameters_logging.rb
 - app/services/peak_flow_utils/translation_service.rb
 - app/services/peak_flow_utils/translations_parser_service.rb
@@ -192,6 +194,7 @@ files:
 - lib/peak_flow_utils/models/translation_key.rb
 - lib/peak_flow_utils/models/translation_value.rb
 - lib/peak_flow_utils/notifier.rb
+- lib/peak_flow_utils/notifier_active_record.rb
 - lib/peak_flow_utils/notifier_error_parser.rb
 - lib/peak_flow_utils/notifier_rack.rb
 - lib/peak_flow_utils/notifier_rails.rb
@@ -204,7 +207,7 @@ homepage: https://github.com/kaspernj/peak_flow_utils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.32
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Utilities to be used with PeakFlow.
 test_files: []