scout_apm_logging 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae2b293e0878164b8284f41eccec9b5b803fd5af2f2a8097730b82ef96233f1
-  data.tar.gz: aefbee4c67841da49a9feed784e285225d35c2af4d03bc8390e26699b337b2a8
+  metadata.gz: b0d9d5323e07f8b2fe838a030d93123d00a5fb6e289fe7bc78d7ac0bcc2ebc79
+  data.tar.gz: e00d25c837617410f02ec4d6523fd5afdbb37efa633b3ecaf625f5929a1b960f
 SHA512:
-  metadata.gz: 7f956d681958cedf5ca9ed0fe4b943682b3146161ed1182342c3b3e4638d93f2c9fc25d748874965acaa662e53326901db84c4bdf4256e952cc7f02e2a8ed1c7
-  data.tar.gz: 226a90d6cf105b4848e446bc14d6d1da1335cbb734ec360f8d5414c4768f12e02b3e9db7ace44a18fa726623bdf04a212f032dd93c1649c3b12f0db2d005d283
+  metadata.gz: 0d126cf0149770bb461251442e7cf2fdb40c536076d3d09131ad3d0df3763e10fb5ec4bb44ceb780b11851ab4c2276934b476033d77bcbb7fa8db7e89eed0339
+  data.tar.gz: 2c441b2bf745ca77aa154d44a536509de405051b8c363d9d8ccb95a6828fa77110b0bc3e196cf3044e7d0e1b837b295de855b428c64e8e6c7fa39d910fcb3d15

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.3
+* Add capturing of queue for background jobs.
+* Fix entrypoint name capturing for namespaced controllers.
+
+## 1.0.2
+* Fix / Re-add logging of configuration values on startup.
+* Remove raw_bytes from payload.
+
 ## 1.0.1
 * Update google-protobuf dependency to resolve to any version less than 4.x.x.
 

data/gems/rails.gemfile

@@ -1,3 +1,4 @@
 eval_gemfile("../Gemfile")
 
 gem "rails"
+gem "puma"

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

@@ -29,7 +29,6 @@ module ScoutApm
           attributes_to_log.merge!(local_log_location) if ::Logger::Severity.const_get(severity) >= ::Logger::Severity::WARN
 
           message = "#{attributes_to_log.to_json}\n"
-          attributes_to_log['raw_bytes'] = message
 
           ScoutApm::Logging::Loggers::OpenTelemetry.logger_provider.logger(
             name: 'scout_apm',
@@ -57,11 +56,18 @@ module ScoutApm
 
           return {} unless layer
 
-          name, action = layer.name.split('/')
+          layer_type = layer.type.downcase
 
-          return {} unless name
+          layer_parts = layer.name.split('/')
+          name_parts, action = if layer_type == 'controller'
+                                 [layer_parts[0..-2], layer_parts[-1]]
+                               else
+                                 [layer_parts, nil]
+                               end
 
-          updated_name = name.split('_').map(&:capitalize).join
+          return {} unless name_parts.any?
+
+          updated_name = name_parts.map(&:capitalize).map { |item| item.split('_').map(&:capitalize).join }.join('::')
 
           derived_key = "#{layer.type.downcase}_entrypoint".to_sym
 
@@ -69,10 +75,17 @@ module ScoutApm
           derived_value_of_scout_name = if action
                                           "#{updated_name}#{layer.type.capitalize}##{action}"
                                         else
-                                          name
+                                          name_parts[0]
                                         end
 
-          { derived_key => derived_value_of_scout_name }
+          {}.tap do |layer_attributes|
+            if layer_type == 'job'
+              queue = req.instance_variable_get('@layers').find { |lay| lay.type == 'Queue' }
+              layer_attributes[:job_queue] = queue.name if queue
+            end
+
+            layer_attributes[derived_key] = derived_value_of_scout_name
+          end
         end
 
         def scout_context

data/lib/scout_apm/logging/version.rb

@@ -2,6 +2,6 @@
 
 module ScoutApm
   module Logging
-    VERSION = '1.0.1'
+    VERSION = '1.0.3'
   end
 end

data/lib/scout_apm_logging.rb

@@ -17,6 +17,7 @@ module ScoutApm
         initializer 'scout_apm_logging.monitor', after: :initialize_logger, before: :initialize_cache do
           context = Context.new
           context.config = Config.with_file(context, context.config.value('config_file'))
+          context.config.log_settings(context.logger)
 
           Loggers::Capture.new(context).setup!
         end

data/spec/integration/rails/lifecycle_spec.rb

@@ -36,7 +36,7 @@ describe ScoutApm::Logging do
     sleep 5
 
     # Call the app to generate the logs
-    `curl localhost:8080`
+    `curl localhost:9292`
 
     sleep 5
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm_logging
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Scout APM
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos-types
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby Logging Support