apm_bro 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1763fe75b6723866fbf061cdc8a978105e3a8bd1be612c2dc0937865c576a1da
-  data.tar.gz: e1bad4ee3231e2a0783994983986e040cec36314912e30f402c044a41f47bdea
+  metadata.gz: caf0f22a5f4a72ddab15c8ec54dd82eb421786dd02568706eab5a906e2543a6c
+  data.tar.gz: 8b944014790250fc71107ebe01e789b882f9f9d836904f30edcc03ebb734fd41
 SHA512:
-  metadata.gz: 070b54479382d040aebd53e2927d0ebd0aff1a0e0e3a8b4ad4045cc674cec680fd64f2cb279c18412aeff347a34eb098de6bb4fcf227094d2a11e61c12b33b67
-  data.tar.gz: 17894ab0bb4446d2fb90848ee0f1996683390710e6f81c198fa357f31822a6577fae98b70749feb46f1e2fbba70e71dd38bbb4886252114164b5d8dcac96a652
+  metadata.gz: 750db0f63cd9e0d6bb01f3c45db1efcd81922a5b532ed0226d9948dcf0ae4b709f6cec442403f469064bc334b45bcae9d203b4df4a90cefc6ba334a0b4add919
+  data.tar.gz: 626c32ee6ac593b581a1fbd3e9a5086382b877212280d8265f774600bd6fea79c87957aa6c50c6c3725baa1835cc899f1a3fa1af7f9de0713e3bf63b34fb7d0f

data/lib/apm_bro/error_middleware.rb

@@ -51,7 +51,8 @@ module ApmBro
           },
         rails_env: safe_rails_env,
         app: safe_app_name,
-        pid: Process.pid
+        pid: Process.pid,
+        logs: ApmBro.logger.logs
       }
     end
 

data/lib/apm_bro/job_sql_tracking_middleware.rb

@@ -5,6 +5,8 @@ module ApmBro
     def self.subscribe!
       # Start SQL tracking when a job begins - use the start event, not the complete event
       ActiveSupport::Notifications.subscribe("perform_start.active_job") do |name, started, finished, _unique_id, data|
+        # Clear logs for this job
+        ApmBro.logger.clear
         ApmBro::SqlSubscriber.start_request_tracking
       end
     rescue StandardError

data/lib/apm_bro/job_subscriber.rb

@@ -34,7 +34,8 @@ module ApmBro
           rails_env: safe_rails_env,
           host: safe_host,
           memory_usage: memory_usage_mb,
-          gc_stats: gc_stats
+          gc_stats: gc_stats,
+          logs: ApmBro.logger.logs
         }
         
         client.post_metric(event_name: name, payload: payload)
@@ -70,7 +71,8 @@ module ApmBro
           rails_env: safe_rails_env,
           host: safe_host,
           memory_usage: memory_usage_mb,
-          gc_stats: gc_stats
+          gc_stats: gc_stats,
+          logs: ApmBro.logger.logs
         }
         
         event_name = exception&.class&.name || "ActiveJob::Exception"

