scout_apm 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2de2504dc757ce65e42e18f3fb18afa86a7e89da
-  data.tar.gz: a707556d8c0cd7423a9713dab0f25b25f0e36c8c
+  metadata.gz: 5728ecccdb01d128fdc5e222cf7db8f28078c7d1
+  data.tar.gz: 40a2a8ffe2e6a22b859a377916a6ade0777867f3
 SHA512:
-  metadata.gz: d4bee1a9d688b961fdc338d95757c38bcbe6b6bed75f84d7101a5fb85c389239bc687eb44bc2c44f2f6f909672cc717e1dc94e2e849cae227d8d2d9e493e5d3d
-  data.tar.gz: 8de5e6aed0e783986df2e5b5a2cc7c682ea95c8af8b6dff57bedb1a3131ee8fc118f8b8d8e51c3e1ff9e71818bafb86ade1e16a0cd4c4fc012b021f87d7caf2a
+  metadata.gz: f3652b37e73e8ea2c2e38297e4ca4967db8e7d4a8c485b17bb74b5b4ad68a700299aea8289ba97b504447a557203a3c28d8afc2524b6c8710884a9f378ad8742
+  data.tar.gz: 5b776864017a983996c0ef1d3c27be70bd3f6986b82d3e62a8225128af4b4f36383ad26251b4e3e65f294aee7c1b7afba0eb7c6e537c1d637755a2afc7472ac2

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.1.16
+
+* Beta support for Sinatra monitoring.
+
 # 0.1.15
 
 * Add new `application_root` option to override the autodetected location of

data/lib/scout_apm.rb

@@ -31,6 +31,7 @@ require 'scout_apm/instruments/mongoid'
 require 'scout_apm/instruments/active_record'
 require 'scout_apm/instruments/action_controller_rails_2'
 require 'scout_apm/instruments/action_controller_rails_3'
+require 'scout_apm/instruments/sinatra'
 require 'scout_apm/instruments/process/process_cpu'
 require 'scout_apm/instruments/process/process_memory'
 

data/lib/scout_apm/agent.rb

@@ -179,6 +179,7 @@ module ScoutApm
       case environment.framework
       when :rails       then install_instrument(ScoutApm::Instruments::ActionControllerRails2)
       when :rails3_or_4 then install_instrument(ScoutApm::Instruments::ActionControllerRails3)
+      when :sinatra     then install_instrument(ScoutApm::Instruments::Sinatra)
       end
 
       install_instrument(ScoutApm::Instruments::ActiveRecord)

data/lib/scout_apm/framework_integrations/sinatra.rb

@@ -10,12 +10,11 @@ module ScoutApm
       end
 
       def version
-        Sinatra::VERSION
+        ::Sinatra::VERSION
       end
 
       def present?
-        defined?(::Sinatra) &&
-          defined?(::Sinatra::Base)
+        defined?(::Sinatra) && defined?(::Sinatra::Base)
       end
 
       # TODO: Fetch the name

data/lib/scout_apm/instruments/sinatra.rb

@@ -0,0 +1,61 @@
+module ScoutApm
+  module Instruments
+    class Sinatra
+      attr_reader :logger
+
+      def initalize(logger=ScoutApm::Agent.instance.logger)
+        @logger = logger
+        @installed = false
+      end
+
+      def installed?
+        @installed
+      end
+
+      def install
+        @installed = true
+
+        if defined?(::Sinatra) && defined?(::Sinatra::Base) && ::Sinatra::Base.private_method_defined?(:dispatch!)
+          ScoutApm::Agent.instance.logger.debug "Instrumenting Sinatra"
+          ::Sinatra::Base.class_eval do
+            include ScoutApm::Tracer
+            include ScoutApm::Instruments::SinatraInstruments
+            alias dispatch_without_scout_instruments! dispatch!
+            alias dispatch! dispatch_with_scout_instruments!
+          end
+        end
+      end
+    end
+
+    module SinatraInstruments
+      def dispatch_with_scout_instruments!
+        scout_controller_action = "Controller/Sinatra/#{scout_sinatra_controller_name(@request)}"
+        self.class.scout_apm_trace(scout_controller_action, :uri => @request.path_info, :ip => @request.ip) do
+          dispatch_without_scout_instruments!
+        end
+      end
+
+      # Iterates through the app's routes, returning the matched route that the request should be 
+      # grouped under for the metric name. 
+      #
+      # If not found, "unknown" is returned. This prevents a metric explosion.
+      #
+      # Nice to have: substitute the param pattern (([^/?#]+)) w/the named key (the +key+ param of the block).
+      def scout_sinatra_controller_name(request)
+        name = 'unknown'
+        verb = request.request_method if request && request.respond_to?(:request_method) 
+        Array(self.class.routes[verb]).each do |pattern, keys, conditions, block|
+          if pattern = process_route(pattern, keys, conditions) { pattern.source }
+            name = pattern
+          end
+        end
+        name.gsub!(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
+        if verb
+          name = [verb,name].join(' ')
+        end
+        name
+      end
+    end
+  end
+end
+

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,6 +88,7 @@ files:
 - lib/scout_apm/instruments/net_http.rb
 - lib/scout_apm/instruments/process/process_cpu.rb
 - lib/scout_apm/instruments/process/process_memory.rb
+- lib/scout_apm/instruments/sinatra.rb
 - lib/scout_apm/layaway.rb
 - lib/scout_apm/layaway_file.rb
 - lib/scout_apm/metric_meta.rb