scout_apm 3.0.0.pre0 → 3.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa1d7b25baf3d94a547899966b95419ac560d07
-  data.tar.gz: d6201d2acc85f2e94c92315b8193d110a4febd0a
+  metadata.gz: d4de385d6ffca53d6dd6e5de87fdc5e89fba54a3
+  data.tar.gz: 5147b662a5b8c7454b8fdf50d6e82cc24c6cbbf7
 SHA512:
-  metadata.gz: 9a125da761d39c62094fc48ca66163bac787c0de62e9b6a3f38e984ae2ab8f41dcc7d271519764694c6b9a194e084c626bbf7b042a364ee56afe524c912fd83a
-  data.tar.gz: cce9304bd70490eb711c92a6df03d656710c01eb0343f809e58d0bb49c02ec152a99f668b21f7e51424aec34e432286c0ec83f7cdc74cdc994300ae6aa0b4ed6
+  metadata.gz: 790273c395b6b7f96bc0ca6a260a3372ca931362991553a9d7fb544d30959c769552532e1873bd0b2d4e9e6e0f86e5567964a75f8b75cb66c8d67f411a1a2384
+  data.tar.gz: 37ab78f6e6f001ae3c82729daf9b1a008c61d5e70d9139795d4b80ae172de5100a82efe57ba3890301172902aa486a8404e8779914448c8b146584c246e8d0c4

data/CHANGELOG.markdown

@@ -1,11 +1,19 @@
-# 2.2.0
+# 3.0.0
 
 * ScoutProf BETA
 
+# 2.1.8
+
+* Adds Git revision detection, which is reported on app load and associated with transaction traces
+
+# 2.1.7
+
+* Fix allocations extension compilation on Ruby 1.8.7
+>>>>>>> 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
 

data/Rakefile

@@ -23,4 +23,3 @@ require 'rake/extensiontask'
 Rake::ExtensionTask.new('allocations')
 Rake::ExtensionTask.new('stacks')
 Rake::ExtensionTask.new('rusage')
-

data/ext/allocations/allocations.c

@@ -1,4 +1,8 @@
+#ifdef HAVE_RUBY_RUBY_H
 #include <ruby/ruby.h>
+#else // Ruby <= 1.8.7
+#include <ruby.h>
+#endif
 
 VALUE mScoutApm;
 VALUE mInstruments;

data/ext/allocations/extconf.rb

@@ -1,3 +1,4 @@
 require 'mkmf'
 
+have_header("ruby/ruby.h") # Needed to check for Ruby <= 1.8.7
 create_makefile('allocations')

data/lib/scout_apm/agent.rb

@@ -121,11 +121,6 @@ module ScoutApm
 
       @ignored_uris = ScoutApm::IgnoredUris.new(config.value('ignore'))
 
-      if environment.deploy_integration
-        logger.info "Starting monitoring for [#{environment.deploy_integration.name}]]."
-        return environment.deploy_integration.install
-      end
-
       load_instruments if should_load_instruments?(options)
 
       return false unless preconditions_met?(options)
@@ -330,10 +325,6 @@ module ScoutApm
       instance.install
     end
 
-    def deploy_integration
-      environment.deploy_integration
-    end
-
     def app_server_missing?(options = {})
       !environment.app_server_integration(true).found? && !options[:skip_app_server_check]
     end

data/lib/scout_apm/app_server_load.rb

@@ -38,7 +38,8 @@ module ScoutApm
         :database_adapter   => ScoutApm::Environment.instance.raw_database_adapter, # Raw
         :application_name   => ScoutApm::Environment.instance.application_name,
         :libraries          => ScoutApm::Utils::InstalledGems.new.run,
-        :paas               => ScoutApm::Environment.instance.platform_integration.name
+        :paas               => ScoutApm::Environment.instance.platform_integration.name,
+        :git_sha            => ScoutApm::Environment.instance.git_revision.sha
       }
     end
   end

data/lib/scout_apm/environment.rb

@@ -41,13 +41,8 @@ module ScoutApm
       ScoutApm::PlatformIntegrations::Server.new,
     ]
 
