scout_apm 5.6.4 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c929de92cd0a3b2690bac6ef665c8c4d7187dd3ecc838cc881033d8cf5c413c
-  data.tar.gz: 3148b06815beb3e506e271bb560fb700b5882d503c1a94f646011117ee424d9b
+  metadata.gz: f2182f0bacb1555c0eb3323f8200db7f8d93068f018ce57c82bb4975361d0581
+  data.tar.gz: fd8b5694f8cacf2a648bb7a9e4440d16cb70be93c84b17db439781b01f2d5d48
 SHA512:
-  metadata.gz: 28afece432426708eb8ce9bdb527dddd2820261574ca299887ba1294ecc98b34663c04dc15c9cf0ffb78f5211abb9b8d78ba6e202c7a6d28867edda65727b902
-  data.tar.gz: 3e81497fa32092e4f037d272ee1a76f555bd9a557c9855a304e96acc93cdedaf24e0a4b21d86e895dddb1db569ec35954cbff30340f8e9803b7d799b28866522
+  metadata.gz: e44b2bcab8ec4d818faec5b87b4068ce3be0dd37afe97e123c4920cb4d5aa3a931c550bfb80cad1e9d9b6aea6102172cedd68afaee4a1497b3948675f61e2bec
+  data.tar.gz: a2e1dd693d0fc1f43e9f68d7a3b019c1d98d879a7671c9bc38944056390d6d8f7e0af6546ec39fc95d568edc3cca12bb73621ffd39e6c6eb80295c6a34cc3c20

data/CHANGELOG.markdown

@@ -1,5 +1,14 @@
 # Unreleased
 
