scout_apm 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e481167b7a01f99085ecca7253e31993282f410
-  data.tar.gz: 745e06449927e08332c7fefe0258e516b8a84032
+  metadata.gz: b4a68db2ae2d5615f89aacc3c015909ee24bc49f
+  data.tar.gz: e21486b451e768a573c10615042c9b2d183bbb47
 SHA512:
-  metadata.gz: 0fa9edba8ea58d71e7d7a65a83861edfd2674eb074c0dd0ef4db00739ebeb904a0fcde29159f541331eba7c4628a52048c14d60f4abb279ab641427f928f3f14
-  data.tar.gz: 499cb503dcc1cbc3861698f62bbae753778b32f036a1824e8e37be18e68f7660e455904c4baf16023643c3545a1716f8e0e086b773d48499e2d01c7a1beadc35
+  metadata.gz: b6c77fd02eb44509a79f883e27ff4e306e6c96cf063481a617968d0e3b5bd8d6ad9125b3b39247879dfa3c0daba032a48f74c2ddce392fa87864d45aae5a35dd
+  data.tar.gz: feaf556828e488ebc3c15d951af248ede825af9b2a47b8a13428da6516e4ae377c672564e1594c42370368f784b0d68f2b4eff4d1d82d152a6ad5206d0122a0e

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 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

data/lib/scout_apm.rb

@@ -77,6 +77,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

@@ -272,6 +272,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/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 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: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -111,6 +111,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
@@ -199,7 +200,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: []
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.6
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
@@ -239,3 +241,4 @@ test_files:
 - test/unit/slow_request_policy_test.rb
 - test/unit/sql_sanitizer_test.rb
 - test/unit/utils/active_record_metric_name_test.rb
+has_rdoc: