scout_apm 2.0.0.pre6 → 2.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629d6c7e70f5046f27c34c596820d6c2301f7119
-  data.tar.gz: d3ac77c6e67dcf4a2b011ac927e05989351dbcdc
+  metadata.gz: c342425ce84acb55c8b62c2674eb94ec618746e6
+  data.tar.gz: 64d5f991d966e16b108ab7e61737c4f6836958b2
 SHA512:
-  metadata.gz: 684890528a259f0b6c50a5e1997c79bf1edbd3277221d14ae8551efc0ef08c3a59c1323a7124ac52214de7cf821b9de1a69a745076c969b371d88a3fc07668fb
-  data.tar.gz: fec408cb81a6c50536a7c63069e73027b629926c4a32f549ad9789dac0475d19447ae53214945fd81a3ed627e7aa16a8ebafb178c1294675efbcbfc893b3622a
+  metadata.gz: fe0fc8bd013cb679a6eefcae6523fd7dd61023189550f4e2dd1d865328d6bfb40d04186496b3dd9184d02937e578fb8dee74e88028d2dc68d3ccbc40ab937256
+  data.tar.gz: 6fd06f39a67c1f44549cb06c31129866cdf37a9f442225ff469667a86bab9a495252a4c6ac5c93135a54293df4e886743cad20d49cad78ccd9921b9704b73fe7

data/CHANGELOG.markdown

@@ -1,4 +1,3 @@
-
 # 2.0.0
 
 * Reporting object allocation metrics and mem delta with slow requests and jobs.
@@ -11,6 +10,16 @@
 * Remove unused & old references to Stackprof
 * Fixing exception on load if no config file is provided
 
+# 1.6.4
+
+* Add Grape instrumentation
+* Handle DATABASE_URL configurations better
+* Change default (undeteced) database to Postgres (was Mysql)
+
+# 1.6.3
+
+* Handle nil ignore_traces when ignoring trace patterns
+
 # 1.6.2
 
 * Use a more flexible approach to storing "Layaway Files" (the temporary data

data/lib/scout_apm.rb

@@ -79,6 +79,7 @@ require 'scout_apm/instruments/action_controller_rails_3_rails4'
 require 'scout_apm/instruments/middleware_summary'
 # require 'scout_apm/instruments/middleware_detailed' # Currently disabled functionality, see the file for details.
 require 'scout_apm/instruments/rails_router'
+require 'scout_apm/instruments/grape'
 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

@@ -291,6 +291,7 @@ module ScoutApm
       install_instrument(ScoutApm::Instruments::Redis)
       install_instrument(ScoutApm::Instruments::InfluxDB)
       install_instrument(ScoutApm::Instruments::Elasticsearch)
+      install_instrument(ScoutApm::Instruments::Grape)
     rescue
       logger.warn "Exception loading instruments:"
       logger.warn $!.message

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -34,7 +34,7 @@ module ScoutApm
 
       def database_engine
         return @database_engine if @database_engine
-        default = :mysql
+        default = :postgres
 
         @database_engine = if defined?(ActiveRecord::Base)
           adapter = get_database_adapter # can be nil
@@ -54,10 +54,20 @@ module ScoutApm
       end
 
       def get_database_adapter
-        ActiveRecord::Base.configurations[env]["adapter"]
+        adapter = if ActiveRecord::Base.respond_to?(:connection_config)
+                    ActiveRecord::Base.connection_config[:adapter].to_s
+                  else
+                    nil
+                  end
+
+        if adapter.nil?
+          adapter = ActiveRecord::Base.configurations[env]["adapter"]
+        end
+
+        return adapter
       rescue # this would throw an exception if ActiveRecord::Base is defined but no configuration exists.
         nil
       end
     end
   end
-end
+end

data/lib/scout_apm/instruments/grape.rb

@@ -0,0 +1,69 @@
+module ScoutApm
+  module Instruments
+    class Grape
+      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?(::Grape) && defined?(::Grape::Endpoint)
+          ScoutApm::Agent.instance.logger.info "Instrumenting Grape::Endpoint"
+
+          ::Grape::Endpoint.class_eval do
+            include ScoutApm::Instruments::GrapeEndpointInstruments
+
+            alias run_without_scout_instruments run
+            alias run run_with_scout_instruments
+          end
+        end
+      end
+    end
+
+    module GrapeEndpointInstruments
+      def run_with_scout_instruments
+        request = ::Grape::Request.new(env)
+        req = ScoutApm::RequestManager.lookup
+        path = ScoutApm::Agent.instance.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
+        req.annotate_request(:uri => path)
+
+        # IP Spoofing Protection can throw an exception, just move on w/o remote ip
+        req.context.add_user(:ip => request.ip) rescue nil
+
+        req.set_headers(request.headers)
+        req.web!
+
+        begin
+          name = ["Grape",
+                  self.options[:method].first,
+                  self.options[:for].to_s,
+                  self.namespace.sub(%r{\A/}, ''), # removing leading slashes
+                  self.options[:path].first,
+          ].compact.map{ |n| n.to_s }.join("/")
+        rescue => e
+          ScoutApm::Agent.instance.logger.info("Error getting Grape Endpoint Name. Error: #{e.message}. Options: #{self.options.inspect}")
+          name = "Grape/Unknown"
+        end
+
+        req.start_layer( ScoutApm::Layer.new("Controller", name) )
+        begin
+          run_without_scout_instruments
+        rescue
+          req.error!
+          raise
+        ensure
+          req.stop_layer
+        end
+      end
+    end
+  end
+end
+

data/lib/scout_apm/layer_converters/slow_request_converter.rb

@@ -39,7 +39,7 @@ module ScoutApm
           allocation_metrics = {}
         end
 
-        ScoutApm::Agent.instance.config.value("ignore_traces").each do |pattern|
+        (ScoutApm::Agent.instance.config.value("ignore_traces") || []).each do |pattern|
           if /#{pattern}/ =~ uri
             ScoutApm::Agent.instance.logger.debug("Skipped recording a trace for #{uri} due to `ignore_traces` pattern: #{pattern}")
             return nil

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.0.0.pre6"
+  VERSION = "2.0.0.pre7"
 end
 

data/scout_apm.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/scoutapp/scout_apm_ruby"
   s.summary     = "Ruby application performance monitoring"
   s.description = "Monitors Ruby apps and reports detailed metrics on performance to Scout."
+  s.license     = "Proprietary (See LICENSE.md)"
 
   s.rubyforge_project = "scout_apm"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre6
+  version: 2.0.0.pre7
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rusage
@@ -146,6 +146,7 @@ files:
 - lib/scout_apm/instruments/active_record.rb
 - lib/scout_apm/instruments/delayed_job.rb
 - lib/scout_apm/instruments/elasticsearch.rb
+- lib/scout_apm/instruments/grape.rb
 - lib/scout_apm/instruments/http_client.rb
 - lib/scout_apm/instruments/influxdb.rb
 - lib/scout_apm/instruments/middleware_detailed.rb
@@ -236,7 +237,8 @@ files:
 - test/unit/sql_sanitizer_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
 homepage: https://github.com/scoutapp/scout_apm_ruby
-licenses: []
+licenses:
+- Proprietary (See LICENSE.md)
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -255,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring