scout_apm_logging 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb4dc1a11fe63b4c983636958676d8ca7e76bb04c5281bdabd272373deaf83e5
-  data.tar.gz: 70809502cbbfb93a9cc73e26329f4e52b57008f51f9e34b3769fdfb17b2d46f4
+  metadata.gz: 7a99a84cd9f8dd023b8717c81e5d80b17c99f5afb8c7e7edb6152193ef7fecdf
+  data.tar.gz: b9d2e44b40adcb5f9acc13f6ef6d2176e79ed6b056f6e6d1e8f9f0359857ebf6
 SHA512:
-  metadata.gz: b3a17d497a14d952294dd23ce5eac8605f7cee5da807ba53cc312acafbe314c33a303d75d97ac828f3ea1aba40e733da1104aa655866121e7f3c149afc9935cb
-  data.tar.gz: 3515ffc8593bc564318859e0fb7340f82c2c066509a82411091b8e5e21bb4abcb223e1318d83b76a12ac11986db22bf4abaec5f511d6c07bdcaa5cc32742b7fd
+  metadata.gz: 1f73329ada6fde049cf1ffe18ad2d43c0fa09158cffcc10e51c58f897d9cd40f1aa2636ee645e2b26d7a36204e082ca318c5281e8e32759aaac2b685a4ff5f32
+  data.tar.gz: 664471524c4802ad23cfeee6299a56259d07e7a9a9d2fb241393202b4116946052f695982ada22c3060a39fca25f351ce6a90487e329283bc264749e6ee56738

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.4
+* Fix memoizing of log attributes, which could lead to persistent attributes.
+
 ## 0.0.3
 * **Feature**: Add support for TaggedLogging.
 * Add ability to customize file logger size. Increase default size to 10MiB.

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

@@ -12,12 +12,15 @@ module ScoutApm
       class Formatter < ::Logger::Formatter
         DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%LZ'
 
-        def call(severity, time, progname, msg) # rubocop:disable Metrics/AbcSize
-          attributes_to_log[:severity] = severity
-          attributes_to_log[:time] = format_datetime(time)
+        def call(severity, time, progname, msg)
+          attributes_to_log = {
+            severity: severity,
+            time: format_datetime(time),
+            pid: Process.pid.to_s,
+            msg: msg2str(msg)
+          }
+
           attributes_to_log[:progname] = progname if progname
-          attributes_to_log[:pid] = Process.pid.to_s
-          attributes_to_log[:msg] = msg2str(msg)
           attributes_to_log['service.name'] = service_name
 
           attributes_to_log.merge!(scout_layer)
@@ -30,10 +33,6 @@ module ScoutApm
 
         private
 
-        def attributes_to_log
-          @attributes_to_log ||= {}
-        end
-
         def format_datetime(time)
           time.utc.strftime(DATETIME_FORMAT)
         end

data/lib/scout_apm/logging/version.rb

@@ -2,6 +2,6 @@
 
 module ScoutApm
   module Logging
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/integration/rails/lifecycle_spec.rb

@@ -48,6 +48,11 @@ describe ScoutApm::Logging do
     expect(messages.count('[YIELD] Yield Test')).to eq(1)
     expect(messages.count('Another Log')).to eq(1)
 
+    log_locations = lines.map { |item| item['log_location'] }.compact
+
+    # Verify that log attributes aren't persisted
+    expect(log_locations.size).to eq(1)
+
     # Kill the rails process. We use kill as using any other signal throws a long log line.
     Process.kill('KILL', rails_pid)
     # Kill the process and ensure PID file clean up

data/spec/rails/app.rb

@@ -20,6 +20,7 @@ end
 
 class RootController < ActionController::Base
   def index
+    Rails.logger.warn('Add location log attributes')
     Rails.logger.tagged('TEST').info('Some log')
     Rails.logger.tagged('YIELD') { logger.info('Yield Test') }
     Rails.logger.info('Another Log')

metadata

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