scout_apm 2.2.0.pre1 → 2.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b5ba56e4b5d547ab50ca2c7bf9de7ad51175b4
-  data.tar.gz: d8a85c252b959e001d5b92498de94ab844a76f6b
+  metadata.gz: 9b1ea1128aa9aa0aa0b5086860810f324ffe732c
+  data.tar.gz: 00e3f0e517bfb8b580205bd7709a040fd13d611a
 SHA512:
-  metadata.gz: 49365dc262bd4065eb827c3affc362d02e82b25e1638d67912f2d32ed2ac75bd08c490cb6a5071d9d352ce0f0b9a0531d8adea657c39f42913f28291f961eed3
-  data.tar.gz: e931e86d96b7baf0a7fc329e17ce0683f953085b95cc6a01ca2ef67d13d1ba556d346a675fc96e9738ab65f5f2771fb90e49a2539952246f417873a3eebf16c1
+  metadata.gz: bea83409eb9f21cccbfc9aeeeeae3f4a22113cfdd13fa1f51ede6df3422ed5a0d2b7a15d922c7d132632c486430372c68616482b9d2356fd80689ba0cf9d74e8
+  data.tar.gz: 43c32ce10c3e01134904e19a1d2068c1b4a06ac928d44dbb3f1fd46e781ab98414737f9c004858f3ced00fe29534f91af0804f9b2559364ac3e15ad856020918

data/ext/stacks/stacks.c

@@ -69,6 +69,12 @@ const long INTERVAL = 1000; // 1ms
 
 #endif
 
+#ifdef T_IMEMO
+#define VALID_RUBY_FRAME T_IMEMO
+#else
+#define VALID_RUBY_FRAME T_DATA
+#endif
+
 
 
 #ifdef RUBY_INTERNAL_EVENT_NEWOBJ
@@ -403,7 +409,7 @@ static VALUE rb_scout_profile_frames(VALUE self)
       if (_traces[i].num_tracelines > 0) {
         trace = rb_ary_new2(_traces[i].num_tracelines);
         for(n = 0; n < _traces[i].num_tracelines; n++) {
-          if (TYPE(_traces[i].frames_buf[n]) == RUBY_T_DATA) { // We should always get valid frames from rb_profile_frames, but that doesn't always seem to be the case
+          if (TYPE(_traces[i].frames_buf[n]) == VALID_RUBY_FRAME) { // We should always get valid frames from rb_profile_frames, but that doesn't always seem to be the case
             trace_line = rb_ary_new2(2);
             rb_ary_store(trace_line, 0, _traces[i].frames_buf[n]);
             rb_ary_store(trace_line, 1, INT2FIX(_traces[i].lines_buf[n]));

data/lib/scout_apm.rb

@@ -165,6 +165,8 @@ if defined?(Rails) && defined?(Rails::VERSION) && defined?(Rails::VERSION::MAJOR
     end
     class Railtie < Rails::Railtie
       initializer 'scout_apm.start' do |app|
+        # Install the middleware every time in development mode.
+        # The middleware is a noop if dev_trace is not enabled in config
         if Rails.env.development?
           app.middleware.use ScoutApm::Instant::Middleware
         end

data/lib/scout_apm/agent.rb

@@ -112,7 +112,10 @@ module ScoutApm
     # It initializes the agent and starts the worker thread (if appropiate).
     def start(options = {})
       @options.merge!(options)
+
       @config = ScoutApm::Config.with_file(@config.value("config_file"))
+      layaway.config = config
+
       init_logger
       logger.info "Attempting to start Scout Agent [#{ScoutApm::VERSION}] on [#{environment.hostname}]"
 

data/lib/scout_apm/instant/middleware.rb

@@ -41,8 +41,7 @@ module ScoutApm
     # Note that this middleware never even gets inserted unless Rails environment is development (See Railtie)
     class Middleware
       def initialize(app)
-        ScoutApm::Agent.instance.logger.info("Activating Scout DevTrace because environment=development and dev_trace=true in scout_apm config")
-        @app        = app
+        @app = app
       end
 
       def call(env)

data/lib/scout_apm/layaway.rb

@@ -18,7 +18,7 @@ module ScoutApm
     # Must be sortable as an integer
     TIME_FORMAT = "%Y%m%d%H%M"
 
-    attr_reader :config
+    attr_accessor :config
     attr_reader :environment
 
     def initialize(config, environment)

data/lib/scout_apm/store.rb

@@ -69,14 +69,19 @@ module ScoutApm
 
       @mutex.synchronize {
         reporting_periods.select { |time, rp| force || time.timestamp < current_timestamp.timestamp}.
-                          each   { |time, rp|
-                                   collect_samplers(rp)
-                                   layaway.write_reporting_period(rp)
-                                   reporting_periods.delete(time)
-                                 }
+                          each   { |time, rp| write_reporting_period(layaway, time, rp) }
       }
     end
 
+    def write_reporting_period(layaway, time, rp)
+      collect_samplers(rp)
+      layaway.write_reporting_period(rp)
+    rescue => e
+      ScoutApm::Agent.instance.logger.warn("Failed writing data to layaway file: #{e.message} / #{e.backtrace}")
+    ensure
+      reporting_periods.delete(time)
+    end
+
     ######################################
     # Sampler support
     def add_sampler(sampler)

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.2.0.pre1"
+  VERSION = "2.2.0.pre2"
 end
 

data/test/unit/store_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+require 'scout_apm/store'
+
+class FakeFailingLayaway
+  def write_reporting_period(rp)
+    raise "Always fails. Sucks."
+  end
+end
+
+class StoreTest < Minitest::Test
+  # TODO: Introduce a clock object to avoid having to use 'force'
+  def test_writing_layaway_removes_timestamps
+    s = ScoutApm::Store.new
+    s.track_one!("Controller", "user/show", 10)
+
+    assert_equal(1, s.reporting_periods.size)
+
+    s.write_to_layaway(FakeFailingLayaway.new, true)
+
+    assert_equal({}, s.reporting_periods)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre1
+  version: 2.2.0.pre2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rusage
@@ -241,6 +241,7 @@ files:
 - test/unit/slow_job_policy_test.rb
 - test/unit/slow_request_policy_test.rb
 - test/unit/sql_sanitizer_test.rb
+- test/unit/store_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
 - test/unit/utils/backtrace_parser_test.rb
 - tester.rb