scout_apm 2.1.32 → 2.2.0.pre0

data/test/unit/slow_request_policy_test.rb

@@ -32,10 +32,11 @@ class SlowRequestPolicyTest < Minitest::Test
 
     request.set_duration(10) # 10 seconds
     policy.last_seen[request.unique_name] = Time.now - 120 # 2 minutes since last seen
-    ScoutApm::Agent.instance.request_histograms.add(request.unique_name, 1)
+    agent.request_histograms.add(request.unique_name, 1)
+
+    # Actual value I have in console is 1.599
+    assert policy.score(request) > 1.5
+    assert policy.score(request) < 2.0
 
-    # Actual value I have in console is 1.499
-    assert policy.score(request) > 1.45
-    assert policy.score(request) < 1.55
   end
 end

data/test/unit/utils/backtrace_parser_test.rb

@@ -39,11 +39,6 @@ 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
 
@@ -54,18 +49,4 @@ class BacktraceParserTest < Minitest::Test
     result = ScoutApm::Utils::BacktraceParser.new(raw_backtrace, "/Users/scout/different-secrets").call
     assert_equal 0, result.length
   end
-
-  def test_excludes_vendor_paths
-    raw_backtrace = [
-      "#{root}/vendor/ruby/thing.rb",
-      "#{root}/app/controllers/users_controller.rb",
-      "#{root}/vendor/ruby/thing.rb",
-      "#{root}/config/initializers/inject_something.rb",
-    ]
-    result = ScoutApm::Utils::BacktraceParser.new(raw_backtrace, root).call
-
-    assert_equal 2, result.length
-    assert_equal false, (result[0] =~ %r|app/controllers/users_controller.rb|).nil?
-    assert_equal false, (result[1] =~ %r|config/initializers/inject_something.rb|).nil?
-  end
 end

data/tester.rb

@@ -0,0 +1,53 @@
+$: << "./lib"
+
+require 'scout_apm'
+require 'stacks'
+
+class OneTrace
+  attr_reader :data
+  attr_reader :num
+
+  def initialize(num)
+    puts "Initialized, expecting #{num}"
+    @num = num
+    @data = []
+  end
+
+  def add(file, line, label, klass)
+    @data << [file, line, label, klass]
+  end
+end
+
+class GlobalVar
+  def self.collect(trace)
+    puts "***************************************************************"
+
+    puts "Collected some data in ruby:\n#{trace.data.map{|x| "#{x[0]}:#{x[1]}\t#{x[3]}##{x[2]}" }.join("\n")}"
+  end
+end
+
+####################################
+#
+def quux
+  while true
+    puts "Hello"
+    sleep 0.5
+  end
+end
+
+class Whipple
+  def baz
+    quux
+  end
+end
+
+def bar
+  w = Whipple.new
+  w.baz
+end
+
+def foo
+  bar
+end
+
+foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.32
+  version: 2.2.0.pre0
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rusage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,71 +95,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  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
-  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
 executables: []
 extensions:
 - ext/allocations/extconf.rb
-- ext/rusage/extconf.rb
+- ext/stacks/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
 - CHANGELOG.markdown
 - Gemfile
-- Guardfile
 - LICENSE.md
 - README.markdown
 - Rakefile
 - data/cacert.pem
 - ext/allocations/allocations.c
 - ext/allocations/extconf.rb
-- ext/rusage/README.md
-- ext/rusage/extconf.rb
-- ext/rusage/rusage.c
+- ext/stacks/extconf.rb
+- ext/stacks/scout_atomics.h
+- ext/stacks/stacks.c
 - lib/scout_apm.rb
 - lib/scout_apm/agent.rb
 - lib/scout_apm/agent/logging.rb
@@ -167,22 +123,23 @@ 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
+- lib/scout_apm/capacity.rb
 - lib/scout_apm/config.rb
 - lib/scout_apm/context.rb
