scout_apm 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e07d333b6388ad233485d64c3c1f460a0267873
-  data.tar.gz: 2fae8e481a1c38dc02aa99f77fef443bc4e30ec4
+  metadata.gz: f03097407f7dbd49d3e27cd565e9e560cde514dd
+  data.tar.gz: 6e5b6ecc1e77af62d996c2e28dd223c5c3cedbc7
 SHA512:
-  metadata.gz: 119d47bb1e32990a8841e34aca493b614b3ac060a43a77de6779e4bbf7d1b8d6be7f4630bcb5ee2672f9bb0ddb4b7a4f2e83962807d78ca0181e22d923f03a30
-  data.tar.gz: 339f928af02ecfcdbf82b546e2666f86bba4fd7aef9f34e95637992b4d61d3070873ab17dfebbcf6b5a41b06f6179cc1c3ab3b60f33dbe8cc88608d1fa77c271
+  metadata.gz: 15283444582d7b965d68b30ff095e908e0d3fd84076ecae08e8e352c0eff64001811e6e5affe7736483bb195bc478498eb07c68ca1c4662028eee3b2e7f6b899
+  data.tar.gz: ed60c8e18e26cc79b8535c4c693cac1d6fb775961a38f38cf5ce709255ff93e67d9bc950aaa7d075ec1a49d48ad1d76c52176068baac8cbdaa542b7ed5816d44

data/CHANGELOG.markdown

@@ -1,5 +1,12 @@
 # master
 
+# 2.1.6
+
+* Support older versions of Grape (0.10 onward)
+* Fix issue with complex AR queries
+* Vendor rusage library
+* Fix double-exit that caused error messages when running under Passenger
+
 # 2.1.5
 
 * Be less strict loading Rails environments that don't have a matching

data/Rakefile

@@ -3,7 +3,7 @@ require "bundler/gem_tasks"
 task :default => :test
 
 desc "Run Unit Tests"
-task :test do
+task :test => [:compile] do
   $: << File.expand_path(File.dirname(__FILE__) + "/test")
   Dir.glob('./test/**/*_test.rb').each { |file| require file }
 end
@@ -21,4 +21,5 @@ end
 # Rake Compiler
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('allocations')
+Rake::ExtensionTask.new('rusage')
 

data/ext/rusage/README.md

@@ -0,0 +1,26 @@
+This is a vendored copy of the rusage gem.
+
+
+= rusage
+
+* http://github.com/sandofsky/rusage
+
+== DESCRIPTION:
+
+A gem that calls getrusage to get details on the current process.
+
+Ripped out of the proc/wait3 library, originally written by Daniel J. Berger.
+
+http://raa.ruby-lang.org/project/proc-wait3/
+
+== LICENSE:
+
+Inherits the Artistic License 2.0 from proc/wait3.
+
+== COPYRIGHT:
+
+The original code is still copyright Daniel J. Berger.
+
+rusage gem is copyright Ben Sandofsky.
+
+Code changes after being added to this repository are copyright Zimuth, Inc.

data/ext/rusage/extconf.rb

@@ -0,0 +1,5 @@
+require 'mkmf'
+
+dir_config("rusage")
+
+create_makefile("rusage")

data/ext/rusage/rusage.c