+# 5.7.0
+- Fix native extension compilation with GCC 15 (#552)
+- Handle non Rails/ActiveSupport applications w/ sampling (#557)
+
+# 5.6.5
+- Improve error capture API (#555)
+- Add git sha and agent time tracking to error payloads (#554)
+- Add support for named spaced jobs in sampling (#549)
+
 # 5.6.4
 - Use new ActiveJob class name and timestamp units for Sidekiq 8+ (#544)
 

data/ext/allocations/allocations.c

@@ -1,26 +1,38 @@
-#ifdef HAVE_RUBY_RUBY_H
-#include <ruby/ruby.h>
-#else // Ruby <= 1.8.7
 #include <ruby.h>
-#endif
 
 VALUE mScoutApm;
 VALUE mInstruments;
 VALUE cAllocations;
 
-#if defined(RUBY_INTERNAL_EVENT_NEWOBJ) && !defined(_WIN32)
+#ifdef _WIN32
+
+#define ALLOCATIONS_ENABLED Qfalse
+
+static VALUE
+get_allocation_count(VALUE klass) {
+  return ULL2NUM(0);
+}
+
+void
+Init_hooks(VALUE module)
+{
+}
+
+#else // _WIN32
 
 #include <sys/resource.h> // is this needed?
 #include <sys/time.h>
 #include <ruby/debug.h>
 
+#define ALLOCATIONS_ENABLED Qtrue
+
 static __thread uint64_t endpoint_allocations;
 void increment_allocations() {
   endpoint_allocations++;
 }
 
 static VALUE
-get_allocation_count() {
+get_allocation_count(VALUE klass) {
   return ULL2NUM(endpoint_allocations);
 }
 
@@ -50,28 +62,7 @@ Init_hooks(VALUE module)
     set_gc_hook(RUBY_INTERNAL_EVENT_NEWOBJ);
 }
 
-void Init_allocations()
-{
-    mScoutApm = rb_define_module("ScoutApm");
-    mInstruments = rb_define_module_under(mScoutApm, "Instruments");
-    cAllocations = rb_define_class_under(mInstruments, "Allocations", rb_cObject);
-    rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
-    rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
-    rb_define_const(cAllocations, "ENABLED", Qtrue);
-    Init_hooks(mScoutApm);
-}
-
-#else
-
-static VALUE
-get_allocation_count() {
-  return ULL2NUM(0);
-}
-
-void
-Init_hooks(VALUE module)
-{
-}
+#endif // _WIN32
 
 void Init_allocations()
 {
@@ -79,10 +70,6 @@ void Init_allocations()
     mInstruments = rb_define_module_under(mScoutApm, "Instruments");
     cAllocations = rb_define_class_under(mInstruments, "Allocations", rb_cObject);
     rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
-    rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
-    rb_define_const(cAllocations, "ENABLED", Qfalse);
+    rb_define_const(cAllocations, "ENABLED", ALLOCATIONS_ENABLED);
     Init_hooks(mScoutApm);
 }
-
-#endif //#ifdef RUBY_INTERNAL_EVENT_NEWOBJ
-

data/ext/allocations/extconf.rb

@@ -1,4 +1,3 @@
 require 'mkmf'
 
-have_header("ruby/ruby.h") # Needed to check for Ruby <= 1.8.7
-create_makefile('allocations')
+create_makefile('allocations')

data/lib/scout_apm/config.rb

@@ -290,6 +290,12 @@ module ScoutApm
       coercion.coerce(raw_value)
     end
 
+    # https://github.com/rails/rails/blob/aca037411eab504a48c41472e696547da1543a19/activesupport/lib/active_support/core_ext/object/blank.rb#L25
+    def value_present?(key)
+      val = value(key)
+      val.respond_to?(:empty?) ? !val.empty? : false
+    end
+
     # Did we load anything for configuration?
     def any_keys_found?
       @overlays.any? { |overlay| overlay.any_keys_found? }

data/lib/scout_apm/error.rb

@@ -5,23 +5,77 @@ module ScoutApm
   module Error
     # Capture an exception, optionally with an environment hash. This may be a
     # Rack environment, but is not required.
-    def self.capture(exception, env={})
-      context = ScoutApm::Agent.instance.context
+    class ScoutDefined < Exception; end
+    class Custom < ScoutDefined; end
+      
+    class << self
+      def capture(exception, env={}, name: "ScoutApm::Error::Custom")
+        context = ScoutApm::Agent.instance.context
 
-      # Skip if error monitoring isn't enabled at all
-      if ! context.config.value("errors_enabled")
-        return false
+        # Skip if error monitoring isn't enabled at all
+        if ! context.config.value("errors_enabled")
+          return false
+        end
+
+        exception = validate_or_create_exception(exception, name)
+        return false unless exception
+
+        # Skip if this one error is ignored
+        if context.ignored_exceptions.ignored?(exception)
+          return false
+        end
+
+        # Capture the error for further processing and shipping
+        context.error_buffer.capture(exception, env)
+
+        return true
+      end
+
+      private
+
+      def get_caller_location
+        caller_locations(0, 10)
+          .reject { |loc| loc.absolute_path == __FILE__ }
+          .map(&:to_s)
+      end
+      
+      def define_error_class(name_str)
+        # e.g., "some_error" → "SomeError", "some error" → "SomeError"
+        class_name = name_str.gsub(/(?:^|[_\s])([a-zA-Z])/) { $1.upcase }
+
+        if Object.const_defined?(class_name)
+          klass = Object.const_get(class_name)
+          return klass if klass.ancestors.include?(ScoutApm::Error::ScoutDefined)
+          
+          log_warning("Error class name '#{class_name}' is already defined. Falling back to ScoutApm::Error::Custom.")
+          return Custom
+        else
+          Object.const_set(class_name, Class.new(ScoutDefined))
+        end
       end
 
-      # Skip if this one error is ignored
-      if context.ignored_exceptions.ignored?(exception)
-        return false
+      def log_warning(message)
+        ScoutApm::Agent.instance.context.logger.warn(message)
       end
 
-      # Capture the error for further processing and shipping
-      context.error_buffer.capture(exception, env)
+      def validate_or_create_exception(exception, name)
+        return exception if exception.is_a?(Exception) && exception.backtrace
 
-      return true
+        if exception.is_a?(Exception)
+          exception.tap do |e| 
+            e.set_backtrace(get_caller_location)
+          end
+
+        elsif exception.is_a?(String)
+          define_error_class(name).new(exception).tap do |e|
+            e.set_backtrace(get_caller_location)
+          end
+
+        else
+          log_warning("Invalid exception type: #{exception.class}. Expected Exception or String.")
+          nil
+        end
+      end
     end
   end
 end

data/lib/scout_apm/error_service/error_record.rb

@@ -12,6 +12,8 @@ module ScoutApm
       attr_reader :trace
       attr_reader :request_components
       attr_reader :context
+      attr_reader :agent_time
+      attr_reader :git_sha
 
       def initialize(agent_context, exception, env, context=nil)
         @agent_context = agent_context
@@ -30,6 +32,8 @@ module ScoutApm
         @environment = clean_params(strip_env(env))
         @trace = clean_backtrace(exception.backtrace)
         @request_components = components(env)
+        @agent_time = Time.now.iso8601
+        @git_sha = @agent_context.environment.git_revision.sha.to_s
       end
 
       # TODO: This is rails specific

data/lib/scout_apm/error_service/payload.rb

@@ -40,6 +40,8 @@ module ScoutApm
           :trace => error_record.trace,
           :request_components => error_record.request_components,
           :context => error_record.context,
+          :agent_time => error_record.agent_time,
+          :git_sha => error_record.git_sha,
         }
       end
     end

data/lib/scout_apm/sampling.rb

@@ -8,7 +8,7 @@ module ScoutApm
       # jobs matched explicitly by name
 
       # for now still support old config key ('ignore') for backwards compatibility
-      @ignore_endpoints = config.value('ignore').present? ? config.value('ignore') : config.value('ignore_endpoints')
+      @ignore_endpoints = config.value_present?('ignore') ? config.value('ignore') : config.value('ignore_endpoints')
       @sample_endpoints = individual_sample_to_hash(config.value('sample_endpoints'))
       @endpoint_sample_rate = config.value('endpoint_sample_rate')
 
@@ -58,7 +58,7 @@ module ScoutApm
       # config looks like ['/foo:50','/bar:100']. parse it into hash of string: integer
       sample_hash = {}
       sampling_config.each do |sample|
-        path, rate = sample.split(':')
+        path, _, rate = sample.rpartition(':')
         sample_hash[path] = rate.to_i
       end
       sample_hash

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "5.6.4"
+  VERSION = "5.7.0"
 end

data/test/test_helper.rb

@@ -37,6 +37,11 @@ class FakeConfigOverlay
   def value(key)
     @values[key]
   end
+  
+  def value_present?(key)
+    val = value(key)
+    val.respond_to?(:empty?) ? !val.empty? : false
+  end
 
   def values
     @values

data/test/unit/error_test.rb

@@ -0,0 +1,69 @@
+require "test_helper"
+
+class ErrorTest < Minitest::Test
+  class FakeError < StandardError
+  end
+
+  def test_captures_and_stores_exceptions_and_env
+    config = make_fake_config(
+      'errors_enabled' => true,
+    )
+    test_context = ScoutApm::AgentContext.new().tap{|c| c.config = config }
+    ScoutApm::Agent.instance.stub(:context, test_context) do
+      exwbt = ex.tap do |e|
+        e.set_backtrace(["/path/to/file.rb:10:in `method_name'"])
+      end
+      assert_equal true, ScoutApm::Error.capture("Oh no an error") # Will be of type ScoutApm::Error::Custom
+      assert_equal true, ScoutApm::Error.capture("Oh no another error") # Will be of type ScoutApm::Error::Custom
+      assert_equal true, ScoutApm::Error.capture("Something went boom", {"boom" => "yes"}, name: "boom_error")
+      assert_equal true, ScoutApm::Error.capture("No env", name: "another error")
+      assert_equal true, ScoutApm::Error.capture(ex, env)
+      assert_equal true, ScoutApm::Error.capture(exwbt, env)
+      assert_equal false, ScoutApm::Error.capture(Class, env)
+      assert_equal true, ScoutApm::Error.capture("Name collision, but", env, name: "ScoutApm")
+      
+      begin
+        raise StandardError, "Whoops"
+      rescue StandardError => e
+        assert_equal true, ScoutApm::Error.capture(e, env)
+      end
+
+      exceptions = ScoutApm::Agent.instance.context.error_buffer.instance_variable_get(:@error_records)
+
+      assert_equal 8, exceptions.length
+      assert_equal "Oh no an error", exceptions[0].message
+      assert_equal "ScoutApm::Error::Custom", exceptions[0].exception_class
+
+      # Ensure we capture time and git sha
+      refute_nil exceptions[0].git_sha
+      assert exceptions[0].agent_time.is_a?(String)
+
+      assert_equal "Oh no another error", exceptions[1].message
+      assert_equal "ScoutApm::Error::Custom", exceptions[1].exception_class
+
+      assert_equal "Something went boom", exceptions[2].message
+      assert_equal "BoomError", exceptions[2].exception_class
+
+      assert_equal "No env", exceptions[3].message
+      assert_equal "AnotherError", exceptions[3].exception_class
+
+      assert_equal "Whoops", exceptions[4].message
+      assert_equal "ErrorTest::FakeError", exceptions[4].exception_class
+
+      assert_equal "/path/to/file.rb:10:in `method_name'", exceptions[5].trace.first
+
+      assert_equal "ScoutApm::Error::Custom", exceptions[6].exception_class
+
+      assert_equal "StandardError", exceptions[7].exception_class
+    end
+  end
+
+  #### Helpers
+  def env
+    {}
+  end
+
+  def ex(msg="Whoops")
+    FakeError.new(msg)
+  end
+end

data/test/unit/sampling_test.rb

@@ -15,7 +15,7 @@ class SamplingTest < Minitest::Test
         {
           'sample_endpoints' => ['/foo/bar:100', '/foo:50', '/bar/zap:80'],
           'ignore_endpoints' => ['/baz'],
-          'sample_jobs' => ['joba:50'],
+          'sample_jobs' => ['joba:50', 'Foo::BarJob:95'],
           'ignore_jobs' => 'jobb,jobc',
         }
       )
@@ -59,6 +59,7 @@ class SamplingTest < Minitest::Test
     def test_job_sample
       sampling = ScoutApm::Sampling.new(@individual_config)
       assert_equal 50, sampling.job_sample_rate('joba')
+      assert_equal 95, sampling.job_sample_rate('Foo::BarJob')
       assert_nil sampling.job_sample_rate('jobb')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 5.7.0
 platform: ruby
 authors:
 - Derek Haynes
 - Andre Lewis
 bindir: bin
 cert_chain: []
-date: 2025-04-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -443,6 +443,7 @@ files:
 - test/unit/environment_test.rb
 - test/unit/error_service/error_buffer_test.rb
 - test/unit/error_service/ignored_exceptions_test.rb
+- test/unit/error_test.rb
 - test/unit/extensions/periodic_callbacks_test.rb
 - test/unit/extensions/transaction_callbacks_test.rb
 - test/unit/external_service_metric_set_test.rb
@@ -508,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby application performance monitoring
 test_files: []