-- lib/scout_apm/debug.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
@@ -191,8 +148,8 @@ 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/delayed_job.rb
 - lib/scout_apm/instruments/elasticsearch.rb
 - lib/scout_apm/instruments/grape.rb
 - lib/scout_apm/instruments/http_client.rb
@@ -207,13 +164,11 @@ 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
 - lib/scout_apm/layaway_file.rb
 - lib/scout_apm/layer.rb
-- lib/scout_apm/layer_children_set.rb
 - lib/scout_apm/layer_converters/allocation_metric_converter.rb
 - lib/scout_apm/layer_converters/converter_base.rb
 - lib/scout_apm/layer_converters/depth_first_walker.rb
@@ -223,7 +178,6 @@ files:
 - lib/scout_apm/layer_converters/request_queue_time_converter.rb
 - lib/scout_apm/layer_converters/slow_job_converter.rb
 - lib/scout_apm/layer_converters/slow_request_converter.rb
-- lib/scout_apm/limited_layer.rb
 - lib/scout_apm/metric_meta.rb
 - lib/scout_apm/metric_set.rb
 - lib/scout_apm/metric_stats.rb
@@ -231,18 +185,13 @@ 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
 - 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/histograms_serializer_to_json.rb
 - lib/scout_apm/serializers/jobs_serializer_to_json.rb
 - lib/scout_apm/serializers/metrics_to_json_serializer.rb
 - lib/scout_apm/serializers/payload_serializer.rb
@@ -255,23 +204,22 @@ files:
 - lib/scout_apm/server_integrations/thin.rb
 - lib/scout_apm/server_integrations/unicorn.rb
 - lib/scout_apm/server_integrations/webrick.rb
+- lib/scout_apm/slow_item_set.rb
 - lib/scout_apm/slow_job_policy.rb
 - lib/scout_apm/slow_job_record.rb
 - lib/scout_apm/slow_request_policy.rb
 - 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
 - lib/scout_apm/utils/active_record_metric_name.rb
 - lib/scout_apm/utils/backtrace_parser.rb
-- lib/scout_apm/utils/gzip_helper.rb
+- lib/scout_apm/utils/fake_stacks.rb
 - lib/scout_apm/utils/installed_gems.rb
 - 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
@@ -282,34 +230,22 @@ 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/instruments/net_http_test.rb
-- test/unit/instruments/percentile_sampler_test.rb
 - test/unit/layaway_test.rb
-- 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_item_set_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:
 - Proprietary (See LICENSE.md)
@@ -326,44 +262,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-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/instruments/net_http_test.rb
-- test/unit/instruments/percentile_sampler_test.rb
-- test/unit/layaway_test.rb
-- 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
+test_files: []

data/.rubocop.yml

@@ -1,8 +0,0 @@
-# 80 is stifling, especially with a few levels of nesting before we even start.
-# So bump it to 100 to keep really long lines from creeping in.
-Metrics/LineLength:
-  Max: 100
-
-Style/UseHashRocketsWithSymbolValues: false
-
-

data/Guardfile

@@ -1,42 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
-
-guard :minitest do
-  # with Minitest::Unit
-  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
-  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r{^test/test_helper\.rb$})      { 'test' }
-
-  # with Minitest::Spec
-  # watch(%r{^spec/(.*)_spec\.rb$})
-  # watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
-  # watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
-
-  # Rails 4
-  # watch(%r{^app/(.+)\.rb$})                               { |m| "test/#{m[1]}_test.rb" }
-  # watch(%r{^app/controllers/application_controller\.rb$}) { 'test/controllers' }
-  # watch(%r{^app/controllers/(.+)_controller\.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
-  # watch(%r{^app/views/(.+)_mailer/.+})                    { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
-  # watch(%r{^lib/(.+)\.rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
-  # watch(%r{^test/.+_test\.rb$})
-  # watch(%r{^test/test_helper\.rb$}) { 'test' }
-
-  # Rails < 4
-  # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" }
-  # watch(%r{^app/helpers/(.*)\.rb$})     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r{^app/models/(.*)\.rb$})      { |m| "test/unit/#{m[1]}_test.rb" }
-end