@@ -0,0 +1,52 @@
+// VERSION = "x.y.z"
+#include <ruby.h>
+#include <sys/resource.h>
+
+VALUE v_usage_struct;
+
+static VALUE do_rusage_get(int who){
+  struct rusage r;
+  int ret;
+
+  ret = getrusage(who, &r);
+  if(ret == -1)
+    rb_sys_fail("getrusage");
+
+  return rb_struct_new(v_usage_struct,
+      rb_float_new((double)r.ru_utime.tv_sec+(double)r.ru_utime.tv_usec/1e6),
+      rb_float_new((double)r.ru_stime.tv_sec+(double)r.ru_stime.tv_usec/1e6),
+      LONG2NUM(r.ru_maxrss),
+      LONG2NUM(r.ru_ixrss),
+      LONG2NUM(r.ru_idrss),
+      LONG2NUM(r.ru_isrss),
+      LONG2NUM(r.ru_minflt),
+      LONG2NUM(r.ru_majflt),
+      LONG2NUM(r.ru_nswap),
+      LONG2NUM(r.ru_inblock),
+      LONG2NUM(r.ru_oublock),
+      LONG2NUM(r.ru_msgsnd),
+      LONG2NUM(r.ru_msgrcv),
+      LONG2NUM(r.ru_nsignals),
+      LONG2NUM(r.ru_nvcsw),
+      LONG2NUM(r.ru_nivcsw)
+   );
+}
+
+static VALUE rusage_get(int argc, VALUE* argv, VALUE mod){
+  return do_rusage_get(RUSAGE_SELF);
+}
+
+static VALUE crusage_get(int argc, VALUE* argv, VALUE mod){
+  return do_rusage_get(RUSAGE_CHILDREN);
+}
+
+void Init_rusage(){
+  v_usage_struct =
+     rb_struct_define("RUsage","utime","stime","maxrss","ixrss","idrss",
+        "isrss","minflt","majflt","nswap","inblock","oublock","msgsnd",
+        "msgrcv","nsignals","nvcsw","nivcsw",NULL
+     );
+
+  rb_define_module_function(rb_mProcess, "rusage", rusage_get, -1);
+  rb_define_module_function(rb_mProcess, "crusage", crusage_get, -1);
+}

data/lib/scout_apm/agent.rb

@@ -203,18 +203,20 @@ module ScoutApm
     # It does not attempt to actually report metrics.
     def shutdown
       logger.info "Shutting down ScoutApm"
+
       return if !started?
 
+      return if @shutdown
+      @shutdown = true
+
       if @background_worker
         logger.info("Stopping background worker")
         @background_worker.stop
         store.write_to_layaway(layaway, :force)
-      end
-
-      logger.debug "Joining background worker thread"
-      if @background_worker_thread
-        @background_worker_thread.wakeup
-        @background_worker_thread.join
+        if @background_worker_thread.alive?
+          @background_worker_thread.wakeup
+          @background_worker_thread.join
+        end
       end
     end
 

data/lib/scout_apm/instruments/grape.rb

@@ -29,9 +29,10 @@ module ScoutApm
     end
 
     module GrapeEndpointInstruments
-      def run_with_scout_instruments
-        request = ::Grape::Request.new(env)
+      def run_with_scout_instruments(*args)
+        request = ::Grape::Request.new(env || args.first)
         req = ScoutApm::RequestManager.lookup
+
         path = ScoutApm::Agent.instance.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
         req.annotate_request(:uri => path)
 
@@ -55,7 +56,7 @@ module ScoutApm
 
         req.start_layer( ScoutApm::Layer.new("Controller", name) )
         begin
-          run_without_scout_instruments
+          run_without_scout_instruments(*args)
         rescue
           req.error!
           raise

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end
 

data/scout_apm.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib","data"]
   s.extensions << 'ext/allocations/extconf.rb'
-
-  s.add_runtime_dependency "rusage", '~> 0.2.0'
+  s.extensions << 'ext/rusage/extconf.rb'
 
   s.add_development_dependency "minitest"
   s.add_development_dependency 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Derek Haynes
@@ -11,20 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rusage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +101,7 @@ email:
 executables: []
 extensions:
 - ext/allocations/extconf.rb
+- ext/rusage/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -127,6 +114,9 @@ files:
 - data/cacert.pem
 - ext/allocations/allocations.c
 - ext/allocations/extconf.rb
+- ext/rusage/README.md
+- ext/rusage/extconf.rb
+- ext/rusage/rusage.c
 - lib/scout_apm.rb
 - lib/scout_apm/agent.rb
 - lib/scout_apm/agent/logging.rb