apm_bro 0.1.17 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fde98f2cfbdbc149e9a10f3000a56c14fb35238bd09e0dba8b7cb17db7095b2
-  data.tar.gz: 7b995dbae659d5e24982c1c2da7b2b50e644ca4b275bbc5fef410118bfc6a385
+  metadata.gz: 0c2d1fa177a670e4c599968669d284408d8e4e07feeae007bc3a7b4039dd3f69
+  data.tar.gz: a02724bba6a69bd2e66d1a8d893ee22d932d1f0bd2996f83b40cf0a0e4d6b257
 SHA512:
-  metadata.gz: bcb1b5ce3f643b0b7ef971c3a219884892741664beefa28ae6c4111076e9eb393f8b10840ba655835061f9a481f07c35fc234f9e0bd787bcbceb150a08f0ba11
-  data.tar.gz: 9f88694746c9ac3ba2dc463481ca26796bd04306817a44b44e7a596ea2c94aad4f7bb4d84c6cffa0470b614ba09b6da47379d8ce0325b3cc9e1f191fe949c830
+  metadata.gz: 44ef00e740c200bc47b45b032bed321a33e82f16973a695b19018226e57f879f11c4675cb082cbf324dfb441d298293555d43cfad1b0fb0421df661f6aeb2e7c
+  data.tar.gz: d907473bfbec4779f0658c27908ddd26551f175c61f26bac8661820d4ead6f8c963d9e1714e4d8161832076207cbcc09794bc854c2a67e54b336273079251e26

data/lib/apm_bro/client.rb

@@ -13,21 +13,12 @@ module ApmBro
     end
 
     def post_metric(event_name:, payload:)
-      unless @configuration.enabled
-        return
-      end
+      return if @configuration.api_key.nil?
+      return unless @configuration.enabled
 
       # Check sampling rate - skip if not selected for sampling
-      unless @configuration.should_sample?
-        return
-      end
-
-      api_key = @configuration.resolve_api_key
-
-      if api_key.nil?
-        return
-      end
-
+      return unless @configuration.should_sample?
+      
       # Check circuit breaker before making request
       if @circuit_breaker && @configuration.circuit_breaker_enabled
         if @circuit_breaker.state == :open
@@ -41,7 +32,7 @@ module ApmBro
       end
 
       # Make the HTTP request (async)
-      make_http_request(event_name, payload, api_key)
+      make_http_request(event_name, payload, @configuration.api_key)
 
       nil
     end
@@ -59,10 +50,9 @@ module ApmBro
     end
 
     def make_http_request(event_name, payload, api_key)
