scout_apm 5.6.5 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a45c15600501200c54adb79600c0ff8c2c7229c6f4c8c6292804f2f10c716e2
-  data.tar.gz: d068883fec42f88524e0ccac0d84da6941a8c981c6eecb5b7e525affddb3ea77
+  metadata.gz: f2182f0bacb1555c0eb3323f8200db7f8d93068f018ce57c82bb4975361d0581
+  data.tar.gz: fd8b5694f8cacf2a648bb7a9e4440d16cb70be93c84b17db439781b01f2d5d48
 SHA512:
-  metadata.gz: 92c538b493815dd07fed71cf43bf610c109b988a8aa597647e5b0d5c854120c13c9d8f96b8c04740ece120b952327ac920d41d18589422cfd23fe84ee1cded38
-  data.tar.gz: f69b0f43b36cc020600f91c97aafe3ed523225ac87bb9b62b2764d797e8d40380381b08032303a2d1c54d5a2f02164a8086a1b55bc7ad20d12e5ccf189db2921
+  metadata.gz: e44b2bcab8ec4d818faec5b87b4068ce3be0dd37afe97e123c4920cb4d5aa3a931c550bfb80cad1e9d9b6aea6102172cedd68afaee4a1497b3948675f61e2bec
+  data.tar.gz: a2e1dd693d0fc1f43e9f68d7a3b019c1d98d879a7671c9bc38944056390d6d8f7e0af6546ec39fc95d568edc3cca12bb73621ffd39e6c6eb80295c6a34cc3c20

data/CHANGELOG.markdown

@@ -1,5 +1,9 @@
 # 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)

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/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')
 

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "5.6.5"
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 5.6.5
+  version: 5.7.0
 platform: ruby
 authors:
 - Derek Haynes