scout_apm_logging 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55380380a6a30ccfe38b8a7b117e02e2aa8c3ffc09a679f194c0b93ed1f4062
-  data.tar.gz: 0131aa6a8d6ed072553996fe58b5a4e3d1f1170e656dda3b8283bbad301f56e8
+  metadata.gz: b613ee5835fad514e57720ba9349bb90bc2eea19821891998655353d50447f3c
+  data.tar.gz: 29a0dda4469c4a4a2465816cc3cacfd332ae545af37f0b694c7aa3b6afb83ca6
 SHA512:
-  metadata.gz: ddada293aa30a8c806e6ca1e7d318b5a2f412f990d2bd5e2eeb81e5ddd10d661a7362571c105d776f7c5adbeecd4d6adf788ba505c6d6b811f8824f30485550e
-  data.tar.gz: 825aba7b09c6075bcb0230b18b582eb37daa08d0c2eff45c781c73efa8a058dbae4498e1702e14438320a3bf618aae52d738b81aabfa7e87b825a1efed827da8
+  metadata.gz: 991c4af38d8027255b65a0e1225f0b3f295a3f6e76f2dbcb46a13b91644420b684f8c9ab343eb04708ed3dc499a46e38ea1ee8b2924e78361ea469a033d63d22
+  data.tar.gz: 667b91726ad60e9415d90db45fcef50f73f317308d42d1b17686bb1ae2de791ba75903e4bd5d9fbbcbe7009809b187fc468d6ebf18945edc5c6fa2f6e637b674

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.0.8
+* Fix internal method names for proxy logger to prevent accidental overriding.
+* Re-broadcast to console in development for the proxy logger.
+* Fix tags not being removed when yielded contents throw an exception.
+* Fix missing return statement, where tagged logging patches were being added to unintended loggers.
+
+## 0.0.7
+* Fix determined logger level comparison
+
 ## 0.0.6
 * Ensure logger level is set back to the original.
 

data/lib/scout_apm/logging/loggers/logger.rb

@@ -3,7 +3,9 @@
 module ScoutApm
   module Logging
     module Loggers
+      # The actual instance of the logger.
       class FileLogger < ::Logger
+        include ::ActiveSupport::LoggerSilence if const_defined?('::ActiveSupport::LoggerSilence')
       end
 
       # The newly created logger which we can configure, and will log to a filepath.
@@ -62,7 +64,13 @@ module ScoutApm
           capture_level = context.config.value('logs_capture_level')
           capture_value = ::Logger::Severity.const_get(capture_level.upcase)
 
-          [capture_value, log_instance.level].max
+          log_instance_value = if log_instance.level.is_a?(Integer)
+                                 log_instance.level
+                               else
+                                 ::Logger::Severity.const_get(log_instance.level.to_s.upcase)
+                               end
+
+          [capture_value, log_instance_value].max
         end
 
         def find_log_destination(logdev)

data/lib/scout_apm/logging/loggers/patches/tagged_logging.rb

@@ -11,8 +11,8 @@ module ScoutApm
         # Patches TaggedLogging to work with our loggers.
         module TaggedLogging
           def tagged(*tags) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-            super(*tags) unless (self == ::Rails.logger && is_a?(ScoutApm::Logging::Loggers::Proxy)) ||
-                                (::Rails.logger.respond_to?(:broadcasts) && ::Rails.logger.broadcasts.include?(self))
+            return super(*tags) unless (self == ::Rails.logger && is_a?(ScoutApm::Logging::Loggers::Proxy)) ||
+                                       (::Rails.logger.respond_to?(:broadcasts) && ::Rails.logger.broadcasts.include?(self))
 
             if is_a?(ScoutApm::Logging::Loggers::Proxy)
               if block_given?
@@ -20,8 +20,13 @@ module ScoutApm
                 loggers = @loggers[1..]
                 pushed_counts = extend_and_push_tags(loggers, *tags)
 
-                formatter.tagged(*tags) { yield self }.tap do
+                begin
+                  formatter.tagged(*tags) { yield self }.tap do
+                    logger_pop_tags(loggers, pushed_counts)
+                  end
+                rescue StandardError => e
                   logger_pop_tags(loggers, pushed_counts)
+                  raise e
                 end
               else
                 loggers = instance_variable_get(:@loggers)
@@ -36,9 +41,13 @@ module ScoutApm
               # We skip the first logger to prevent double tagging when calling formatter.tagged
               loggers = ::Rails.logger.broadcasts[1..]
               pushed_counts = extend_and_push_tags(loggers, *tags)
-
-              formatter.tagged(*tags) { yield self }.tap do
+              begin
+                formatter.tagged(*tags) { yield self }.tap do
+                  logger_pop_tags(loggers, pushed_counts)
+                end
+              rescue StandardError => e
                 logger_pop_tags(loggers, pushed_counts)
+                raise e
               end
             else
               broadcasts = ::Rails.logger.broadcasts

data/lib/scout_apm/logging/loggers/proxy.rb

@@ -7,7 +7,7 @@ module ScoutApm
       class Proxy
         def self.create_with_loggers(*loggers)
           new.tap do |proxy_logger|
-            loggers.each { |logger| proxy_logger.add(logger) }
+            loggers.each { |logger| proxy_logger.add_scout_loggers(logger) }
           end
         end
 
@@ -15,11 +15,11 @@ module ScoutApm
           @loggers = []
         end
 
-        def add(logger)
+        def add_scout_loggers(logger)
           @loggers << logger
         end
 
-        def remove(logger)
+        def remove_scout_loggers(logger)
           @loggers.reject! { |inst_log| inst_log == logger }
 
           @loggers

data/lib/scout_apm/logging/loggers/swaps/rails.rb

@@ -38,7 +38,7 @@ module ScoutApm
           end
 
           # Eseentially creates the original logger.
-          def original_logger
+          def original_logger # rubocop:disable Metrics/AbcSize
             # We can use the previous logdev. log_device will continuously call write
             # through the devices until the logdev (@dev) is an IO device other than logdev:
             # https://github.com/ruby/ruby/blob/master/lib/logger/log_device.rb#L42
@@ -48,6 +48,14 @@ module ScoutApm
             ::Logger.new(original_logdevice).tap do |logger|
               logger.level = log_instance.level
               logger.formatter = log_instance.formatter
+
+              if ::Rails.env.development? && $stdout.tty? && $stderr.tty?
+                next if ActiveSupport::Logger.respond_to?(:logger_outputs_to?) && ActiveSupport::Logger.logger_outputs_to?(
+                  logger, $stdout, $stderr
+                )
+
+                logger.extend(ActiveSupport::Logger.broadcast(ActiveSupport::Logger.new($stdout)))
+              end
             end
           end
 

data/lib/scout_apm/logging/version.rb

@@ -2,6 +2,6 @@
 
 module ScoutApm
   module Logging
-    VERSION = '0.0.6'
+    VERSION = '0.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm_logging
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Scout APM
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scout_apm