-      endpoint_url = (@configuration.respond_to?(:ruby_dev) && @configuration.ruby_dev) ?
-          "http://localhost:3100/apm/v1/metrics" :
-          "https://www.deadbro.com/apm/v1/metrics"
-
+      use_staging = ENV["USE_STAGING_ENDPOINT"] && !ENV["USE_STAGING_ENDPOINT"].empty?
+      production_url = use_staging ? "https://deadbro.aberatii.com/apm/v1/metrics" : "https://www.deadbro.com/apm/v1/metrics"
+      endpoint_url = @configuration.ruby_dev ? "http://localhost:3100/apm/v1/metrics" : production_url
       uri = URI.parse(endpoint_url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = (uri.scheme == "https")

data/lib/apm_bro/configuration.rb

@@ -2,9 +2,10 @@
 
 module ApmBro
   class Configuration
-    DEFAULT_ENDPOINT_PATH = "/v1/metrics"
-
-    attr_accessor :api_key, :endpoint_url, :open_timeout, :read_timeout, :enabled, :ruby_dev, :memory_tracking_enabled, :allocation_tracking_enabled, :circuit_breaker_enabled, :circuit_breaker_failure_threshold, :circuit_breaker_recovery_timeout, :circuit_breaker_retry_timeout, :sample_rate, :excluded_controllers, :excluded_jobs, :excluded_controller_actions, :exclusive_controller_actions, :exclusive_jobs, :deploy_id, :slow_query_threshold_ms, :explain_analyze_enabled
+    attr_accessor :api_key, :open_timeout, :read_timeout, :enabled, :ruby_dev, :memory_tracking_enabled, 
+    :allocation_tracking_enabled, :circuit_breaker_enabled, :circuit_breaker_failure_threshold, :circuit_breaker_recovery_timeout, 
+    :circuit_breaker_retry_timeout, :sample_rate, :excluded_controllers, :excluded_jobs,
+    :exclusive_controllers, :exclusive_jobs, :deploy_id, :slow_query_threshold_ms, :explain_analyze_enabled
 
     def initialize
       @api_key = nil
@@ -19,238 +20,62 @@ module ApmBro
       @circuit_breaker_failure_threshold = 3
       @circuit_breaker_recovery_timeout = 60 # seconds
       @circuit_breaker_retry_timeout = 300 # seconds
-      @sample_rate = 100 # 100% sampling by default
+      @sample_rate = 100
       @excluded_controllers = []
       @excluded_jobs = []
-      @excluded_controller_actions = []
-      @exclusive_controller_actions = []
+      @exclusive_controllers = []
       @exclusive_jobs = []
       @deploy_id = resolve_deploy_id
       @slow_query_threshold_ms = 500 # Default: 500ms
       @explain_analyze_enabled = false # Enable EXPLAIN ANALYZE for slow queries by default
     end
 
-    def resolve_api_key
-      # Priority: explicit config -> Rails credentials/settings -> ENV
-      return @api_key if present?(@api_key)
-
-      if defined?(Rails)
-        key = fetch_from_rails_settings
-        return key if present?(key)
-      end
-
-      env_key = ENV["APM_BRO_API_KEY"]
-      return env_key if present?(env_key)
-
-      nil
+    def resolve_deploy_id
+      ENV["APM_BRO_DEPLOY_ID"] || ENV["GIT_REV"] || ENV["HEROKU_SLUG_COMMIT"] || ApmBro.process_deploy_id
     end
 
-    def resolve_endpoint_url
-      return @endpoint_url if present?(@endpoint_url)
-
-      if defined?(Rails)
-        host = fetch_from_rails_settings(%w[apm_bro host]) || ENV["APM_BRO_HOST"]
-        if present?(host)
-          return join_url(host, DEFAULT_ENDPOINT_PATH)
+    def excluded_controller?(controller_name, action_name = nil)
+      return false if @excluded_controllers.empty?
+      
+      # If action_name is provided, check both controller#action patterns and controller-only patterns
+      if action_name
+        target = "#{controller_name}##{action_name}"
+        # Check controller#action patterns (patterns containing '#')
+        action_patterns = @excluded_controllers.select { |pat| pat.to_s.include?("#") }
+        if action_patterns.any? { |pat| match_name_or_pattern?(target, pat) }
+          return true
         end
+        # Check controller-only patterns (patterns without '#')
+        # If the controller itself is excluded, all its actions are excluded
+        controller_patterns = @excluded_controllers.reject { |pat| pat.to_s.include?("#") }
+        if controller_patterns.any? { |pat| match_name_or_pattern?(controller_name, pat) }
+          return true
+        end
+        return false
       end
-
-      ENV["APM_BRO_ENDPOINT_URL"]
-    end
-
-    def resolve_sample_rate
-      # Priority: explicit config -> Rails credentials/settings -> ENV -> default
-      return @sample_rate if present?(@sample_rate)
-
-      if defined?(Rails)
-        rate = fetch_from_rails_settings(%w[apm_bro sample_rate])
-        return rate if present?(rate)
-      end
-
-      env_rate = ENV["APM_BRO_SAMPLE_RATE"]
-      return env_rate.to_i if present?(env_rate) && env_rate.match?(/^\d+$/)
-
-      100 # default
-    end
-
-    def resolve_deploy_id
-      # Priority: explicit config -> Rails settings/credentials -> ENV -> random UUID
-      return @deploy_id if present?(@deploy_id)
-
-      if defined?(Rails)
-        val = fetch_from_rails_settings(%w[apm_bro deploy_id])
-        return val if present?(val)
-      end
-
-      # Prefer explicit env var, then common platform-specific var
-      apm_bro_deploy_id = ENV["APM_BRO_DEPLOY_ID"]
-      return apm_bro_deploy_id if present?(apm_bro_deploy_id)
-
-      env_val = ENV["GIT_REV"]
-      return env_val if present?(env_val)
-
-      heroku_val = ENV["HEROKU_SLUG_COMMIT"]
-      return heroku_val if present?(heroku_val)
-
-      # Fall back to a process-stable ID
-      ApmBro.process_deploy_id
-    end
-
-    def excluded_controller?(controller_name)
-      list = resolve_excluded_controllers
-      return false if list.nil? || list.empty?
-      list.any? { |pat| match_name_or_pattern?(controller_name, pat) }
+      
+      # When action_name is nil, only check controller-only patterns (no #)
+      controller_patterns = @excluded_controllers.reject { |pat| pat.to_s.include?("#") }
+      return false if controller_patterns.empty?
+      controller_patterns.any? { |pat| match_name_or_pattern?(controller_name, pat) }
     end
 
     def excluded_job?(job_class_name)
-      list = resolve_excluded_jobs
-      return false if list.nil? || list.empty?
-      list.any? { |pat| match_name_or_pattern?(job_class_name, pat) }
+      return false if @excluded_jobs.empty?
+      @excluded_jobs.any? { |pat| match_name_or_pattern?(job_class_name, pat) }
     end
 
     def exclusive_job?(job_class_name)
-      list = resolve_exclusive_jobs
-      return true if list.nil? || list.empty? # If not defined, allow all (default behavior)
-      list.any? { |pat| match_name_or_pattern?(job_class_name, pat) }
+      return true if @exclusive_jobs.empty? # If not defined, allow all (default behavior)
+      @exclusive_jobs.any? { |pat| match_name_or_pattern?(job_class_name, pat) }
     end
 
-    def excluded_controller_action?(controller_name, action_name)
-      list = resolve_excluded_controller_actions
-      return false if list.nil? || list.empty?
+    def exclusive_controller?(controller_name, action_name)
+      return true if @exclusive_controllers.empty? # If not defined, allow all (default behavior)
       target = "#{controller_name}##{action_name}"
-      list.any? { |pat| match_name_or_pattern?(target, pat) }
-    end
-
-    def exclusive_controller_action?(controller_name, action_name)
-      list = resolve_exclusive_controller_actions
-      return true if list.nil? || list.empty? # If not defined, allow all (default behavior)
-      target = "#{controller_name}##{action_name}"
-      list.any? { |pat| match_name_or_pattern?(target, pat) }
-    end
-
-    def resolve_excluded_controller_actions
-      # Collect patterns from @excluded_controller_actions
-      patterns = []
-      if @excluded_controller_actions && !@excluded_controller_actions.empty?
-        patterns.concat(Array(@excluded_controller_actions))
-      end
-
-      # Also check @excluded_controllers for patterns containing '#' (controller action patterns)
-      if @excluded_controllers && !@excluded_controllers.empty?
-        action_patterns = Array(@excluded_controllers).select { |pat| pat.to_s.include?("#") }
-        patterns.concat(action_patterns)
-      end
-
-      return patterns if !patterns.empty?
-
-      if defined?(Rails)
-        list = fetch_from_rails_settings(%w[apm_bro excluded_controller_actions])
-        if list
-          rails_patterns = Array(list)
-          # Also check excluded_controllers from Rails settings for action patterns
-          controllers_list = fetch_from_rails_settings(%w[apm_bro excluded_controllers])
-          if controllers_list
-            action_patterns = Array(controllers_list).select { |pat| pat.to_s.include?("#") }
-            rails_patterns.concat(action_patterns)
-          end
-          return rails_patterns if !rails_patterns.empty?
-        end
-      end
-
-      env = ENV["APM_BRO_EXCLUDED_CONTROLLER_ACTIONS"]
-      if env && !env.strip.empty?
-        env_patterns = env.split(",").map(&:strip)
-        # Also check excluded_controllers env var for action patterns
-        controllers_env = ENV["APM_BRO_EXCLUDED_CONTROLLERS"]
-        if controllers_env && !controllers_env.strip.empty?
-          action_patterns = controllers_env.split(",").map(&:strip).select { |pat| pat.include?("#") }
-          env_patterns.concat(action_patterns)
-        end
-        return env_patterns if !env_patterns.empty?
-      end
-
-      []
-    end
-
-    def resolve_excluded_controllers
-      return @excluded_controllers if @excluded_controllers && !@excluded_controllers.empty?
-
-      if defined?(Rails)
-        list = fetch_from_rails_settings(%w[apm_bro excluded_controllers])
-        return Array(list) if list
-      end
-
-      env = ENV["APM_BRO_EXCLUDED_CONTROLLERS"]
-      return env.split(",").map(&:strip) if env && !env.strip.empty?
-
-      []
-    end
-
-    def resolve_excluded_jobs
-      return @excluded_jobs if @excluded_jobs && !@excluded_jobs.empty?
-
-      if defined?(Rails)
-        list = fetch_from_rails_settings(%w[apm_bro excluded_jobs])
-        return Array(list) if list
-      end
-
-      env = ENV["APM_BRO_EXCLUDED_JOBS"]
-      return env.split(",").map(&:strip) if env && !env.strip.empty?
-
-      []
-    end
-
-    def resolve_exclusive_controller_actions
-      # Collect patterns from @exclusive_controller_actions
-      patterns = []
-      if @exclusive_controller_actions && !@exclusive_controller_actions.empty?
-        patterns.concat(Array(@exclusive_controller_actions))
-      end
-
-      return patterns if !patterns.empty?
-
-      if defined?(Rails)
-        list = fetch_from_rails_settings(%w[apm_bro exclusive_controller_actions])
-        if list
-          rails_patterns = Array(list)
-          return rails_patterns if !rails_patterns.empty?
-        end
-      end
-
-      env = ENV["APM_BRO_EXCLUSIVE_CONTROLLER_ACTIONS"]
-      if env && !env.strip.empty?
-        env_patterns = env.split(",").map(&:strip)
-        return env_patterns if !env_patterns.empty?
-      end
-
-      []
+      @exclusive_controllers.any? { |pat| match_name_or_pattern?(target, pat) }
     end
 
-    def resolve_exclusive_jobs
-      # Collect patterns from @exclusive_jobs
-      patterns = []
-      if @exclusive_jobs && !@exclusive_jobs.empty?
-        patterns.concat(Array(@exclusive_jobs))
-      end
-
-      return patterns if !patterns.empty?
-
-      if defined?(Rails)
-        list = fetch_from_rails_settings(%w[apm_bro exclusive_jobs])
-        if list
-          rails_patterns = Array(list)
-          return rails_patterns if !rails_patterns.empty?
-        end
-      end
-
-      env = ENV["APM_BRO_EXCLUSIVE_JOBS"]
-      if env && !env.strip.empty?
-        env_patterns = env.split(",").map(&:strip)
-        return env_patterns if !env_patterns.empty?
-      end
-
-      []
-    end
 
     def should_sample?
       sample_rate = resolve_sample_rate
@@ -260,13 +85,34 @@ module ApmBro
       # Generate random number 1-100 and check if it's within sample rate
       rand(1..100) <= sample_rate
     end
+    
+    def resolve_sample_rate
+      return @sample_rate unless @sample_rate.nil?
+      
+      if ENV["APM_BRO_SAMPLE_RATE"]
+        env_value = ENV["APM_BRO_SAMPLE_RATE"].to_s.strip
+        # Validate that it's a valid integer string
+        if env_value.match?(/^\d+$/)
+          parsed = env_value.to_i
+          # Ensure it's in valid range (0-100)
+          (parsed >= 0 && parsed <= 100) ? parsed : 100
+        else
+          100 # Invalid format, fall back to default
+        end
+      else
+        100 # default
+      end
+    end
+    
+    def resolve_api_key
+      return @api_key unless @api_key.nil?
+      
+      ENV["APM_BRO_API_KEY"]
+    end
 
     def sample_rate=(value)
       # Allow nil to use default/resolved value
-      if value.nil?
-        @sample_rate = nil
-        return
-      end
+      return @sample_rate = nil if value.nil?
 
       # Allow 0 to disable sampling, or 1-100 for percentage
       unless value.is_a?(Integer) && value >= 0 && value <= 100
@@ -277,10 +123,6 @@ module ApmBro
 
     private
 
-    def present?(value)
-      !(value.nil? || (value.respond_to?(:empty?) && value.empty?))
-    end
-
     def match_name_or_pattern?(name, pattern)
       return false if name.nil? || pattern.nil?
       pat = pattern.to_s
@@ -300,79 +142,5 @@ module ApmBro
       false
     end
 
-    def fetch_from_rails_settings(path_keys = ["apm_bro", "api_key"])
-      # Try Rails.application.config_for(:apm_bro)
-      begin
-        if Rails.respond_to?(:application) && Rails.application.respond_to?(:config_for)
-          config = begin
-            Rails.application.config_for(:apm_bro)
-          rescue
-            nil
-          end
-          if config && config.is_a?(Hash)
-            return dig_hash(config, *Array(path_keys))
-          end
-        end
-      rescue
-      end
-
-      # Try Rails.application.credentials
-      begin
-        creds = Rails.application.credentials if Rails.respond_to?(:application)
-        if creds
-          # credentials.apm_bro[:api_key] or credentials[:apm_bro][:api_key]
-          value = dig_credentials(creds, *Array(path_keys))
-          return value if present?(value)
-        end
-      rescue
-      end
-
-      # Try Rails.application.config.x.apm_bro.api_key
-      begin
-        x = Rails.application.config.x if Rails.respond_to?(:application)
-        if x && x.respond_to?(:apm_bro)
-          config_x = x.apm_bro
-          return config_x.public_send(Array(path_keys).last) if config_x.respond_to?(Array(path_keys).last)
-        end
-      rescue
-      end
-
-      nil
-    end
-
-    def dig_hash(hash, *keys)
-      keys.reduce(hash) do |memo, key|
-        break nil unless memo.is_a?(Hash)
-        memo[key.to_s] || memo[key.to_sym]
-      end
-    end
-
-    def dig_credentials(creds, *keys)
-      # Rails credentials can behave like hashes or use methods
-      current = creds
-      keys.each do |key|
-        if current.respond_to?(:[]) && current[key].nil? && current[key.to_sym].nil?
-          if current.respond_to?(key)
-            current = current.public_send(key)
-          elsif current.respond_to?(key.to_sym)
-            current = current.public_send(key.to_sym)
-          else
-            return nil
-          end
-        else
-          current = current[key] || current[key.to_sym]
-        end
-        return nil if current.nil?
-      end
-      current
-    end
-
-    def join_url(base, path)
-      base = base.to_s
-      path = path.to_s
-      base = base.chomp("/")
-      path = "/#{path}" unless path.start_with?("/")
-      base + path
-    end
   end
 end

data/lib/apm_bro/error_middleware.rb

@@ -6,9 +6,9 @@ module ApmBro
   class ErrorMiddleware
     EVENT_NAME = "exception.uncaught"
 
-    def initialize(app, client: Client.new)
+    def initialize(app, client = nil)
       @app = app
-      @client = client
+      @client = client || ApmBro.client
     end
 
     def call(env)

data/lib/apm_bro/http_instrumentation.rb

@@ -38,7 +38,7 @@ module ApmBro
 
               # Skip instrumentation for our own APM endpoint to prevent infinite loops,
               # but do NOT alter the original method's return value/control flow.
-              skip_instrumentation = uri && (uri.to_s.include?("localhost") || uri.to_s.include?("uptime.aberatii.com"))
+              skip_instrumentation = uri && (uri.to_s.include?("localhost") || uri.to_s.include?("aberatii.com"))
 
               unless skip_instrumentation
                 payload = {
@@ -85,7 +85,7 @@ module ApmBro
 
               # Skip instrumentation for our own APM endpoint to prevent infinite loops,
               # but do NOT alter the original method's return value/control flow.
-              skip_instrumentation = req_url && req_url.include?("localhost:3100/apm/v1/metrics")
+              skip_instrumentation = req_url && (req_url.include?("localhost:3100/apm/v1/metrics") || req_url.include?("deadbro.aberatii.com/apm/v1/metrics"))
 
               unless skip_instrumentation
                 payload = {

data/lib/apm_bro/railtie.rb

@@ -10,26 +10,16 @@ end
 if defined?(Rails) && defined?(Rails::Railtie)
   module ApmBro
     class Railtie < ::Rails::Railtie
-      initializer "apm_bro.configure" do |_app|
-        # Allow host app to set config in Rails config, credentials, or ENV.
-        # If host app sets config.x.apm_bro, mirror into gem configuration.
-
-        if Rails.application.config.x.respond_to?(:apm_bro)
-          xcfg = Rails.application.config.x.apm_bro
-          ApmBro.configure do |cfg|
-            cfg.api_key = xcfg.api_key if xcfg.respond_to?(:api_key)
-            cfg.enabled = xcfg.enabled if xcfg.respond_to?(:enabled)
-          end
-        end
-      rescue
-      end
 
       initializer "apm_bro.subscribe" do |app|
         app.config.after_initialize do
-          ApmBro::Subscriber.subscribe!(client: ApmBro::Client.new)
+          # Use the shared Client instance for all subscribers
+          shared_client = ApmBro.client
+          
+          ApmBro::Subscriber.subscribe!(client: shared_client)
           # Install outgoing HTTP instrumentation
           require "apm_bro/http_instrumentation"
-          ApmBro::HttpInstrumentation.install!(client: ApmBro::Client.new)
+          ApmBro::HttpInstrumentation.install!(client: shared_client)
 
           # Install SQL query tracking
           require "apm_bro/sql_subscriber"
@@ -45,7 +35,7 @@ if defined?(Rails) && defined?(Rails::Railtie)
 
           # Install view rendering tracking
           require "apm_bro/view_rendering_subscriber"
-          ApmBro::ViewRenderingSubscriber.subscribe!(client: ApmBro::Client.new)
+          ApmBro::ViewRenderingSubscriber.subscribe!(client: shared_client)
 
           # Install lightweight memory tracking (default)
           require "apm_bro/lightweight_memory_tracker"
@@ -55,7 +45,7 @@ if defined?(Rails) && defined?(Rails::Railtie)
           # Install detailed memory tracking only if enabled
           if ApmBro.configuration.allocation_tracking_enabled
             require "apm_bro/memory_tracking_subscriber"
-            ApmBro::MemoryTrackingSubscriber.subscribe!(client: ApmBro::Client.new)
+            ApmBro::MemoryTrackingSubscriber.subscribe!(client: shared_client)
           end
 
           # Install job tracking if ActiveJob is available
@@ -63,7 +53,7 @@ if defined?(Rails) && defined?(Rails::Railtie)
             require "apm_bro/job_subscriber"
             require "apm_bro/job_sql_tracking_middleware"
             ApmBro::JobSqlTrackingMiddleware.subscribe!
-            ApmBro::JobSubscriber.subscribe!(client: ApmBro::Client.new)
+            ApmBro::JobSubscriber.subscribe!(client: shared_client)
           end
         rescue
           # Never raise in Railtie init
@@ -73,13 +63,16 @@ if defined?(Rails) && defined?(Rails::Railtie)
       # Insert Rack middleware early enough to observe uncaught exceptions
       initializer "apm_bro.middleware" do |app|
         require "apm_bro/error_middleware"
+        
+        # Use the shared Client instance for the middleware
+        shared_client = ApmBro.client
 
         if defined?(::ActionDispatch::DebugExceptions)
-          app.config.middleware.insert_before(::ActionDispatch::DebugExceptions, ::ApmBro::ErrorMiddleware)
+          app.config.middleware.insert_before(::ActionDispatch::DebugExceptions, ::ApmBro::ErrorMiddleware, shared_client)
         elsif defined?(::ActionDispatch::ShowExceptions)
-          app.config.middleware.insert_before(::ActionDispatch::ShowExceptions, ::ApmBro::ErrorMiddleware)
+          app.config.middleware.insert_before(::ActionDispatch::ShowExceptions, ::ApmBro::ErrorMiddleware, shared_client)
         else
-          app.config.middleware.use(::ApmBro::ErrorMiddleware)
+          app.config.middleware.use(::ApmBro::ErrorMiddleware, shared_client)
         end
       rescue
         # Never raise in Railtie init

data/lib/apm_bro/sql_tracking_middleware.rb

@@ -12,37 +12,31 @@ module ApmBro
 
       # Start SQL tracking for this request
       if defined?(ApmBro::SqlSubscriber)
-        puts "Starting SQL tracking for request: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
         ApmBro::SqlSubscriber.start_request_tracking
       end
 
       # Start cache tracking for this request
       if defined?(ApmBro::CacheSubscriber)
-        puts "Starting cache tracking for request: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
         ApmBro::CacheSubscriber.start_request_tracking
       end
 
       # Start Redis tracking for this request
       if defined?(ApmBro::RedisSubscriber)
-        puts "Starting redis tracking for request: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
         ApmBro::RedisSubscriber.start_request_tracking
       end
 
       # Start view rendering tracking for this request
       if defined?(ApmBro::ViewRenderingSubscriber)
-        puts "Starting view rendering tracking for request: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
         ApmBro::ViewRenderingSubscriber.start_request_tracking
       end
 
       # Start lightweight memory tracking for this request
       if defined?(ApmBro::LightweightMemoryTracker)
-        puts "Starting lightweight memory tracking for request: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
         ApmBro::LightweightMemoryTracker.start_request_tracking
       end
 
       # Start detailed memory tracking when allocation tracking is enabled
       if ApmBro.configuration.allocation_tracking_enabled && defined?(ApmBro::MemoryTrackingSubscriber)
-        puts "Starting detailed memory tracking for request: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
         ApmBro::MemoryTrackingSubscriber.start_request_tracking
       end
 

data/lib/apm_bro/subscriber.rb

@@ -13,11 +13,13 @@ module ApmBro
         begin
           controller_name = data[:controller].to_s
           action_name = data[:action].to_s
-          if ApmBro.configuration.excluded_controller_action?(controller_name, action_name)
+          if ApmBro.configuration.excluded_controller?(controller_name, action_name)
+            puts "excluded controller"
             next
           end
           # If exclusive_controller_actions is defined and not empty, only track matching actions
-          unless ApmBro.configuration.exclusive_controller_action?(controller_name, action_name)
+          unless ApmBro.configuration.exclusive_controller?(controller_name, action_name)
+            puts "exclusive controller"
             next
           end
         rescue

data/lib/apm_bro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApmBro
-  VERSION = "0.1.17"
+  VERSION = "0.1.19"
 end

data/lib/apm_bro.rb

@@ -33,9 +33,15 @@ module ApmBro
   def self.configuration
     @configuration ||= Configuration.new
   end
-
+  
   def self.reset_configuration!
-    @configuration = Configuration.new
+    @configuration = nil
+    @client = nil
+  end
+
+  # Returns a shared Client instance for use across the application
+  def self.client
+    @client ||= Client.new
   end
 
   # Returns a process-stable deploy identifier used when none is configured.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apm_bro
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.19
 platform: ruby
 authors:
 - Emanuel Comsa