RubyGems - scout_apm - Versions diffs - 2.6.10 → 3.0.0.pre0 - Mend

scout_apm 2.6.10 → 3.0.0.pre0

Files changed (233) hide show

checksums.yaml +5 -5
data/.gitignore +1 -2
data/.rubocop.yml +3 -11
data/CHANGELOG.markdown +4 -362
data/Gemfile +1 -14
data/README.markdown +7 -52
data/Rakefile +1 -0
data/ext/allocations/allocations.c +1 -7
data/ext/allocations/extconf.rb +0 -1
data/ext/rusage/rusage.c +0 -26
data/ext/stacks/extconf.rb +37 -0
data/ext/stacks/scout_atomics.h +86 -0
data/ext/stacks/stacks.c +811 -0
data/lib/scout_apm/agent/logging.rb +69 -0
data/lib/scout_apm/agent/reporting.rb +126 -0
data/lib/scout_apm/agent.rb +259 -138
data/lib/scout_apm/app_server_load.rb +15 -41
data/lib/scout_apm/attribute_arranger.rb +3 -14
data/lib/scout_apm/background_job_integrations/delayed_job.rb +1 -70
data/lib/scout_apm/background_job_integrations/sidekiq.rb +24 -31
data/lib/scout_apm/background_worker.rb +12 -23
data/lib/scout_apm/capacity.rb +57 -0
data/lib/scout_apm/config.rb +37 -206
data/lib/scout_apm/context.rb +4 -20
data/lib/scout_apm/deploy_integrations/capistrano_2.cap +12 -0
data/lib/scout_apm/deploy_integrations/capistrano_2.rb +83 -0
data/lib/scout_apm/deploy_integrations/capistrano_3.cap +12 -0
data/lib/scout_apm/deploy_integrations/capistrano_3.rb +88 -0
data/lib/scout_apm/environment.rb +28 -42
data/lib/scout_apm/fake_store.rb +0 -12
data/lib/scout_apm/framework_integrations/rails_2.rb +1 -2
data/lib/scout_apm/framework_integrations/rails_3_or_4.rb +6 -17
data/lib/scout_apm/framework_integrations/sinatra.rb +1 -1
data/lib/scout_apm/histogram.rb +3 -12
data/lib/scout_apm/instant/assets/xmlhttp_instrumentation.html +2 -2
data/lib/scout_apm/instant/middleware.rb +54 -202
data/lib/scout_apm/instant_reporting.rb +7 -7
data/lib/scout_apm/instruments/.DS_Store +0 -0
data/lib/scout_apm/instruments/action_controller_rails_2.rb +9 -15
data/lib/scout_apm/instruments/action_controller_rails_3_rails4.rb +76 -124
data/lib/scout_apm/instruments/active_record.rb +29 -324
data/lib/scout_apm/instruments/delayed_job.rb +57 -0
data/lib/scout_apm/instruments/elasticsearch.rb +6 -10
data/lib/scout_apm/instruments/grape.rb +9 -12
data/lib/scout_apm/instruments/http_client.rb +7 -14
data/lib/scout_apm/instruments/influxdb.rb +6 -10
data/lib/scout_apm/instruments/middleware_detailed.rb +11 -15
data/lib/scout_apm/instruments/middleware_summary.rb +5 -11
data/lib/scout_apm/instruments/mongoid.rb +8 -39
data/lib/scout_apm/instruments/moped.rb +6 -11
data/lib/scout_apm/instruments/net_http.rb +9 -27
data/lib/scout_apm/instruments/percentile_sampler.rb +23 -42
data/lib/scout_apm/instruments/process/process_cpu.rb +6 -11
data/lib/scout_apm/instruments/process/process_memory.rb +12 -17
data/lib/scout_apm/instruments/rails_router.rb +6 -12
data/lib/scout_apm/instruments/redis.rb +6 -10
data/lib/scout_apm/instruments/sinatra.rb +4 -5
data/lib/scout_apm/job_record.rb +2 -4
data/lib/scout_apm/layaway.rb +34 -88
data/lib/scout_apm/layaway_file.rb +3 -13
data/lib/scout_apm/layer.rb +60 -25
data/lib/scout_apm/layer_converters/allocation_metric_converter.rb +6 -7
data/lib/scout_apm/layer_converters/converter_base.rb +14 -203
data/lib/scout_apm/layer_converters/depth_first_walker.rb +10 -22
data/lib/scout_apm/layer_converters/error_converter.rb +8 -8
data/lib/scout_apm/layer_converters/job_converter.rb +50 -37
data/lib/scout_apm/layer_converters/metric_converter.rb +19 -18
data/lib/scout_apm/layer_converters/request_queue_time_converter.rb +13 -13
data/lib/scout_apm/layer_converters/slow_job_converter.rb +116 -52
data/lib/scout_apm/layer_converters/slow_request_converter.rb +120 -51
data/lib/scout_apm/metric_meta.rb +5 -0
data/lib/scout_apm/metric_set.rb +1 -9
data/lib/scout_apm/metric_stats.rb +8 -7
data/lib/scout_apm/middleware.rb +9 -7
data/lib/scout_apm/reporter.rb +24 -71
data/lib/scout_apm/request_histograms.rb +0 -12
data/lib/scout_apm/request_manager.rb +7 -5
data/lib/scout_apm/scored_item_set.rb +0 -7
data/lib/scout_apm/serializers/app_server_load_serializer.rb +0 -4
data/lib/scout_apm/serializers/deploy_serializer.rb +16 -0
data/lib/scout_apm/serializers/directive_serializer.rb +0 -4
data/lib/scout_apm/serializers/payload_serializer.rb +4 -11
data/lib/scout_apm/serializers/payload_serializer_to_json.rb +16 -35
data/lib/scout_apm/serializers/slow_jobs_serializer_to_json.rb +1 -2
data/lib/scout_apm/server_integrations/passenger.rb +1 -1
data/lib/scout_apm/server_integrations/puma.rb +2 -5
data/lib/scout_apm/slow_job_policy.rb +13 -25
data/lib/scout_apm/slow_job_record.rb +4 -13
data/lib/scout_apm/slow_request_policy.rb +13 -25
data/lib/scout_apm/slow_transaction.rb +5 -25
data/lib/scout_apm/store.rb +32 -99
data/lib/scout_apm/trace_compactor.rb +312 -0
data/lib/scout_apm/tracer.rb +31 -35
data/lib/scout_apm/tracked_request.rb +95 -262
data/lib/scout_apm/utils/active_record_metric_name.rb +13 -88
data/lib/scout_apm/utils/backtrace_parser.rb +4 -7
data/lib/scout_apm/utils/fake_stacks.rb +87 -0
data/lib/scout_apm/utils/installed_gems.rb +3 -7
data/lib/scout_apm/utils/klass_helper.rb +2 -8
data/lib/scout_apm/utils/null_logger.rb +13 -0
data/lib/scout_apm/utils/sql_sanitizer.rb +5 -16
data/lib/scout_apm/utils/sql_sanitizer_regex.rb +0 -7
data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb +0 -6
data/lib/scout_apm/utils/unique_id.rb +0 -27
data/lib/scout_apm/version.rb +2 -1
data/lib/scout_apm.rb +25 -84
data/scout_apm.gemspec +3 -17
data/test/test_helper.rb +3 -57
data/test/unit/agent_test.rb +54 -1
data/test/unit/background_job_integrations/sidekiq_test.rb +3 -0
data/test/unit/config_test.rb +12 -25
data/test/unit/context_test.rb +4 -4
data/test/unit/histogram_test.rb +4 -25
data/test/unit/ignored_uris_test.rb +1 -1
data/test/unit/instruments/active_record_instruments_test.rb +5 -0
data/test/unit/layaway_test.rb +2 -62
data/test/unit/serializers/payload_serializer_test.rb +15 -43
data/test/unit/slow_request_policy_test.rb +6 -15
data/test/unit/sql_sanitizer_test.rb +6 -53
data/test/unit/store_test.rb +4 -73
data/test/unit/utils/active_record_metric_name_test.rb +5 -59
data/test/unit/utils/backtrace_parser_test.rb +1 -6
data/tester.rb +53 -0
metadata +28 -229
data/.travis.yml +0 -26
data/Guardfile +0 -43
data/gems/README.md +0 -28
data/gems/octoshark.gemfile +0 -4
data/gems/rails3.gemfile +0 -5
data/gems/rails4.gemfile +0 -4
data/gems/rails5.gemfile +0 -4
data/gems/rails6.gemfile +0 -4
data/lib/scout_apm/agent/exit_handler.rb +0 -65
data/lib/scout_apm/agent/preconditions.rb +0 -81
data/lib/scout_apm/agent_context.rb +0 -261
data/lib/scout_apm/auto_instrument/instruction_sequence.rb +0 -31
data/lib/scout_apm/auto_instrument/layer.rb +0 -23
data/lib/scout_apm/auto_instrument/parser.rb +0 -27
data/lib/scout_apm/auto_instrument/rails.rb +0 -175
data/lib/scout_apm/auto_instrument.rb +0 -5
data/lib/scout_apm/background_job_integrations/legacy_sneakers.rb +0 -55
data/lib/scout_apm/background_job_integrations/que.rb +0 -134
data/lib/scout_apm/background_job_integrations/resque.rb +0 -88
data/lib/scout_apm/background_job_integrations/shoryuken.rb +0 -124
data/lib/scout_apm/background_job_integrations/sneakers.rb +0 -87
data/lib/scout_apm/background_recorder.rb +0 -48
data/lib/scout_apm/db_query_metric_set.rb +0 -97
data/lib/scout_apm/db_query_metric_stats.rb +0 -102
data/lib/scout_apm/debug.rb +0 -37
data/lib/scout_apm/detailed_trace.rb +0 -217
data/lib/scout_apm/error.rb +0 -27
data/lib/scout_apm/error_service/error_buffer.rb +0 -39
data/lib/scout_apm/error_service/error_record.rb +0 -211
data/lib/scout_apm/error_service/ignored_exceptions.rb +0 -66
data/lib/scout_apm/error_service/middleware.rb +0 -32
data/lib/scout_apm/error_service/notifier.rb +0 -33
data/lib/scout_apm/error_service/payload.rb +0 -47
data/lib/scout_apm/error_service/periodic_work.rb +0 -17
data/lib/scout_apm/error_service/railtie.rb +0 -11
data/lib/scout_apm/error_service/sidekiq.rb +0 -80
data/lib/scout_apm/error_service.rb +0 -32
data/lib/scout_apm/extensions/config.rb +0 -87
data/lib/scout_apm/extensions/transaction_callback_payload.rb +0 -74
data/lib/scout_apm/git_revision.rb +0 -59
data/lib/scout_apm/instrument_manager.rb +0 -88
data/lib/scout_apm/instruments/action_view.rb +0 -141
data/lib/scout_apm/instruments/http.rb +0 -48
data/lib/scout_apm/instruments/memcached.rb +0 -43
data/lib/scout_apm/instruments/resque.rb +0 -39
data/lib/scout_apm/instruments/samplers.rb +0 -11
data/lib/scout_apm/layer_children_set.rb +0 -86
data/lib/scout_apm/layer_converters/database_converter.rb +0 -70
data/lib/scout_apm/layer_converters/find_layer_by_type.rb +0 -38
data/lib/scout_apm/layer_converters/histograms.rb +0 -15
data/lib/scout_apm/layer_converters/trace_converter.rb +0 -184
data/lib/scout_apm/limited_layer.rb +0 -126
data/lib/scout_apm/logger.rb +0 -158
data/lib/scout_apm/periodic_work.rb +0 -47
data/lib/scout_apm/rack.rb +0 -26
data/lib/scout_apm/remote/message.rb +0 -27
data/lib/scout_apm/remote/recorder.rb +0 -57
data/lib/scout_apm/remote/router.rb +0 -49
data/lib/scout_apm/remote/server.rb +0 -60
data/lib/scout_apm/reporting.rb +0 -143
data/lib/scout_apm/serializers/db_query_serializer_to_json.rb +0 -15
data/lib/scout_apm/serializers/histograms_serializer_to_json.rb +0 -21
data/lib/scout_apm/synchronous_recorder.rb +0 -30
data/lib/scout_apm/tasks/doctor.rb +0 -75
data/lib/scout_apm/tasks/support.rb +0 -22
data/lib/scout_apm/transaction.rb +0 -13
data/lib/scout_apm/transaction_time_consumed.rb +0 -51
data/lib/scout_apm/utils/gzip_helper.rb +0 -24
data/lib/scout_apm/utils/marshal_logging.rb +0 -90
data/lib/scout_apm/utils/numbers.rb +0 -14
data/lib/scout_apm/utils/scm.rb +0 -14
data/lib/tasks/doctor.rake +0 -11
data/test/tmp/README.md +0 -17
data/test/unit/agent_context_test.rb +0 -15
data/test/unit/auto_instrument/assignments-instrumented.rb +0 -31
data/test/unit/auto_instrument/assignments.rb +0 -31
data/test/unit/auto_instrument/controller-ast.txt +0 -57
data/test/unit/auto_instrument/controller-instrumented.rb +0 -49
data/test/unit/auto_instrument/controller.rb +0 -49
data/test/unit/auto_instrument/rescue_from-instrumented.rb +0 -13
data/test/unit/auto_instrument/rescue_from.rb +0 -13
data/test/unit/auto_instrument_test.rb +0 -54
data/test/unit/db_query_metric_set_test.rb +0 -67
data/test/unit/db_query_metric_stats_test.rb +0 -113
data/test/unit/error_service/error_buffer_test.rb +0 -25
data/test/unit/error_service/ignored_exceptions_test.rb +0 -49
data/test/unit/extensions/periodic_callbacks_test.rb +0 -58
data/test/unit/extensions/transaction_callbacks_test.rb +0 -58
data/test/unit/fake_store_test.rb +0 -10
data/test/unit/git_revision_test.rb +0 -15
data/test/unit/instruments/active_record_test.rb +0 -40
data/test/unit/instruments/net_http_test.rb +0 -27
data/test/unit/instruments/percentile_sampler_test.rb +0 -133
data/test/unit/layer_children_set_test.rb +0 -97
data/test/unit/layer_converters/depth_first_walker_test.rb +0 -70
data/test/unit/layer_converters/metric_converter_test.rb +0 -22
data/test/unit/layer_converters/stubs.rb +0 -33
data/test/unit/limited_layer_test.rb +0 -53
data/test/unit/logger_test.rb +0 -69
data/test/unit/remote/test_message.rb +0 -13
data/test/unit/remote/test_router.rb +0 -33
data/test/unit/remote/test_server.rb +0 -15
data/test/unit/request_histograms_test.rb +0 -17
data/test/unit/tracer_test.rb +0 -76
data/test/unit/tracked_request_test.rb +0 -71
data/test/unit/transaction_test.rb +0 -14
data/test/unit/transaction_time_consumed_test.rb +0 -46
data/test/unit/utils/numbers_test.rb +0 -15
data/test/unit/utils/scm.rb +0 -17

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 503d33cb7c689cb239c328bee4ba2a1df380df703f3e3a6f5f843676b9bff0e4
-  data.tar.gz: 444e240dc8c4922ee932684c1c10b3fb5d658e96228c901b33a9a5ca3cb1e469
+SHA1:
+  metadata.gz: afa1d7b25baf3d94a547899966b95419ac560d07
+  data.tar.gz: d6201d2acc85f2e94c92315b8193d110a4febd0a
 SHA512:
-  metadata.gz: 715c6a3f044d2091207667fc6a9857573da528cf03ee5d64ccb758c10ec387b49829a891ae43bb51b444077c898f57fc73257f2d963407820ed7114fdedb52c4
-  data.tar.gz: 373b60dc42e0417e6003698c143138ff50024802285ff3754cc706efc1bc305a941fddbe27e6a471d8f09b3ffc84b5a3cfb43e57a1715968d7cac47ee069f5b3
+  metadata.gz: 9a125da761d39c62094fc48ca66163bac787c0de62e9b6a3f38e984ae2ab8f41dcc7d271519764694c6b9a194e084c626bbf7b042a364ee56afe524c912fd83a
+  data.tar.gz: cce9304bd70490eb711c92a6df03d656710c01eb0343f809e58d0bb49c02ec152a99f668b21f7e51424aec34e432286c0ec83f7cdc74cdc994300ae6aa0b4ed6

data/.gitignore CHANGED Viewed

@@ -17,5 +17,4 @@ test/tmp/*coverage/*
 coverage/*
 lib/*.bundle
 lib/*.so
-log/scout_apm.log
-gems/*.lock
+**/.RUBYARCHDIR.time

data/.rubocop.yml CHANGED Viewed

@@ -1,16 +1,8 @@
-# Disable all cops by default
-AllCops:
-  DisabledByDefault: true
-  Exclude:
-    - 'test/unit/auto_instrument/*'
-    - vendor/bundle/**/*
 # 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:
-  Enabled: false
   Max: 100
-Style/HashSyntax:
-  Enabled: true
-  EnforcedStyle: hash_rockets
+Style/UseHashRocketsWithSymbolValues: false

data/CHANGELOG.markdown CHANGED Viewed

@@ -1,369 +1,11 @@
-# 2.6.10
+# 2.2.0
-* Fix an edge case in JSON serialization (#360)
-# 2.6.9
-* Add `ssl_cert_file` config option (#352)
-* Improve sanitization of Postgres UPDATE SQL (#351)
-* Allow custom URL sanitization (#341)
-# 2.6.8
-* Lock rake version for 1.8.7 to older version (#329)
-* Delete unneeded .DS_Store file that snuck in (#334)
-* Fix typo in "queue_time_ms"
-* Fix Rails 6 deprecation warning at boot time (#337)
-* Fix partial naming on Rails 6.0 (#339)
-* Support Sidekiq 6.1 instrumentation (#340)
-# 2.6.7
-* Remove accidental call to `as_json`
-# 2.6.6
-* Add basic support for parsing Microsoft SQLServer queries (#317)
-* Refine Postgresql Sanitization with subqueries and JSON operations (#262)
-# 2.6.5
-* Add a tag to any requests that reach maximum number of spans (#316)
-* Update testing library Mocha (#315)
-* Fix case sensitivity mismatch in Job renaming (#314)
-* Add support for Sneakers 2.5 (#313)
-* Fix edge case with Resque instrumentation (#312)
-* Fix missing source code when used with BugSnag (#308)
-# 2.6.4
-* Add defensive check against a nil @address in Net/HTTP instruments (#306)
-# 2.6.3
-* Standardize Metadata with other language agents (#302)
-* Add Mongoid 7.x support (#295)
-* Add HTTP::Client support (#260)
-# 2.6.2
-* Fix Autoinstruments logging when running without ActiveSupport (#290)
-* Fix edge-case Autoinstruments syntax error (#287)
-* Fix invalid syntax for running on Ruby 1.8.7
-# 2.6.1
-* Logging total autoinstrumented spans and the ratio of significant to total spans (#283).
-* Added `autoinstruments_ignore` option (also #283).
-# 2.6.0
-* Autoinstruments (#247). Disabled by default. Set `auto_instruments: true` to enable.
-# 2.5.3
-* Add Que support (#265)
-* Add Memcached support (#279)
-# 2.5.2
-* Don't process limited layers in detailed traces (#268)
-* Fix OctoShark (and other gems which patch ActiveRecord) interaction (#217)
-* Legacy [Rails 2.3 fix for as_json](https://github.com/scoutapp/scout_apm_ruby/pull/276)
-# 2.5.1
-* Decrease timeline trace span limit to 1,500 to address [this bug](https://github.com/scoutapp/scout_apm_ruby/issues/267).
-# 2.5.0
-* Added timeline traces and an associated `timeline_traces: true` config option.
-* Increased timeline traces span limit to 2,500 from 500.
-# 2.4.24
-* Fix for prepending view instruments in the case of templates that lack a `virtual_path` (#257).
-# 2.4.23
-* Extend #251 to use prepend on all view instruments (#255)
-# 2.4.22
-* Support Rails 6.0 View Instruments (#251)
-* Update documentation URLs (#236)
-# 2.4.21
-* App & Background Integrations only install when needed (#228)
-* New Setting `collect_remote_ip`, to optionally disable automated capture of
-  end-user IP Address. No change to default behavior.
-* Allow setting `compress_payload` option from ENV var (#234)
-# 2.4.20
-* `start_resque_server_instrument` option to allow disabling the WEBrick server
-   component in custom installation scenarios
-* Allow setting `revision_sha` setting in YAML
-# 2.4.19
-* Fix disabled_instruments (#220)
-# 2.4.18
-* Add Shoryuken Support (#215)
-* Add Sneakers Support (#216)
-# 2.4.17
-* Renames SQL `BEGIN` and `COMMIT` statements from `SQL#other` to `SQL#begin` and `SQL#commit`, respectively.
-* Makes naming between transaction and database metrics consistent. Previously, database metrics lacking a provided ActiveRecord label were named `SQL#other`.
-# 2.4.16
-* Fix synchronization bug in Store (#205, PR #210)
-# 2.4.15
-* Fix bug that causes no data to be reported to Scout when DataDog is installed (#211)
-* Fix `NoMethodError for LayerChildrenSet` when `log_level: debug` in certain situations.
-# 2.4.14
-* Fix database connection issue when installed in an app also using the Textacular gem
-# 2.4.13
-* Incorporating total time consumed into transaction trace policy
-# 2.4.12
-* Calculates DelayedJob queue latency correctly when jobs are scheduled to run in the future
-# 2.4.11
-* Adds transaction + periodic reporting callback extension support
-* Use Module#prepend if available for ActiveRecord `exec_query` instrument
-# 2.4.10
-* Improve ActiveRecord instrumentation across Rails 3.2+, and adding support
-  for the newly released Rails 5.2
-# 2.4.9
-* ScoutApm::Transaction#rename and #ignore API
-* Explicit custom instrumentation with ScoutApm::Tracer#instrument blocks,
-  without needing to include a module
-* Quieter logging in normal startup cases
-* Upgraded testing infrastructure
-# 2.4.8
-* Fix issue with detailed middleware instrumentation
-# 2.4.7
-* Fix issue recording backtraces
-# 2.4.6
-* Fix an edge case for Resque instrumentation
-# 2.4.5
-* More robust installation of instruments at startup
-* Several (very) minor bug fixes
-# 2.4.4
-* Prevent agent from starting when monitor=false
-* Fix double-counting of HTTP requests when multiple http libraries are present
-* Fix an issue with Resque instrumentation
-# 2.4.3
-* Ensure a startup hook runs on forking webservers
-# 2.4.2
-* Fix shutdown hook for Passenger
-# 2.4.1
-* Fix logging on STDOUT only platforms (Heroku)
-# 2.4.0
-* Rework agent startup sequence
-* Install all background job instrumentations if you're running more than one
-* Capture longer individual SQL statements
-* Capture multiple SQL statements if multiple are run during a single AR call.
-# 2.3.5
-* More robust recovery from stale layaway files
-* Quiet logging when hitting unusual layaway file limits
-* Better naming for Sidekiq delayed method jobs
-* Webrick is only required if actually needed
-# 2.3.4
-* Capture 300 characters of a url from net/http and httpclient instruments (up from 100).
-# 2.3.3
-* Capture ActiveRecord calls that generate more complex queries
-* More aggressively determine names of complex queries (to determine "User/find", "Account/create" and similar)
-* Increases the maximum size of SQL queries that are sanitized to 16KB from 4 KB
-* Captures all SQL individual queries generated in a given AR call (previous only a single query was captured)
-# 2.3.2
-* More robust startup sequence when using `rails server` vs. directly launching an app server
-* Avoid incompatibility with 3rd party gems that aggressively obtain database connections
-# 2.3.1
-* Fix DevTrace bug
-# 2.3.0
-Note: ScoutApm Agent version 2.2.0 was the initial ScoutProf agent that was
-determined quickly to be a big enough change to warrant the move to 3.0. We are not
-reusing that version number to avoid confusion.
-* Deeper database query instrumentation. The agent now collects app-wide
-  database usage on every call. This will allow you to better identify
-  persistently slow queries, and capacity bottlenecks.
-* Optimize the approach used during recording each request to avoid unnecessary
-  work, improving performance
-# 2.1.32
-* Better naming when using Resque + ActiveJob
-* Better naming when using Sidekiq + DelayedExtension
-# 2.1.31
-* Better detection of Resque queue names
-* Fix passing arguments through Active Record instrumentation. (Thanks to Nick Quaranto for providing the fix)
-* Stricter checks to prevent agent from starting in Rails console
-# 2.1.30
-* Add Resque support.
-# 2.1.29
-* Add `scm_subdirectory` option. Useful for when your app code does not live in your SCM root directory.
-# 2.1.28
-* Changes to app server load data
-# 2.1.27
-* Don't attempt to call `current_layer.type` on nil
-# 2.1.26
-* Bug fix [4b188d6](https://github.com/scoutapp/scout_apm_ruby/commit/4b188d698852c86b86d8768ea5b37d706ce544fe)
-# 2.1.25
-* Automatically instrument API and Metal controllers.
-# 2.1.24
-* Capture additional layers of application backtrace frames. (From 3 -> 8)
-# 2.1.23
-* Extend Mongoid instrumentation to 6.x
-# 2.1.22
-* Add DevTrace support for newest 4.2.x and 5.x versions of Rails
-# 2.1.21
-* Fix edge case, causing DevTrace to fail
-* Add debug tooling, allowing custom functions to be inserted into the agent at
-  key points.
-# 2.1.20
-* Add a `detailed_middleware` boolean configuration option to capture
-  per-middleware data, as opposed to the default of aggregating all middleware
-  together.  This has a small amount of additional overhead, approximately
-  10-15ms per request.
-# 2.1.19
-* Log all configuration settings at start when log level is debug
-* Tune DelayedJob class name detection
-# 2.1.18
-* Max layaway file threshold limit
-# 2.1.17
-* Additional logging around file system usage
-# 2.1.16
-* Extract the name correctly for DelayedJob workers run via ActiveJob
-# 2.1.15
-* Limit memory usage for very long running requests.
-# 2.1.14
-* Add TrackedRequest#ignore_request! to entirely ignore and stop capturing a
-  certain request. Use in your code by calling:
-    ScoutApm::RequestManager.lookup.ignore_request!
-# 2.1.13
-* Rework Delayed Job instrumentation to not interfere with other instruments.
-# 2.1.12
-* Revert 2.1.11's Delayed Job change - caused issues in a handful of environments
-# 2.1.11
-* Support alternate methods of launching Delayed Job
-# 2.1.10
-* Fix issue getting a default Application Name when it wasn't explicitly set
-# 2.1.9
-* Send raw histograms of response time, enabling more accurate 95th %iles
-* Raw histograms are used in Apdex calculations
-* Gzip payloads
-* Fix Mongoid (5.0) + Mongo (2.1) support
-* Initial Delayed Job support
-* Limit max metric size of a trace to 500.
-# 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
+* ScoutProf BETA
 # 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
@@ -738,7 +380,7 @@ Big set of features getting merged in for this release.
 # 0.1.3
-* Adds capacity calculation via "Instance/Capacity" metric.
+* Adds capacity calculation via "Instance/Capacity" metric.
 * Tweaks tracing to still count a transaction if it results in a 500 error and includes it in accumulated time.
 * Adds per-transaction error tracking (ex: Errors/Controller/widgets/index)

data/Gemfile CHANGED Viewed

@@ -1,17 +1,4 @@
-source "https://rubygems.org"
+source "http://rubygems.org"
 # Specify your gem's dependencies in scout_apm.gemspec
 gemspec
-# Pin development dependencies more conservatively for Ruby 1.8.7
-if RUBY_VERSION <= "1.8.7"
-  gem "activesupport", "~> 3.2"
-  gem "i18n", "~> 0.6.11"
-  gem "pry", "~> 0.9.12"
-  gem "rake", "~> 10.5"
-  gem "minitest", "~> 5.11.3"
-elsif RUBY_VERSION <= "1.9.3"
-  gem "rake", "~> 10.5"
-else
-  gem "rake", ">= 12.3.3"
-end

data/README.markdown CHANGED Viewed

@@ -1,32 +1,14 @@
-# ScoutApm Ruby Agent
+# ScoutApm
-[![Build Status](https://travis-ci.org/scoutapp/scout_apm_ruby.svg?branch=master)](https://travis-ci.org/scoutapp/scout_apm_ruby)
-A Ruby gem for detailed Rails application performance monitoring 📈. Metrics and transaction traces are
-reported to [Scout](https://scoutapp.com), a hosted application monitoring
-service.
-## What's the special sauce? 🤔
-The Scout agent is engineered to do some wonderful things:
-* A unique focus on identifying those hard-to-investigate outliers like memory bloat, N+1s, and user-specific problems. [See an example workflow](http://scoutapp.com/newrelic-alternative).
-* [Low-overhead](http://blog.scoutapp.com/articles/2016/02/07/overhead-benchmarks-new-relic-vs-scout)
-* View your performance metrics during development with [DevTrace](https://docs.scoutapm.com/#devtrace) and in production via [server_timing](https://github.com/scoutapp/ruby_server_timing).
-* Production-Safe profiling of custom code via [ScoutProf](https://docs.scoutapm.com/#scoutprof) (BETA).
+A Ruby gem for detailed Rails application performance analysis. Metrics are reported to [Scout](https://scoutapp.com), a hosted application monitoring service.
 ## Getting Started
-Add the gem to your Gemfile
-    gem 'scout_apm'
+Install the gem:
-Update your Gemfile
-    bundle install
-Signup for a [Scout](https://scoutapm.com) account and put the provided
-config file at `RAILS_ROOT/config/scout_apm.yml`.
+    gem install scout_apm
+Signup for a [Scout](https://apm.scoutapp.com) account and copy the config file to `RAILS_ROOT/config/scout_apm.yml`.
 Your config file should look like:
@@ -35,39 +17,12 @@ Your config file should look like:
       key: YOUR_APPLICATION_KEY
       monitor: true
-    test:
-      monitor: false
     production:
       <<: *defaults
-## DevTrace Quickstart
-To use DevTrace, our free, no-signup, in-browser development profiler:
-1. Add the gem to your Gemfile:
-```ruby
-# Gemfile
-gem 'scout_apm'
-```
-2. Start your Rails app with the SCOUT_DEV_TRACE environment variable:
-```
-SCOUT_DEV_TRACE=true rails server
-```
-## How to test gem locally
-* Point your gemfile at your local checkout: `gem 'scout_apm', path: '/path/to/scout_apm_ruby`
-* Compile native code: `cd /path/to/scout_apm_ruby && bundle exec rake compile`
 ## Docs
-For the complete list of supported frameworks, Rubies, configuration options
-and more, see our [help site](https://docs.scoutapm.com/).
+For the complete list of supported frameworks, Rubies, etc, see our [help site](http://help.apm.scoutapp.com/).
 ## Help

data/Rakefile CHANGED Viewed

@@ -21,5 +21,6 @@ end
 # Rake Compiler
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('allocations')
+Rake::ExtensionTask.new('stacks')
 Rake::ExtensionTask.new('rusage')

data/ext/allocations/allocations.c CHANGED Viewed

@@ -1,14 +1,10 @@
-#ifdef HAVE_RUBY_RUBY_H
 #include <ruby/ruby.h>
-#else // Ruby <= 1.8.7
-#include <ruby.h>
-#endif
 VALUE mScoutApm;
 VALUE mInstruments;
 VALUE cAllocations;
-#if defined(RUBY_INTERNAL_EVENT_NEWOBJ) && !defined(_WIN32)
+#ifdef RUBY_INTERNAL_EVENT_NEWOBJ
 #include <sys/resource.h> // is this needed?
 #include <sys/time.h>
@@ -56,7 +52,6 @@ void Init_allocations()
     mInstruments = rb_define_module_under(mScoutApm, "Instruments");
     cAllocations = rb_define_class_under(mInstruments, "Allocations", rb_cObject);
     rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
-    rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
     rb_define_const(cAllocations, "ENABLED", Qtrue);
     Init_hooks(mScoutApm);
 }
@@ -79,7 +74,6 @@ void Init_allocations()
     mInstruments = rb_define_module_under(mScoutApm, "Instruments");
     cAllocations = rb_define_class_under(mInstruments, "Allocations", rb_cObject);
     rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
-    rb_define_singleton_method(cAllocations, "count", get_allocation_count, 0);
     rb_define_const(cAllocations, "ENABLED", Qfalse);
     Init_hooks(mScoutApm);
 }

data/ext/allocations/extconf.rb CHANGED Viewed

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

data/ext/rusage/rusage.c CHANGED Viewed

@@ -1,35 +1,10 @@
 // VERSION = "x.y.z"
 #include <ruby.h>
-#ifdef _WIN32
-#define RUSAGE_SELF 0
-#define RUSAGE_CHILDREN 0
-#else
 #include <sys/resource.h>
-#endif
 VALUE v_usage_struct;
 static VALUE do_rusage_get(int who){
-#ifdef _WIN32
-  return rb_struct_new(v_usage_struct,
-      rb_float_new(0),
-      rb_float_new(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0),
-      LONG2NUM(0)
-   );
-#else // _WIN32
   struct rusage r;
   int ret;
@@ -55,7 +30,6 @@ static VALUE do_rusage_get(int who){
       LONG2NUM(r.ru_nvcsw),
       LONG2NUM(r.ru_nivcsw)
    );
-#endif // _WIN32
 }
 static VALUE rusage_get(int argc, VALUE* argv, VALUE mod){

data/ext/stacks/extconf.rb ADDED Viewed

@@ -0,0 +1,37 @@
+begin
+  require 'mkmf'
+  can_compile = true
+rescue Exception
+  # This will appear only in verbose mode.
+  $stderr.puts "Could not require 'mkmf'. Not fatal, the Stacks extension is optional."
+end
+can_compile &&= have_func('rb_postponed_job_register_one')
+can_compile &&= have_func('rb_profile_frames')
+can_compile &&= have_func('rb_profile_frame_absolute_path')
+can_compile &&= have_func('rb_profile_frame_label')
+can_compile &&= have_func('rb_profile_frame_classpath')
+# Explicitly link against librt
+if have_macro('__linux__')
+  can_compile &&= have_library('rt') # for timer_create, timer_settime
+end
+# Pick the atomics implementation
+has_atomics_header = have_header("stdatomic.h")
+if has_atomics_header
+  $defs.push "-DSCOUT_USE_NEW_ATOMICS"
+else
+  $defs.push "-DSCOUT_USE_OLD_ATOMICS"
+end
+if can_compile
+  create_makefile('stacks')
+else
+  # Create a dummy Makefile, to satisfy Gem::Installer#install
+  mfile = open("Makefile", "wb")
+  mfile.puts '.PHONY: install'
+  mfile.puts 'install:'
+  mfile.puts "\t" + '@echo "Stack extension not installed, skipping."'
+  mfile.close
+end