scout_apm_logging 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b613ee5835fad514e57720ba9349bb90bc2eea19821891998655353d50447f3c
-  data.tar.gz: 29a0dda4469c4a4a2465816cc3cacfd332ae545af37f0b694c7aa3b6afb83ca6
+  metadata.gz: 6d85bd807f130a6b0187f898a42d6d703a2c21d21a2aac03a7dcc4d1141e1b8e
+  data.tar.gz: 936a7d718eb3f2d8b05d6694ab15b56dae548996d9dd24c7b4aca5a1eccadbbf
 SHA512:
-  metadata.gz: 991c4af38d8027255b65a0e1225f0b3f295a3f6e76f2dbcb46a13b91644420b684f8c9ab343eb04708ed3dc499a46e38ea1ee8b2924e78361ea469a033d63d22
-  data.tar.gz: 667b91726ad60e9415d90db45fcef50f73f317308d42d1b17686bb1ae2de791ba75903e4bd5d9fbbcbe7009809b187fc468d6ebf18945edc5c6fa2f6e637b674
+  metadata.gz: 1c6765bc549891c2156e0d8d31b6d74862541a07685b9d81408ab14d65d5c42b83565c441a8c1520027f73db60bbb65b82778195ef358ec9a95a7b8c7bae60be
+  data.tar.gz: eb22f6ab71fcd15e13f3725b999ae7597161ae5f716b00f0649a8d74535747df3426b09f7a0244521ac9e16c627a0120373a73791bef1cbbfa00914e59d63df5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.10
+* Remove capitalization from action name in the formatter, to match that of the standard format.
+
+## 0.0.9
+* Add Scout Transaction ID to log attributes.
+
 ## 0.0.8
 * Fix internal method names for proxy logger to prevent accidental overriding.
 * Re-broadcast to console in development for the proxy logger.

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

@@ -12,7 +12,7 @@ module ScoutApm
       class Formatter < ::Logger::Formatter
         DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%LZ'
 
-        def call(severity, time, progname, msg)
+        def call(severity, time, progname, msg) # rubocop:disable Metrics/AbcSize
           attributes_to_log = {
             severity: severity,
             time: format_datetime(time),
@@ -23,6 +23,7 @@ module ScoutApm
           attributes_to_log[:progname] = progname if progname
           attributes_to_log['service.name'] = service_name
 
+          attributes_to_log.merge!(scout_transaction_id)
           attributes_to_log.merge!(scout_layer)
           attributes_to_log.merge!(scout_context)
           # Naive local benchmarks show this takes around 200 microseconds. As such, we only apply it to WARN and above.
@@ -50,7 +51,7 @@ module ScoutApm
           updated_name = name.split('_').map(&:capitalize).join
 
           derived_key = "#{layer.type.downcase}_entrypoint".to_sym
-          derived_value_of_scout_name = "#{updated_name}#{layer.type.capitalize}##{action.capitalize}"
+          derived_value_of_scout_name = "#{updated_name}#{layer.type.capitalize}##{action}"
 
           { derived_key => derived_value_of_scout_name }
         end
@@ -66,6 +67,10 @@ module ScoutApm
           user_context.transform_keys { |key| "user.#{key}" }.merge(extra_context)
         end
 
+        def scout_transaction_id
+          { "scout_transaction_id": ScoutApm::RequestManager.lookup.transaction_id }
+        end
+
         def local_log_location
           # Should give us the last local stack which called the log within just the last couple frames.
           last_local_location = caller[0..15].find { |path| path.include?(Rails.root.to_s) }

data/lib/scout_apm/logging/version.rb

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

metadata

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