-    DEPLOY_INTEGRATIONS = [
-      ScoutApm::DeployIntegrations::Capistrano3.new(STDOUT_LOGGER),
-      # ScoutApm::DeployIntegrations::Capistrano2.new(STDOUT_LOGGER),
-    ]
-
     def env
-      @env ||= deploy_integration? ? deploy_integration.env : framework_integration.env
+      @env ||= framework_integration.env
     end
 
     def framework
@@ -88,7 +83,7 @@ module ScoutApm
     end
 
     def root
-      @root ||= deploy_integration? ? deploy_integration.root : framework_root
+      @root ||= framework_root
     end
 
     def framework_root
@@ -110,6 +105,10 @@ module ScoutApm
       @hostname ||= Agent.instance.config.value("hostname") || platform_integration.hostname
     end
 
+    def git_revision
+      @git_revision ||= ScoutApm::GitRevision.new
+    end
+
     # Returns the whole integration object
     # This needs to be improved. Frequently, multiple app servers gem are present and which
     # ever is checked first becomes the designated app server.
@@ -143,14 +142,6 @@ module ScoutApm
       background_job_integration && background_job_integration.name
     end
 
-    def deploy_integration
-      @deploy_integration ||= DEPLOY_INTEGRATIONS.detect{ |integration| integration.present? }
-    end
-
-    def deploy_integration?
-      !@deploy_integration.nil?
-    end
-
     ### ruby checks
 
     def rubinius?

data/lib/scout_apm/git_revision.rb

@@ -0,0 +1,51 @@
+module ScoutApm
+  class GitRevision
+
+    attr_accessor :sha
+
+    def initialize
+      @sha = detect
+      ScoutApm::Agent.instance.logger.debug "Detected Git Revision [#{@sha}]"
+    end
+
+    private
+
+    def detect
+      detect_from_env_var    ||
+      detect_from_heroku     ||
+      detect_from_capistrano ||
+      detect_from_git
+    end
+
+    def detect_from_heroku
+      ENV['HEROKU_SLUG_COMMIT']
+    end
+
+    def detect_from_env_var
+      ENV['SCOUT_REVISION_SHA']
+    end
+
+    def detect_from_capistrano
+      version = File.read(File.join(app_root, 'REVISION')).strip
+      # Capistrano 3.0 - 3.1.x
+      version || File.open(File.join(app_root, '..', 'revisions.log')).to_a.last.strip.sub(/.*as release ([0-9]+).*/, '\1')
+    rescue
+      ScoutApm::Agent.instance.logger.debug "Unable to detect Git Revision from Capistrano: #{$!.message}"
+      nil
+    end
+
+    def detect_from_git
+      if File.directory?(".git")
+        `git rev-parse --short HEAD`.strip 
+      end
+    rescue
+      ScoutApm::Agent.instance.logger.debug "Unable to detect Git Revision from Git: #{$!.message}"
+      nil
+    end
+
+    def app_root
+      ScoutApm::Environment.instance.root
+    end
+
+  end
+end

data/lib/scout_apm/serializers/slow_jobs_serializer_to_json.rb

@@ -21,6 +21,7 @@ module ScoutApm
             "allocations" => job.allocations,
             "seconds_since_startup" => job.seconds_since_startup,
             "hostname" => job.hostname,
+            "git_sha" => job.git_sha,
             "metrics" => MetricsToJsonSerializer.new(job.metrics).as_json, # New style of metrics
             "allocation_metrics" => MetricsToJsonSerializer.new(job.allocation_metrics).as_json, # New style of metrics
             "context" => job.context.to_hash,

data/lib/scout_apm/slow_job_record.rb

@@ -20,6 +20,7 @@ module ScoutApm
     attr_reader :hostname
     attr_reader :seconds_since_startup
     attr_reader :score
+    attr_reader :git_sha
 
     def initialize(queue_name, job_name, time, total_time, exclusive_time, context, metrics, allocation_metrics, mem_delta, allocations, score)
       @queue_name = queue_name
@@ -34,6 +35,7 @@ module ScoutApm
       @allocations = allocations
       @seconds_since_startup = (Time.now - ScoutApm::Agent.instance.process_start_time)
       @hostname = ScoutApm::Environment.instance.hostname
