scout_apm 3.0.0.pre9 → 3.0.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6963870425b875415255f3aa5bb51144b5fabd
-  data.tar.gz: f31e6e8780992531d3a87733b3f4ef5bc3e11ab8
+  metadata.gz: a1bbc487af5636f30f5768e6bae7e8656c24811b
+  data.tar.gz: 9e130174afe2ca2c2fb4764b7bc2bfa483ad95e5
 SHA512:
-  metadata.gz: bb4b61f29fc72f0c1eeec3c9bc2ac86b57a66605a5d8dba43612dc686d95b75c6658665d8c2106ae637c794f2a7af689796163aa31e4c8e561610a16f2064778
-  data.tar.gz: d7a9137fcdd64016a75cb74f1c4f02c653c38dff5621b6d23baaefa1c4a5657fbd13dc8d7ccd25844ee0c7ab44771becb4982754e6a48589c92624cfad012919
+  metadata.gz: 49a9d4dc629b9fa48ae63a0f4cefe67ce1eb4a5328213b83b194dfcc4ee745445d72e931ef665ffe78d2f66630e866a10815297b62d89a9e52b56361754990d8
+  data.tar.gz: c2d3469fa72ce16635ef964b0ed3c2e96e8fcdc2c006414ce098ccee9ec3cb1d4dac5ae3ad02de714b3b563e28dbd05a08e1da9c79fe08290f32beb52f9656c3

data/ext/allocations/allocations.c

@@ -8,7 +8,7 @@ VALUE mScoutApm;
 VALUE mInstruments;
 VALUE cAllocations;
 
-#ifdef RUBY_INTERNAL_EVENT_NEWOBJ
+#if defined(RUBY_INTERNAL_EVENT_NEWOBJ) && !defined(_WIN32)
 
 #include <sys/resource.h> // is this needed?
 #include <sys/time.h>

data/ext/rusage/rusage.c

@@ -1,10 +1,35 @@
 // VERSION = "x.y.z"
 #include <ruby.h>
+#ifdef _WIN32
+#define RUSAGE_SELF 0
+#define RUSAGE_CHILDREN 0
+#else
 #include <sys/resource.h>
+#endif
 
 VALUE v_usage_struct;
 
 static VALUE do_rusage_get(int who){
+#ifdef _WIN32
+  return rb_struct_new(v_usage_struct,
+      rb_float_new(0),
+      rb_float_new(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0),
+      LONG2NUM(0)
+   );
+#else // _WIN32
   struct rusage r;
   int ret;
 
@@ -30,6 +55,7 @@ static VALUE do_rusage_get(int who){
       LONG2NUM(r.ru_nvcsw),
       LONG2NUM(r.ru_nivcsw)
    );
+#endif // _WIN32
 }
 
 static VALUE rusage_get(int argc, VALUE* argv, VALUE mod){

data/ext/stacks/stacks.c

@@ -33,7 +33,10 @@
 #ifdef __linux__
 #include <sys/syscall.h>
 #endif
+
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 
 #include "scout_atomics.h"
 
@@ -77,7 +80,7 @@ const long INTERVAL = 1000; // 1ms
 
 
 
-#ifdef RUBY_INTERNAL_EVENT_NEWOBJ
+#if defined(RUBY_INTERNAL_EVENT_NEWOBJ) && !defined(_WIN32)
 
 // Forward Declarations
 static void init_thread_vars();

data/lib/scout_apm/instruments/action_controller_rails_3_rails4.rb

@@ -77,11 +77,13 @@ module ScoutApm
 
         layer = ScoutApm::Layer.new("Controller", "#{controller_path}/#{action_name}")
 
-        if ScoutApm::Agent.instance.config.value('profile')
-          # Capture ScoutProf if we can
-          req.enable_profiled_thread!
-          layer.set_root_class(self.class)
-          layer.traced!
+        if ScoutApm::Agent.instance.config.value('profile') && ScoutApm::Instruments::Stacks::ENABLED
+          if defined?(ScoutApm::Instruments::Stacks::INSTALLED) && ScoutApm::Instruments::Stacks::INSTALLED
+            # Capture ScoutProf if we can
+            req.enable_profiled_thread!
+            layer.set_root_class(self.class)
+            layer.traced!
+          end
         end
 
         # Start the layer, then execute the user's code

data/lib/scout_apm/utils/fake_stacks.rb

@@ -3,6 +3,7 @@ module ScoutApm
   module Instruments
     class Stacks
       ENABLED = false
+      INSTALLED = false
 
       class << self
         def install(*args)

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre9"
+  VERSION = "3.0.0.pre10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre9
+  version: 3.0.0.pre10
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -293,8 +293,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-test_files: []
+test_files:
+- test/data/config_test_1.yml
+- test/test_helper.rb
+- test/unit/agent_test.rb
+- test/unit/background_job_integrations/sidekiq_test.rb
+- test/unit/config_test.rb
+- test/unit/context_test.rb
+- test/unit/environment_test.rb
+- test/unit/git_revision_test.rb
+- test/unit/histogram_test.rb
+- test/unit/ignored_uris_test.rb
+- test/unit/instruments/active_record_instruments_test.rb
+- test/unit/instruments/net_http_test.rb
+- test/unit/instruments/percentile_sampler_test.rb
+- test/unit/layaway_test.rb
+- test/unit/layer_children_set_test.rb
+- test/unit/limited_layer_test.rb
+- test/unit/metric_set_test.rb
+- test/unit/scored_item_set_test.rb
+- test/unit/serializers/payload_serializer_test.rb
+- 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
+- test/unit/utils/numbers_test.rb