dial 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 204280e63f9f71fe949ccc5497b5e12e207ae681314caf73063163f785b7126b
-  data.tar.gz: 21c70e61114ef47f38e194b812c3b0f52aba68ba7976972b13700db90e1451a8
+  metadata.gz: 6cd83bb50a207183202f0f0f9775d060446a352cf88382252fdfc00c4dbb4de6
+  data.tar.gz: a84109907f3884386ce2122ba5173c33ebc8da6e1c900bb94439389a274887b7
 SHA512:
-  metadata.gz: e94c02266b0abd60727413d95bf7ec6238466dfa03725c904dac9443d1be63c448e05e7099d2c5ea44f7c153b155f8dd6176ca972103a0a3778bd8d7076b2f6e
-  data.tar.gz: a6207c9decc7cdd7c009e6d85b38745a53c49b9703740ea35c143ebbbe9f347784136c718f902de4050e9f7dbc02d9b339b3f0a3e28332db3d43c1105d25191a
+  metadata.gz: b1e2a82ea64022c1dcf83f5fc5ae7cdfc3f53794552c9752f4d39f4f490bfcbc25bb3b1632b211ba08c4e4af7c1dd22483c037d06cf2b59dcda44b9d36c92bd7
+  data.tar.gz: 27075354578df3d541fdacb9704959c097a4cd2a128653b8e67b57424b64d934e5c50e1f335a33111012ba2f87b381048cde8ac4d12961dce86cea4059edf54d

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.5.2] - 2025-10-04
+
+-  Preserve existing prosopite custom loggers
+
+## [0.5.1] - 2025-09-27
+
+- Don't clean up stale storage data in railtie
+- Add enabled configuration option and force parameter for per-request profiling
+
 ## [0.5.0] - 2025-09-21
 
 - Add storage interface with Redis cluster and Memcached adapters for distributed deployments

data/README.md

@@ -41,9 +41,15 @@ mount Dial::Engine, at: "/"
 # config/initializers/dial.rb
 
 Dial.configure do |config|
-  config.sampling_percentage = 50
-  config.storage = Dial::Storage::RedisAdapter
-  config.storage_options = { client: Redis.new(url: ENV["REDIS_URL"]), ttl: 86400 }
+  config.enabled = !Rails.env.production? # disable by default in production, use force_param to enable per request
+  config.force_param = "profile" # override param name to force profiling
+  if Rails.env.staging?
+    config.sampling_percentage = 50 # override sampling percentage in staging for A/B testing profiler impact
+  end
+  unless Rails.env.development?
+    config.storage = Dial::Storage::RedisAdapter # use Redis storage in non-development environments
+    config.storage_options = { client: Redis.new(url: ENV["REDIS_URL"]), ttl: 86400 }
+  end
   config.vernier_interval = 100
   config.vernier_allocation_interval = 10_000
   config.prosopite_ignore_queries += [/pg_sleep/i]
@@ -54,9 +60,11 @@ end
 
 Option | Description | Default
 :- | :- | :-
+`enabled` | Whether profiling is enabled. | `true`
+`force_param` | Request parameter name to force profiling even when disabled. Always profiles (bypasses sampling). | `"dial_force"`
 `sampling_percentage` | Percentage of requests to profile. | `100` in development, `1` in production
-`storage` | Storage adapter class for profile data | `Dial::Storage::FileAdapter`
-`storage_options` | Options hash passed to storage adapter | `{ ttl: 3600 }`
+`storage` | Storage adapter class for profile data. | `Dial::Storage::FileAdapter`
+`storage_options` | Options hash passed to storage adapter. | `{ ttl: 3600 }`
 `content_security_policy_nonce` | Sets the content security policy nonce to use when inserting Dial's script. Can be a string, or a Proc which receives `env` and response `headers` as arguments and returns the nonce string. | Rails generated nonce or `nil`
 `vernier_interval` | Sets the `interval` option for vernier. | `200`
 `vernier_allocation_interval` | Sets the `allocation_interval` option for vernier. | `2_000`

data/lib/dial/configuration.rb