+      @git_sha = ScoutApm::Environment.instance.git_revision.sha
       @score = score
       ScoutApm::Agent.instance.logger.debug { "Slow Job [#{metric_name}] - Call Time: #{total_call_time} Mem Delta: #{mem_delta}"}
     end

data/lib/scout_apm/slow_transaction.rb

@@ -15,6 +15,7 @@ module ScoutApm
     attr_reader :allocations
     attr_accessor :hostname # hack - we need to reset these server side.
     attr_accessor :seconds_since_startup # hack - we need to reset these server side.
+    attr_accessor :git_sha # hack - we need to reset these server side.
 
     def initialize(uri, metric_name, total_call_time, metrics, allocation_metrics, context, time, raw_stackprof, mem_delta, allocations, score)
       @uri = uri
@@ -30,6 +31,7 @@ module ScoutApm
       @seconds_since_startup = (Time.now - ScoutApm::Agent.instance.process_start_time)
       @hostname = ScoutApm::Environment.instance.hostname
       @score = score
+      @git_sha = ScoutApm::Environment.instance.git_revision.sha
       ScoutApm::Agent.instance.logger.debug { "Slow Request [#{uri}] - Call Time: #{total_call_time} Mem Delta: #{mem_delta} Score: #{score}"}
     end
 
@@ -44,7 +46,7 @@ module ScoutApm
     end
 
     def as_json
-      json_attributes = [:key, :time, :total_call_time, :uri, [:context, :context_hash], :score, :prof, :mem_delta, :allocations, :seconds_since_startup, :hostname]
+      json_attributes = [:key, :time, :total_call_time, :uri, [:context, :context_hash], :score, :prof, :mem_delta, :allocations, :seconds_since_startup, :hostname, :git_sha]
       ScoutApm::AttributeArranger.call(self, json_attributes)
     end
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre0"
-end
-
+  VERSION = "3.0.0.pre1"
+end

data/lib/scout_apm.rb

@@ -63,9 +63,6 @@ require 'scout_apm/platform_integrations/server'
 
 require 'scout_apm/histogram'
 
-require 'scout_apm/deploy_integrations/capistrano_3'
-# require 'scout_apm/deploy_integrations/capistrano_2'
-
 require 'scout_apm/instruments/net_http'
 require 'scout_apm/instruments/http_client'
 require 'scout_apm/instruments/moped'
@@ -136,6 +133,7 @@ require 'scout_apm/request_histograms'
 
 require 'scout_apm/capacity'
 require 'scout_apm/attribute_arranger'
+require 'scout_apm/git_revision'
 
 require 'scout_apm/serializers/payload_serializer'
 require 'scout_apm/serializers/payload_serializer_to_json'
@@ -144,7 +142,6 @@ require 'scout_apm/serializers/slow_jobs_serializer_to_json'
 require 'scout_apm/serializers/metrics_to_json_serializer'
 require 'scout_apm/serializers/directive_serializer'
 require 'scout_apm/serializers/app_server_load_serializer'
-require 'scout_apm/serializers/deploy_serializer'
 
 require 'scout_apm/middleware'
 

data/test/unit/git_revision_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+require 'scout_apm/git_revision'
+
+class GitRevisionTest < Minitest::Test
+  # TODO - other tests that would be nice:
+  # * ensure we only detect once, on initialize.
+  # * tests for reading cap files
+  
+  def test_sha_from_heroku
+    ENV['HEROKU_SLUG_COMMIT'] = 'heroku_slug'
+    revision = ScoutApm::GitRevision.new
+    assert_equal 'heroku_slug', revision.sha
+  end
+end

data/test/unit/serializers/payload_serializer_test.rb

@@ -78,6 +78,7 @@ class PayloadSerializerTest < Minitest::Test
         "min_call_time" => 0.000613518,
         "total_call_time" => 0.033245704,
         "total_exclusive_time" => 0.033245704,