data/lib/apm_bro/logger.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+module ApmBro
+  class Logger
+    SEVERITY_LEVELS = {
+      debug: 0,
+      info: 1,
+      warn: 2,
+      error: 3,
+      fatal: 4
+    }.freeze
+
+    # ANSI color codes
+    COLOR_RESET = "\033[0m".freeze
+    COLOR_DEBUG = "\033[36m".freeze  # Cyan
+    COLOR_INFO = "\033[32m".freeze   # Green
+    COLOR_WARN = "\033[33m".freeze   # Yellow
+    COLOR_ERROR = "\033[31m".freeze # Red
+    COLOR_FATAL = "\033[35m".freeze  # Magenta
+
+    def initialize
+      @thread_logs_key = :apm_bro_logs
+    end
+
+    def debug(message)
+      log(:debug, message)
+    end
+
+    def info(message)
+      log(:info, message)
+    end
+
+    def warn(message)
+      log(:warn, message)
+    end
+
+    def error(message)
+      log(:error, message)
+    end
+
+    def fatal(message)
+      log(:fatal, message)
+    end
+
+    # Get all logs for the current thread
+    def logs
+      Thread.current[@thread_logs_key] || []
+    end
+
+    # Clear logs for the current thread
+    def clear
+      Thread.current[@thread_logs_key] = []
+    end
+
+    private
+
+    def log(severity, message)
+      timestamp = Time.now.utc
+      log_entry = {
+        sev: severity.to_s,
+        msg: message.to_s,
+        time: timestamp.iso8601(3) # Include milliseconds for better precision
+      }
+
+      # Store in thread-local storage
+      Thread.current[@thread_logs_key] ||= []
+      Thread.current[@thread_logs_key] << log_entry
+
+      # Print the message immediately
+      print_log(severity, message, timestamp)
+    end
+
+    def print_log(severity, message, timestamp)
+      formatted_message = format_log_message(severity, message, timestamp)
+      
+      if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+        # Use Rails logger if available (Rails handles its own color formatting)
+        case severity
+        when :debug
+          Rails.logger.debug(formatted_message)
+        when :info
+          Rails.logger.info(formatted_message)
+        when :warn
+          Rails.logger.warn(formatted_message)
+        when :error
+          Rails.logger.error(formatted_message)
+        when :fatal
+          Rails.logger.fatal(formatted_message)
+        end
+      else
+        # Fallback to stdout with colors
+        colored_message = format_log_message_with_color(severity, message, timestamp)
+        $stdout.puts(colored_message)
+      end
+    rescue StandardError
+      # Never let logging break the application
+      $stdout.puts("[ApmBro] #{severity.to_s.upcase}: #{message}")
+    end
+
+    def format_log_message(severity, message, timestamp)
+      "[ApmBro] #{timestamp.iso8601(3)} #{severity.to_s.upcase}: #{message}"
+    end
+
+    def format_log_message_with_color(severity, message, timestamp)
+      color = color_for_severity(severity)
+      severity_str = severity.to_s.upcase
+      "#{color}[ApmBro] #{timestamp.iso8601(3)} #{severity_str}: #{message}#{COLOR_RESET}"
+    end
+
+    def color_for_severity(severity)
+      case severity
+      when :debug
+        COLOR_DEBUG
+      when :info
+        COLOR_INFO
+      when :warn
+        COLOR_WARN
+      when :error
+        COLOR_ERROR
+      when :fatal
+        COLOR_FATAL
+      else
+        COLOR_RESET
+      end
+    end
+  end
+end
+

data/lib/apm_bro/sql_tracking_middleware.rb

@@ -7,6 +7,9 @@ module ApmBro
     end
 
     def call(env)
+      # Clear logs for this request
+      ApmBro.logger.clear
+
       # Start SQL tracking for this request
       if defined?(ApmBro::SqlSubscriber)
         puts "Starting SQL tracking for request: #{env['REQUEST_METHOD']} #{env['PATH_INFO']}"

data/lib/apm_bro/subscriber.rb

@@ -95,7 +95,8 @@ module ApmBro
               exception_class: (exception_class || exception_obj&.class&.name),
               message: (exception_message || exception_obj&.message).to_s[0, 1000],
               backtrace: backtrace,
-              error: true
+              error: true,
+              logs: ApmBro.logger.logs
             }
 
             event_name = (exception_class || exception_obj&.class&.name || "exception").to_s
@@ -134,7 +135,8 @@ module ApmBro
           view_events: view_events,
           view_performance: view_performance,
           memory_events: memory_events,
-          memory_performance: memory_performance
+          memory_performance: memory_performance,
+          logs: ApmBro.logger.logs
         }
         client.post_metric(event_name: name, payload: payload)
       end

data/lib/apm_bro/version.rb

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

data/lib/apm_bro.rb

@@ -18,6 +18,7 @@ module ApmBro
   autoload :MemoryHelpers, "apm_bro/memory_helpers"
   autoload :JobSubscriber, "apm_bro/job_subscriber"
   autoload :JobSqlTrackingMiddleware, "apm_bro/job_sql_tracking_middleware"
+  autoload :Logger, "apm_bro/logger"
   begin
     require "apm_bro/railtie"
   rescue LoadError
@@ -45,4 +46,9 @@ module ApmBro
       SecureRandom.uuid
     end
   end
+
+  # Returns the logger instance for storing and retrieving log messages
+  def self.logger
+    @logger ||= Logger.new
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apm_bro
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Emanuel Comsa
@@ -29,6 +29,7 @@ files:
 - lib/apm_bro/job_sql_tracking_middleware.rb
 - lib/apm_bro/job_subscriber.rb
 - lib/apm_bro/lightweight_memory_tracker.rb
+- lib/apm_bro/logger.rb
 - lib/apm_bro/memory_helpers.rb
 - lib/apm_bro/memory_leak_detector.rb
 - lib/apm_bro/memory_tracking_subscriber.rb