@@ -12,8 +12,10 @@ module Dial
   class Configuration
     def initialize
       @options = {
-        sampling_percentage: default_sampling_percentage,
-        storage: default_storage,
+        enabled: true,
+        force_param: FORCE_PARAM,
+        sampling_percentage: ::Rails.env.development? ? SAMPLING_PERCENTAGE_DEV : SAMPLING_PERCENTAGE_PROD,
+        storage: Storage::FileAdapter,
         storage_options: { ttl: STORAGE_TTL },
         content_security_policy_nonce: -> env, _headers { env[NONCE] || EMPTY_NONCE },
         vernier_interval: VERNIER_INTERVAL,
@@ -37,15 +39,5 @@ module Dial
 
       super
     end
-
-    private
-
-    def default_sampling_percentage
-      ::Rails.env.development? ? SAMPLING_PERCENTAGE_DEV : SAMPLING_PERCENTAGE_PROD
-    end
-
-    def default_storage
-      Storage::FileAdapter
-    end
   end
 end

data/lib/dial/constants.rb

@@ -16,6 +16,7 @@ module Dial
   NONCE = ::ActionDispatch::ContentSecurityPolicy::Request::NONCE
   REQUEST_TIMING = "dial_request_timing"
 
+  FORCE_PARAM = "dial_force"
   SAMPLING_PERCENTAGE_DEV = 100
   SAMPLING_PERCENTAGE_PROD = 1
   STORAGE_TTL = 60 * 60

data/lib/dial/middleware.rb

@@ -22,7 +22,8 @@ module Dial
         return @app.call env
       end
 
-      unless should_profile?
+      request = ::Rack::Request.new env
+      unless should_profile? request
         return @app.call env
       end
 
@@ -125,8 +126,12 @@ module Dial
       end
     end
 
-    def should_profile?
-      rand(100) < Dial._configuration.sampling_percentage
+    def should_profile? request
+      force_param = Dial._configuration.force_param
+      return true if request.params[force_param]
+
+      Dial._configuration.enabled &&
+        rand(100) < Dial._configuration.sampling_percentage
     end
   end
 

data/lib/dial/prosopite.rb

@@ -2,8 +2,35 @@
 
 require "active_support/core_ext/string/filters"
 
+require_relative "prosopite_composite_logger"
+
 module Dial
   module Prosopite
+    def custom_logger= logger
+      return super logger if @setting_dial_logger
+
+      @original_logger = logger
+
+      if @dial_logger && @original_logger
+        super ProsopiteCompositeLogger.new @dial_logger, @original_logger
+      else
+        super logger
+      end
+    end
+
+    def dial_logger= logger
+      @dial_logger = logger
+
+      @setting_dial_logger = true
+      if @original_logger
+        self.custom_logger = ProsopiteCompositeLogger.new @dial_logger, @original_logger
+      else
+        self.custom_logger = @dial_logger
+      end
+    ensure
+      @setting_dial_logger = false
+    end
+
     def send_notifications
       tc[:prosopite_notifications] = tc[:prosopite_notifications].to_h do |queries, kaller|
         [queries.map { |query| query.squish }, kaller]

data/lib/dial/prosopite_composite_logger.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "logger"
+
+module Dial
+  class ProsopiteCompositeLogger
+    def initialize dial_logger, existing_logger = nil
+      @dial_logger = dial_logger
+      @existing_logger = existing_logger
+    end
+
+    def level
+      @dial_logger.level
+    end
+
+    def level= value
+      @dial_logger.level = value
+      @existing_logger.level = value if @existing_logger&.respond_to? :level=
+    end
+
+    def method_missing method, *args, &block
+      result = nil
+      result = @dial_logger.send method, *args, &block if @dial_logger.respond_to? method
+      @existing_logger.send method, *args, &block if @existing_logger&.respond_to? method
+      result
+    end
+
+    def respond_to_missing? method, include_private = false
+      @dial_logger.respond_to?(method, include_private) ||
+        @existing_logger&.respond_to?(method, include_private) ||
+          false
+    end
+  end
+end

data/lib/dial/railtie.rb

@@ -10,15 +10,12 @@ require_relative "prosopite_logger"
 module Dial
   class Railtie < ::Rails::Railtie
     initializer "dial.setup", after: :load_config_initializers do |app|
-      # clean up stale storage data
-      Storage.cleanup
-
       app.config.after_initialize do
         # set up prosopite
         if ::ActiveRecord::Base.configurations.configurations.any? { |config| config.adapter == "postgresql" }
           require "pg_query"
         end
-        ::Prosopite.custom_logger = ProsopiteLogger.new
+        ::Prosopite.dial_logger = ProsopiteLogger.new
 
         # finalize configuration
         Dial._configuration.freeze

data/lib/dial/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dial
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dial
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Joshua Young
@@ -114,6 +114,7 @@ files:
 - lib/dial/middleware/rails_stat.rb
 - lib/dial/middleware/ruby_stat.rb
 - lib/dial/prosopite.rb
+- lib/dial/prosopite_composite_logger.rb
 - lib/dial/prosopite_logger.rb
 - lib/dial/railtie.rb
 - lib/dial/storage.rb