+        "traces" => []
       },
       {
         "key" => {
@@ -92,6 +93,7 @@ class PayloadSerializerTest < Minitest::Test
         "min_call_time" => 0.034881757,
         "total_call_time" => 0.113403176,
         "total_exclusive_time" => 0.07813208899999999,
+        "traces" => []
       }
     ]
     assert_equal formatted_metrics, JSON.parse(payload)["metrics"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre0
+  version: 3.0.0.pre1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -135,16 +135,13 @@ files:
 - lib/scout_apm/capacity.rb
 - lib/scout_apm/config.rb
 - lib/scout_apm/context.rb
-- lib/scout_apm/deploy_integrations/capistrano_2.cap
-- lib/scout_apm/deploy_integrations/capistrano_2.rb
-- lib/scout_apm/deploy_integrations/capistrano_3.cap
-- lib/scout_apm/deploy_integrations/capistrano_3.rb
 - lib/scout_apm/environment.rb
 - lib/scout_apm/fake_store.rb
 - lib/scout_apm/framework_integrations/rails_2.rb
 - lib/scout_apm/framework_integrations/rails_3_or_4.rb
 - lib/scout_apm/framework_integrations/ruby.rb
 - lib/scout_apm/framework_integrations/sinatra.rb
+- lib/scout_apm/git_revision.rb
 - lib/scout_apm/histogram.rb
 - lib/scout_apm/ignored_uris.rb
 - lib/scout_apm/instant/assets/xmlhttp_instrumentation.html
@@ -195,7 +192,6 @@ files:
 - lib/scout_apm/request_manager.rb
 - lib/scout_apm/scored_item_set.rb
 - lib/scout_apm/serializers/app_server_load_serializer.rb
-- lib/scout_apm/serializers/deploy_serializer.rb
 - lib/scout_apm/serializers/directive_serializer.rb
 - lib/scout_apm/serializers/jobs_serializer_to_json.rb
 - lib/scout_apm/serializers/metrics_to_json_serializer.rb
@@ -238,6 +234,7 @@ files:
 - 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
@@ -273,8 +270,30 @@ 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.6
 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/layaway_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
+has_rdoc: 

data/lib/scout_apm/deploy_integrations/capistrano_2.cap

@@ -1,12 +0,0 @@
-namespace :scout_apm do
-  namespace :deploy do
-    task :starting do
-      # Warn if missing scout apm deploy creds?
-    end
-    task :finished do
-      ScoutApm::Agent.instance.deploy_integration.report
-    end
-  end
-end
-
-after 'deploy:finished', 'scout_apm:deploy:finished'

data/lib/scout_apm/deploy_integrations/capistrano_2.rb

@@ -1,83 +0,0 @@
-require 'scout_apm'
-
-module ScoutApm
-  module DeployIntegrations
-    class Capistrano2
-      attr_reader :logger
-
-      def initialize(logger)
-        @logger = logger
-        @cap = defined?(Capistrano::Configuration) ? ObjectSpace.each_object(Capistrano::Configuration).map.first : nil rescue nil
-      end
-
-      def name
-        :capistrano_2
-      end
-
-      def version
-        present? ? Capistrano::VERSION : nil
-      end
-
-      def present?
-        if !@cap.nil? && @cap.is_a?(Capistrano::Configuration)
-          require 'capistrano/version'
-          defined?(Capistrano::VERSION) && Gem::Dependency.new('', '~> 2.0').match?('', Capistrano::VERSION.to_s)
-        else
-          return false
-        end
-        return true
-      rescue
-        return false
-      end
-
-      def install
-        logger.debug "Initializing Capistrano2 Deploy Integration."
-        @cap.load File.expand_path("../capistrano_2.cap", __FILE__)
-      end
-
-      def root
-        '.'
-      end
-
-      def env
-        @cap.fetch(:stage)
-      end
-
-      def found?
-        true
-      end
-
-      def report
-        if reporter.can_report?
-          data = deploy_data
-          logger.debug "Sending deploy hook data: #{data}"
-          payload = ScoutApm::Serializers::DeploySerializer.serialize(data)
-          reporter.report(payload, ScoutApm::Serializers::DeploySerializer::HTTP_HEADERS)
-        else
-          logger.warn "Unable to post deploy hook data"
-        end
-      end
-
-      def reporter
-        @reporter ||= ScoutApm::Reporter.new(:deploy_hook, ScoutApm::Agent.instance.config, @logger)
-      end
-
-      def deploy_data
-        {:revision => current_revision, :branch => branch, :deployed_by => deployed_by}
-      end
-
-      def branch
-        @cap.fetch(:branch)
-      end
-
-      def current_revision
-        @cap.fetch(:current_revision) || `git rev-list --max-count=1 --abbrev-commit --abbrev=12 #{branch}`.chomp
-      end
-
-      def deployed_by
-        ScoutApm::Agent.instance.config.value('deployed_by')
-      end
-
-    end
-  end
-end

data/lib/scout_apm/deploy_integrations/capistrano_3.cap

@@ -1,12 +0,0 @@
-namespace :scout_apm do
-  namespace :deploy do
-    task :starting do
-      # Warn if missing scout apm deploy creds?
-    end
-    task :finished do
-      ScoutApm::Agent.instance.deploy_integration.report
-    end
-  end
-end
-
-after 'deploy:finished', 'scout_apm:deploy:finished'

data/lib/scout_apm/deploy_integrations/capistrano_3.rb

@@ -1,88 +0,0 @@
-require 'scout_apm'
-
-module ScoutApm
-  module DeployIntegrations
-    class Capistrano3
-      attr_reader :logger
-
-      def initialize(logger)
-        @logger = logger
-        @cap = Rake.application rescue nil
-      end
-
-      def name
-        :capistrano_3
-      end
-
-      def version
-        present? ? Capistrano::VERSION : nil
-      end
-
-      def present?
-        if !@cap.nil? && @cap.is_a?(Capistrano::Application)
-          require 'capistrano/version'
-          defined?(Capistrano::VERSION) && Gem::Dependency.new('', '~> 3.0').match?('', Capistrano::VERSION.to_s)
-        else
-          return false
-        end
-      rescue
-        return false
-      end
-
-      def install
-        logger.debug "Initializing Capistrano3 Deploy Integration."
-        load File.expand_path("../capistrano_3.cap", __FILE__)
-      end
-
-      def root
-        '.'
-      end
-
-      def env
-        @cap.fetch(:stage).to_s
-      end
-
-      def found?
-        true
-      end
-
-      def report
-        if reporter.can_report?
-          data = deploy_data
-          logger.debug "Sending deploy hook data: #{data}"
-          payload = ScoutApm::Serializers::DeploySerializer.serialize(data)
-          reporter.report(payload, ScoutApm::Serializers::DeploySerializer::HTTP_HEADERS)
-        else
-          logger.warn "Unable to post deploy hook data"
-        end
-      end
-
-      def reporter
-        config =  if env == '' 
-                    ScoutApm::Agent.instance.config
-                  else
-                    ScoutApm::Config.with_file(nil, {:file => { :environment => env }}) # instantiate our own config, with an overridden environment for the deploy-to app name instead of deploy-from app name)
-                  end
-
-        @reporter ||= ScoutApm::Reporter.new(:deploy_hook, config, @logger)
-      end
-
-      def deploy_data
-        {:revision => current_revision, :branch => branch, :deployed_by => deployed_by}
-      end
-
-      def branch
-        @cap.fetch(:branch)
-      end
-
-      def current_revision
-        @cap.fetch(:current_revision) || `git rev-list --max-count=1 --abbrev-commit --abbrev=12 #{branch}`.chomp
-      end
-
-      def deployed_by
-        ScoutApm::Agent.instance.config.value('deployed_by')
-      end
-
-    end
-  end
-end

data/lib/scout_apm/serializers/deploy_serializer.rb

@@ -1,16 +0,0 @@
-# Serialize & deserialize deploy data up to the APM server
-module ScoutApm
-  module Serializers
-    class DeploySerializer
-      HTTP_HEADERS = {'Content-Type' => 'application/x-www-form-urlencoded'}
-
-      def self.serialize(data)
-        URI.encode_www_form(data)
-      end
-
-      def self.deserialize(data)
-        Marshal.load(data)
-      end
-    end
-  end
-end