scout_apm 3.0.0.pre10 → 3.0.0.pre11

data/lib/scout_apm/utils/backtrace_parser.rb

@@ -6,8 +6,8 @@ require 'scout_apm/environment'
 module ScoutApm
   module Utils
     class BacktraceParser
-
-      APP_FRAMES = 3 # will return up to 3 frames from the app stack.
+      # will return this many backtrace frames from the app stack.
+      APP_FRAMES = 8
 
       attr_reader :call_stack
 
@@ -24,7 +24,7 @@ module ScoutApm
         stack = []
         call_stack.each do |c|
           if m = c.match(@@app_dir_regex)
-            stack << m[1]
+            stack << ScoutApm::Utils::Scm.relative_scm_path(m[1])
             break if stack.size == APP_FRAMES
           end
         end

data/lib/scout_apm/utils/scm.rb

@@ -0,0 +1,14 @@
+# Module for helping to deal with Source Code Management settings
+module ScoutApm
+  module Utils
+    class Scm
+      # Takes an *already relative* path +path+
+      # Returns a relative path, prepending the configured +scm_subdirectory+ environment string
+      def self.relative_scm_path(path, scm_subdirectory = ScoutApm::Environment.instance.scm_subdirectory)
+        @@scm_subdirectory ||= scm_subdirectory.sub(/^\//, '')
+        @@scm_subdirectoy_blank ||= @@scm_subdirectory.empty?
+        @@scm_subdirectoy_blank ? path : File.join(@@scm_subdirectory, path)
+      end
+    end
+  end
+end

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre10"
+  VERSION = "3.0.0.pre11"
 end

data/scout_apm.gemspec

@@ -29,4 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rake-compiler"
   s.add_development_dependency "addressable"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-minitest"
 end

data/test/unit/remote/test_message.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class MessageTest < Minitest::Test
+  def test_message_encode_decode_roundtrip
+    message = ScoutApm::Remote::Message.new('type', 'command', ['arg'])
+    encoded = message.encode
+    decoded = ScoutApm::Remote::Message.decode(encoded)
+    assert_equal message.type, decoded.type
+    assert_equal message.command, decoded.command
+    assert_equal message.args, decoded.args
+  end
+end
+

data/test/unit/remote/test_router.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class RouterTest < Minitest::Test
+  def test_router_handles_record
+    recorder = stub
+    router = ScoutApm::Remote::Router.new(recorder, logger)
+    message = ScoutApm::Remote::Message.new("record", "foo", 1, 2).encode
+
+    recorder.expects(:foo).with(1, 2)
+
+    router.handle(message)
+  end
+
+  def test_router_raises_on_unknown_types
+    recorder = stub
+    router = ScoutApm::Remote::Router.new(recorder, logger)
+    message = ScoutApm::Remote::Message.new("something_else", "foo", 1, 2).encode
+
+    recorder.expects(:foo).never
+    assert_raises do
+      router.handle(message)
+    end
+  end
+
+  def logger
+    @logger ||= Logger.new(logger_io)
+  end
+
+  def logger_io
+    @logger_io ||= StringIO.new
+  end
+end
+

data/test/unit/remote/test_server.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class TestRemoteServer < Minitest::Test
+  def test_start_and_bind
+    bind = "127.0.0.1"
+    port = 8938
+    router = stub(:router)
+    logger_io = StringIO.new
+    server = ScoutApm::Remote::Server.new(bind, port, router, Logger.new(logger_io))
+
+    server.start
+    sleep 0.01 # Let the server finish starting. The assert should instead allow a time
+    assert server.running?
+  end
+end

data/test/unit/test_tracked_request.rb

@@ -0,0 +1,87 @@
+require 'test_helper'
+
+class TrackedRequestDumpAndLoadTest < Minitest::Test
+  # TrackedRequest must be marshalable
+  def test_marshal_dump_load
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    tr.prepare_to_dump!
+
+    dumped = Marshal.dump(tr)
+    loaded = Marshal.load(dumped)
+    assert_false loaded.nil?
+  end
+
+  def test_restore_store
+    faux = ScoutApm::FakeStore.new
+    tr = ScoutApm::TrackedRequest.new(faux)
+    assert_equal faux, tr.instance_variable_get("@store")
+
+    tr.prepare_to_dump!
+    assert_nil tr.instance_variable_get("@store")
+
+    tr.restore_store
+    assert_equal ScoutApm::Agent.instance.store, tr.instance_variable_get("@store")
+  end
+end
+
+class TrackedRequestFlagsTest < Minitest::Test
+  def test_set_web
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    assert_false tr.web?
+    tr.web!
+    assert tr.web?
+  end
+
+  def test_set_job
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    assert ! tr.job?
+    tr.job!
+    assert tr.job?
+  end
+
+  def test_set_error
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    assert_false tr.error?
+    tr.error!
+    assert tr.error?
+  end
+
+  def test_set_error_and_web
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    assert_false tr.error?
+    assert_false tr.web?
+
+    tr.web!
+    assert_false tr.error?
+    assert tr.web?
+
+    tr.error!
+    assert tr.error?
+    assert tr.web?
+  end
+end
+
+class TrackedRequestLayerManipulationTest < Minitest::Test
+  def test_start_layer
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    tr.start_layer(ScoutApm::Layer.new("Foo", "Bar"))
+
+    assert_equal "Foo", tr.current_layer.type
+  end
+
+  def test_start_several_layers
+    # layers are Controller -> ActiveRecord
+    controller_layer = ScoutApm::Layer.new("Controller", "users/index")
+    ar_layer = ScoutApm::Layer.new("ActiveRecord", "Users#find")
+
+    tr = ScoutApm::TrackedRequest.new(ScoutApm::FakeStore.new)
+    tr.start_layer(controller_layer)
+    tr.start_layer(ar_layer)
+
+    assert_equal "ActiveRecord", tr.current_layer.type
+
+    tr.stop_layer
+
+    assert_equal "Controller", tr.current_layer.type
+  end
+end

data/test/unit/utils/backtrace_parser_test.rb

@@ -39,6 +39,11 @@ class BacktraceParserTest < Minitest::Test
     end
   end
 
+  def test_calls_scm_relative_path
+    ScoutApm::Utils::Scm.expects(:relative_scm_path).at_least_once
+    assert ScoutApm::Utils::BacktraceParser.new(raw_backtrace, root).call
+  end
+
   def test_works_on_shorter_backtraces
     result = ScoutApm::Utils::BacktraceParser.new(raw_backtrace(1), root).call
 

data/test/unit/utils/scm.rb

@@ -0,0 +1,17 @@
+require_relative '../../test_helper'
+require 'scout_apm/utils/scm'
+
+class ScmTest < Minitest::Test
+
+  def test_relative_scm_path_blank
+    assert_equal 'app/models/person.rb', ScoutApm::Utils::Scm.relative_scm_path('app/models/person.rb', '')
+  end
+
+  def test_relative_scm_path_not_blank
+    assert_equal 'src/app/models/person.rb', ScoutApm::Utils::Scm.relative_scm_path('app/models/person.rb', 'src')
+  end
+
+  def test_relative_scm_path_not_blank_with_slashes
+    assert_equal 'src/app/models/person.rb', ScoutApm::Utils::Scm.relative_scm_path('app/models/person.rb', '/src/')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre10
+  version: 3.0.0.pre11
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -109,6 +109,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Monitors Ruby apps and reports detailed metrics on performance to Scout.
 email:
 - support@scoutapp.com
@@ -123,6 +151,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.markdown
 - Gemfile
+- Guardfile
 - LICENSE.md
 - README.markdown
 - Rakefile
@@ -142,7 +171,9 @@ files:
 - lib/scout_apm/app_server_load.rb
 - lib/scout_apm/attribute_arranger.rb
 - lib/scout_apm/background_job_integrations/delayed_job.rb
+- lib/scout_apm/background_job_integrations/resque.rb
 - lib/scout_apm/background_job_integrations/sidekiq.rb
+- lib/scout_apm/background_recorder.rb
 - lib/scout_apm/background_worker.rb
 - lib/scout_apm/bucket_name_splitter.rb
 - lib/scout_apm/call_set.rb
@@ -164,6 +195,7 @@ files:
 - lib/scout_apm/instruments/.DS_Store
 - lib/scout_apm/instruments/action_controller_rails_2.rb
 - lib/scout_apm/instruments/action_controller_rails_3_rails4.rb
+- lib/scout_apm/instruments/action_view.rb
 - lib/scout_apm/instruments/active_record.rb
 - lib/scout_apm/instruments/elasticsearch.rb
 - lib/scout_apm/instruments/grape.rb
@@ -179,6 +211,7 @@ files:
 - lib/scout_apm/instruments/process/process_memory.rb
 - lib/scout_apm/instruments/rails_router.rb
 - lib/scout_apm/instruments/redis.rb
+- lib/scout_apm/instruments/resque.rb
 - lib/scout_apm/instruments/sinatra.rb
 - lib/scout_apm/job_record.rb
 - lib/scout_apm/layaway.rb
@@ -202,6 +235,11 @@ files:
 - lib/scout_apm/platform_integrations/cloud_foundry.rb
 - lib/scout_apm/platform_integrations/heroku.rb
 - lib/scout_apm/platform_integrations/server.rb
+- lib/scout_apm/rack.rb
+- lib/scout_apm/remote/message.rb
+- lib/scout_apm/remote/recorder.rb
+- lib/scout_apm/remote/router.rb
+- lib/scout_apm/remote/server.rb
 - lib/scout_apm/reporter.rb
 - lib/scout_apm/request_histograms.rb
 - lib/scout_apm/request_manager.rb
@@ -227,6 +265,7 @@ files:
 - lib/scout_apm/slow_transaction.rb
 - lib/scout_apm/stack_item.rb
 - lib/scout_apm/store.rb
+- lib/scout_apm/synchronous_recorder.rb
 - lib/scout_apm/trace_compactor.rb
 - lib/scout_apm/tracer.rb
 - lib/scout_apm/tracked_request.rb
@@ -238,6 +277,7 @@ files:
 - lib/scout_apm/utils/klass_helper.rb
 - lib/scout_apm/utils/null_logger.rb
 - lib/scout_apm/utils/numbers.rb
+- lib/scout_apm/utils/scm.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
 - lib/scout_apm/utils/sql_sanitizer_regex.rb
 - lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb
@@ -262,15 +302,20 @@ files:
 - test/unit/layer_children_set_test.rb
 - test/unit/limited_layer_test.rb
 - test/unit/metric_set_test.rb
+- test/unit/remote/test_message.rb
+- test/unit/remote/test_router.rb
+- test/unit/remote/test_server.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/test_tracked_request.rb
 - test/unit/utils/active_record_metric_name_test.rb
 - test/unit/utils/backtrace_parser_test.rb
 - test/unit/utils/numbers_test.rb
+- test/unit/utils/scm.rb
 - tester.rb
 homepage: https://github.com/scoutapp/scout_apm_ruby
 licenses:
@@ -315,12 +360,17 @@ test_files:
 - test/unit/layer_children_set_test.rb
 - test/unit/limited_layer_test.rb
 - test/unit/metric_set_test.rb
+- test/unit/remote/test_message.rb
+- test/unit/remote/test_router.rb
+- test/unit/remote/test_server.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/test_tracked_request.rb
 - test/unit/utils/active_record_metric_name_test.rb
 - test/unit/utils/backtrace_parser_test.rb
 - test/unit/utils/numbers_test.rb
+- test/unit/utils/scm.rb