scout_apm 3.0.0.pre28 → 4.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (135) hide show
  1. checksums.yaml +5 -5
  2. data/.github/workflows/test.yml +49 -0
  3. data/.gitignore +1 -1
  4. data/.rubocop.yml +5 -5
  5. data/.travis.yml +19 -14
  6. data/CHANGELOG.markdown +145 -4
  7. data/Gemfile +1 -7
  8. data/README.markdown +13 -4
  9. data/Rakefile +1 -1
  10. data/ext/allocations/allocations.c +2 -0
  11. data/gems/README.md +28 -0
  12. data/gems/octoshark.gemfile +4 -0
  13. data/gems/rails3.gemfile +5 -0
  14. data/gems/rails4.gemfile +4 -0
  15. data/gems/rails5.gemfile +4 -0
  16. data/gems/rails6.gemfile +4 -0
  17. data/lib/scout_apm.rb +39 -9
  18. data/lib/scout_apm/agent.rb +29 -10
  19. data/lib/scout_apm/agent/exit_handler.rb +0 -1
  20. data/lib/scout_apm/agent_context.rb +22 -3
  21. data/lib/scout_apm/app_server_load.rb +7 -2
  22. data/lib/scout_apm/attribute_arranger.rb +0 -2
  23. data/lib/scout_apm/auto_instrument.rb +5 -0
  24. data/lib/scout_apm/auto_instrument/instruction_sequence.rb +31 -0
  25. data/lib/scout_apm/auto_instrument/layer.rb +23 -0
  26. data/lib/scout_apm/auto_instrument/parser.rb +27 -0
  27. data/lib/scout_apm/auto_instrument/rails.rb +175 -0
  28. data/lib/scout_apm/background_job_integrations/delayed_job.rb +1 -1
  29. data/lib/scout_apm/background_job_integrations/faktory.rb +103 -0
  30. data/lib/scout_apm/background_job_integrations/legacy_sneakers.rb +55 -0
  31. data/lib/scout_apm/background_job_integrations/que.rb +134 -0
  32. data/lib/scout_apm/background_job_integrations/resque.rb +6 -2
  33. data/lib/scout_apm/background_job_integrations/shoryuken.rb +124 -0
  34. data/lib/scout_apm/background_job_integrations/sidekiq.rb +5 -19
  35. data/lib/scout_apm/background_job_integrations/sneakers.rb +87 -0
  36. data/lib/scout_apm/config.rb +45 -8
  37. data/lib/scout_apm/detailed_trace.rb +217 -0
  38. data/lib/scout_apm/environment.rb +20 -1
  39. data/lib/scout_apm/error.rb +27 -0
  40. data/lib/scout_apm/error_service.rb +32 -0
  41. data/lib/scout_apm/error_service/error_buffer.rb +39 -0
  42. data/lib/scout_apm/error_service/error_record.rb +211 -0
  43. data/lib/scout_apm/error_service/ignored_exceptions.rb +66 -0
  44. data/lib/scout_apm/error_service/middleware.rb +32 -0
  45. data/lib/scout_apm/error_service/notifier.rb +33 -0
  46. data/lib/scout_apm/error_service/payload.rb +47 -0
  47. data/lib/scout_apm/error_service/periodic_work.rb +17 -0
  48. data/lib/scout_apm/error_service/railtie.rb +11 -0
  49. data/lib/scout_apm/error_service/sidekiq.rb +80 -0
  50. data/lib/scout_apm/extensions/transaction_callback_payload.rb +1 -1
  51. data/lib/scout_apm/fake_store.rb +3 -0
  52. data/lib/scout_apm/framework_integrations/rails_2.rb +2 -1
  53. data/lib/scout_apm/framework_integrations/rails_3_or_4.rb +3 -1
  54. data/lib/scout_apm/git_revision.rb +6 -3
  55. data/lib/scout_apm/instant/middleware.rb +2 -1
  56. data/lib/scout_apm/instrument_manager.rb +9 -7
  57. data/lib/scout_apm/instruments/action_controller_rails_2.rb +3 -1
  58. data/lib/scout_apm/instruments/action_controller_rails_3_rails4.rb +56 -55
  59. data/lib/scout_apm/instruments/action_view.rb +122 -26
  60. data/lib/scout_apm/instruments/active_record.rb +66 -18
  61. data/lib/scout_apm/instruments/http.rb +48 -0
  62. data/lib/scout_apm/instruments/memcached.rb +43 -0
  63. data/lib/scout_apm/instruments/mongoid.rb +9 -4
  64. data/lib/scout_apm/instruments/net_http.rb +8 -1
  65. data/lib/scout_apm/instruments/typhoeus.rb +88 -0
  66. data/lib/scout_apm/job_record.rb +4 -2
  67. data/lib/scout_apm/layaway_file.rb +4 -0
  68. data/lib/scout_apm/layer.rb +6 -57
  69. data/lib/scout_apm/layer_children_set.rb +9 -8
  70. data/lib/scout_apm/layer_converters/converter_base.rb +15 -30
  71. data/lib/scout_apm/layer_converters/slow_job_converter.rb +12 -2
  72. data/lib/scout_apm/layer_converters/slow_request_converter.rb +14 -4
  73. data/lib/scout_apm/layer_converters/trace_converter.rb +184 -0
  74. data/lib/scout_apm/limited_layer.rb +0 -7
  75. data/lib/scout_apm/metric_stats.rb +0 -8
  76. data/lib/scout_apm/middleware.rb +1 -1
  77. data/lib/scout_apm/periodic_work.rb +19 -0
  78. data/lib/scout_apm/remote/message.rb +4 -0
  79. data/lib/scout_apm/remote/server.rb +13 -1
  80. data/lib/scout_apm/reporter.rb +8 -3
  81. data/lib/scout_apm/reporting.rb +2 -1
  82. data/lib/scout_apm/request_histograms.rb +8 -0
  83. data/lib/scout_apm/serializers/app_server_load_serializer.rb +4 -0
  84. data/lib/scout_apm/serializers/directive_serializer.rb +4 -0
  85. data/lib/scout_apm/serializers/payload_serializer.rb +2 -2
  86. data/lib/scout_apm/serializers/payload_serializer_to_json.rb +8 -7
  87. data/lib/scout_apm/slow_job_record.rb +5 -1
  88. data/lib/scout_apm/slow_policy/age_policy.rb +33 -0
  89. data/lib/scout_apm/slow_policy/percent_policy.rb +22 -0
  90. data/lib/scout_apm/slow_policy/percentile_policy.rb +24 -0
  91. data/lib/scout_apm/slow_policy/policy.rb +21 -0
  92. data/lib/scout_apm/slow_policy/speed_policy.rb +16 -0
  93. data/lib/scout_apm/slow_request_policy.rb +18 -77
  94. data/lib/scout_apm/slow_transaction.rb +3 -1
  95. data/lib/scout_apm/store.rb +0 -1
  96. data/lib/scout_apm/tracer.rb +2 -2
  97. data/lib/scout_apm/tracked_request.rb +39 -30
  98. data/lib/scout_apm/utils/backtrace_parser.rb +3 -0
  99. data/lib/scout_apm/utils/marshal_logging.rb +90 -0
  100. data/lib/scout_apm/utils/sql_sanitizer.rb +10 -1
  101. data/lib/scout_apm/utils/sql_sanitizer_regex.rb +8 -1
  102. data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb +6 -0
  103. data/lib/scout_apm/utils/unique_id.rb +27 -0
  104. data/lib/scout_apm/version.rb +1 -1
  105. data/scout_apm.gemspec +13 -7
  106. data/test/test_helper.rb +2 -2
  107. data/test/unit/agent_context_test.rb +29 -0
  108. data/test/unit/auto_instrument/assignments-instrumented.rb +31 -0
  109. data/test/unit/auto_instrument/assignments.rb +31 -0
  110. data/test/unit/auto_instrument/controller-ast.txt +57 -0
  111. data/test/unit/auto_instrument/controller-instrumented.rb +49 -0
  112. data/test/unit/auto_instrument/controller.rb +49 -0
  113. data/test/unit/auto_instrument/rescue_from-instrumented.rb +13 -0
  114. data/test/unit/auto_instrument/rescue_from.rb +13 -0
  115. data/test/unit/auto_instrument_test.rb +54 -0
  116. data/test/unit/environment_test.rb +2 -2
  117. data/test/unit/error_service/error_buffer_test.rb +25 -0
  118. data/test/unit/error_service/ignored_exceptions_test.rb +49 -0
  119. data/test/unit/instruments/active_record_test.rb +40 -0
  120. data/test/unit/layer_children_set_test.rb +9 -0
  121. data/test/unit/request_histograms_test.rb +17 -0
  122. data/test/unit/serializers/payload_serializer_test.rb +39 -5
  123. data/test/unit/slow_request_policy_test.rb +41 -13
  124. data/test/unit/sql_sanitizer_test.rb +78 -0
  125. data/test/unit/tracer_test.rb +25 -0
  126. metadata +101 -18
  127. data/ext/stacks/extconf.rb +0 -38
  128. data/ext/stacks/scout_atomics.h +0 -86
  129. data/ext/stacks/stacks.c +0 -814
  130. data/lib/scout_apm/slow_job_policy.rb +0 -111
  131. data/lib/scout_apm/trace_compactor.rb +0 -312
  132. data/lib/scout_apm/utils/fake_stacks.rb +0 -88
  133. data/test/unit/instruments/active_record_instruments_test.rb +0 -5
  134. data/test/unit/slow_job_policy_test.rb +0 -6
  135. data/tester.rb +0 -53
@@ -5,11 +5,13 @@ module ScoutApm
5
5
  MULTIPLE_SPACES = %r|\s+|.freeze
6
6
  MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
7
7
 
8
- PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
8
+ PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*\z|.freeze
9
9
  PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
10
10
  PSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
11
11
  PSQL_PLACEHOLDER = /\$\d+/.freeze
12
12
  PSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
13
+ PSQL_AFTER_WHERE = /(?:WHERE\s+).*?(?:SELECT|\z)/im.freeze
14
+ PSQL_AFTER_SET = /(?:SET\s+).*?(?:WHERE|\z)/im.freeze
13
15
 
14
16
  MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
15
17
  MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
@@ -20,6 +22,11 @@ module ScoutApm
20
22
  SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
21
23
  SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
22
24
  SQLITE_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
25
+
26
+ # => "EXEC sp_executesql N'SELECT [users].* FROM [users] WHERE (age > 50) ORDER BY [users].[id] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY', N'@0 int', @0 = 10"
27
+ SQLSERVER_EXECUTESQL = /EXEC sp_executesql N'(.*?)'.*/
28
+ SQLSERVER_REMOVE_INTEGERS = /(?<!LIMIT )\b(?<!@)\d+\b/.freeze
29
+ SQLSERVER_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
23
30
  end
24
31
  end
25
32
  end
@@ -10,6 +10,8 @@ module ScoutApm
10
10
  PSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
11
11
  PSQL_PLACEHOLDER = /\$\d+/.freeze
12
12
  PSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
13
+ PSQL_AFTER_WHERE = /(?:WHERE\s+).*?(?:SELECT|$)/i.freeze
14
+ PSQL_AFTER_SET = /(?:SET\s+).*?(?:WHERE|$)/i.freeze
13
15
 
14
16
  MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
15
17
  MYSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
@@ -21,6 +23,10 @@ module ScoutApm
21
23
  SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
22
24
  SQLITE_REMOVE_INTEGERS = /\b\d+\b/.freeze
23
25
 
26
+ # This is not officially supported, but will do its best.
27
+ SQLSERVER_EXECUTESQL = /EXEC sp_executesql N'(.*?)'.*/
28
+ SQLSERVER_REMOVE_INTEGERS = /\b\d+\b/.freeze
29
+ SQLSERVER_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
24
30
  end
25
31
  end
26
32
  end
@@ -11,5 +11,32 @@ module ScoutApm
11
11
  s
12
12
  end
13
13
  end
14
+
15
+ # Represents a random ID that we can use to track a certain transaction.
16
+ # The `trans` prefix is only for ease of reading logs - it should not be
17
+ # interpreted to convey any sort of meaning.
18
+ class TransactionId
19
+ def initialize
20
+ @random = SecureRandom.hex(16)
21
+ end
22
+
23
+ def to_s
24
+ "trans-#{@random}"
25
+ end
26
+ end
27
+
28
+ # Represents a random ID that we can use to track a certain span. The
29
+ # `span` prefix is only for ease of reading logs - it should not be
30
+ # interpreted to convey any sort of meaning.
31
+ class SpanId
32
+ def initialize
33
+ @random = SecureRandom.hex(16)
34
+ end
35
+
36
+ def to_s
37
+ "span-#{@random}"
38
+ end
39
+ end
40
+
14
41
  end
15
42
  end
@@ -1,3 +1,3 @@
1
1
  module ScoutApm
2
- VERSION = "3.0.0.pre28"
2
+ VERSION = "4.0.4"
3
3
  end
data/scout_apm.gemspec CHANGED
@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
19
19
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
20
20
  s.require_paths = ["lib","data"]
21
21
  s.extensions << 'ext/allocations/extconf.rb'
22
- s.extensions << 'ext/stacks/extconf.rb'
23
22
  s.extensions << 'ext/rusage/extconf.rb'
24
23
 
24
+ s.required_ruby_version = '>= 2.1'
25
+
25
26
  s.add_development_dependency "minitest"
26
27
  s.add_development_dependency "mocha"
27
28
  s.add_development_dependency "pry"
@@ -29,11 +30,16 @@ Gem::Specification.new do |s|
29
30
  s.add_development_dependency "rake-compiler"
30
31
  s.add_development_dependency "addressable"
31
32
  s.add_development_dependency "activesupport"
33
+ s.add_runtime_dependency "parser"
34
+
35
+ # These are general development dependencies which are used in instrumentation
36
+ # tests. Specific versions are pulled in using specific gemfiles, e.g.
37
+ # `gems/rails3.gemfile`.
38
+ s.add_development_dependency "activerecord"
39
+ s.add_development_dependency "sqlite3"
32
40
 
33
- if RUBY_VERSION >= "1.9.3"
34
- s.add_development_dependency "rubocop"
35
- s.add_development_dependency "guard"
36
- s.add_development_dependency "guard-minitest"
37
- s.add_development_dependency "m"
38
- end
41
+ s.add_development_dependency "rubocop"
42
+ s.add_development_dependency "guard"
43
+ s.add_development_dependency "guard-minitest"
44
+ s.add_development_dependency "m"
39
45
  end
data/test/test_helper.rb CHANGED
@@ -5,7 +5,7 @@ SimpleCov.start
5
5
  require 'minitest/autorun'
6
6
  require 'minitest/unit'
7
7
  require 'minitest/pride'
8
- require 'mocha/mini_test'
8
+ require 'mocha/minitest'
9
9
  require 'pry'
10
10
 
11
11
 
@@ -100,7 +100,7 @@ class Minitest::Test
100
100
  end
101
101
 
102
102
  def agent_context
103
- ScoutApm::AgentContext.new
103
+ ScoutApm::Agent.instance.context
104
104
  end
105
105
 
106
106
  DATA_FILE_DIR = File.dirname(__FILE__) + '/tmp'
@@ -0,0 +1,29 @@
1
+ require "test_helper"
2
+
3
+ require "scout_apm/agent_context"
4
+
5
+ class AgentContextTest < Minitest::Test
6
+ def test_has_error_service_ignored_exceptions
7
+ context = ScoutApm::AgentContext.new
8
+ assert ScoutApm::ErrorService::IgnoredExceptions, context.ignored_exceptions.class
9
+ end
10
+
11
+ def test_has_error_buffer
12
+ context = ScoutApm::AgentContext.new
13
+ assert ScoutApm::ErrorService::ErrorBuffer, context.error_buffer.class
14
+ end
15
+
16
+
17
+ class TestPolicy
18
+ def call(req); 1; end
19
+ def stored!(req); end
20
+ end
21
+
22
+ def test_customize_slow_request_policy
23
+ context = ScoutApm::AgentContext.new
24
+ assert 4, context.slow_request_policy.policies
25
+
26
+ context.slow_request_policy.add(TestPolicy.new)
27
+ assert 5, context.slow_request_policy.policies
28
+ end
29
+ end
@@ -0,0 +1,31 @@
1
+
2
+ class Assignments
3
+ def test_op_asgn
4
+ foo.bar += ::ScoutApm::AutoInstrument("User.size",["ROOT/test/unit/auto_instrument/assignments.rb:4:in `test_op_asgn'"]){User.size}
5
+ foo.bar -= ::ScoutApm::AutoInstrument("User.size",["ROOT/test/unit/auto_instrument/assignments.rb:5:in `test_op_asgn'"]){User.size}
6
+ end
7
+
8
+ def nested_assignment
9
+ @email ||= if (email = ::ScoutApm::AutoInstrument("session[\"email\"]",["ROOT/test/unit/auto_instrument/assignments.rb:9:in `nested_assignment'"]){session["email"]}).present?
10
+ ::ScoutApm::AutoInstrument("User.where(email: email).first",["ROOT/test/unit/auto_instrument/assignments.rb:10:in `nested_assignment'"]){User.where(email: email).first}
11
+ else
12
+ nil
13
+ end
14
+ end
15
+
16
+ def paginate_collection(coll)
17
+ page = (::ScoutApm::AutoInstrument("params[:page].present?",["ROOT/test/unit/auto_instrument/assignments.rb:17:in `paginate_collection'"]){params[:page].present?} ? ::ScoutApm::AutoInstrument("params[:page].to_i",["ROOT/test/unit/auto_instrument/assignments.rb:17:in `paginate_collection'"]){params[:page].to_i} : 1)
18
+ per_page = (::ScoutApm::AutoInstrument("params[:per_page].present?",["ROOT/test/unit/auto_instrument/assignments.rb:18:in `paginate_collection'"]){params[:per_page].present?} ? ::ScoutApm::AutoInstrument("params[:per_page].to_i",["ROOT/test/unit/auto_instrument/assignments.rb:18:in `paginate_collection'"]){params[:per_page].to_i} : 20)
19
+ pagination, self.collection = ::ScoutApm::AutoInstrument("pagy(...",["ROOT/test/unit/auto_instrument/assignments.rb:19:in `paginate_collection'"]){pagy(
20
+ coll,
21
+ items: per_page,
22
+ page: page
23
+ )}
24
+ ::ScoutApm::AutoInstrument("headers[PAGINATION_TOTAL_HEADER] = pagination.count.to_s",["ROOT/test/unit/auto_instrument/assignments.rb:24:in `paginate_collection'"]){headers[PAGINATION_TOTAL_HEADER] = pagination.count.to_s}
25
+ ::ScoutApm::AutoInstrument("headers[PAGINATION_TOTAL_PAGES_HEADER] = pagination.pages.to_s",["ROOT/test/unit/auto_instrument/assignments.rb:25:in `paginate_collection'"]){headers[PAGINATION_TOTAL_PAGES_HEADER] = pagination.pages.to_s}
26
+ ::ScoutApm::AutoInstrument("headers[PAGINATION_PER_PAGE_HEADER] = per_page.to_s",["ROOT/test/unit/auto_instrument/assignments.rb:26:in `paginate_collection'"]){headers[PAGINATION_PER_PAGE_HEADER] = per_page.to_s}
27
+ ::ScoutApm::AutoInstrument("headers[PAGINATION_PAGE_HEADER] = pagination.page.to_s",["ROOT/test/unit/auto_instrument/assignments.rb:27:in `paginate_collection'"]){headers[PAGINATION_PAGE_HEADER] = pagination.page.to_s}
28
+ ::ScoutApm::AutoInstrument("headers[PAGINATION_NEXT_PAGE_HEADER] = pagination.next.to_s",["ROOT/test/unit/auto_instrument/assignments.rb:28:in `paginate_collection'"]){headers[PAGINATION_NEXT_PAGE_HEADER] = pagination.next.to_s}
29
+ ::ScoutApm::AutoInstrument("collection",["ROOT/test/unit/auto_instrument/assignments.rb:29:in `paginate_collection'"]){collection}
30
+ end
31
+ end
@@ -0,0 +1,31 @@
1
+
2
+ class Assignments
3
+ def test_op_asgn
4
+ foo.bar += User.size
5
+ foo.bar -= User.size
6
+ end
7
+
8
+ def nested_assignment
9
+ @email ||= if (email = session["email"]).present?
10
+ User.where(email: email).first
11
+ else
12
+ nil
13
+ end
14
+ end
15
+
16
+ def paginate_collection(coll)
17
+ page = (params[:page].present? ? params[:page].to_i : 1)
18
+ per_page = (params[:per_page].present? ? params[:per_page].to_i : 20)
19
+ pagination, self.collection = pagy(
20
+ coll,
21
+ items: per_page,
22
+ page: page
23
+ )
24
+ headers[PAGINATION_TOTAL_HEADER] = pagination.count.to_s
25
+ headers[PAGINATION_TOTAL_PAGES_HEADER] = pagination.pages.to_s
26
+ headers[PAGINATION_PER_PAGE_HEADER] = per_page.to_s
27
+ headers[PAGINATION_PAGE_HEADER] = pagination.page.to_s
28
+ headers[PAGINATION_NEXT_PAGE_HEADER] = pagination.next.to_s
29
+ collection
30
+ end
31
+ end
@@ -0,0 +1,57 @@
1
+ s(:class,
2
+ s(:const, nil, :ClientsController),
3
+ s(:const, nil, :ApplicationController),
4
+ s(:begin,
5
+ s(:send, nil, :before_action,
6
+ s(:sym, :check_authorization)),
7
+ s(:def, :index,
8
+ s(:args),
9
+ s(:if,
10
+ s(:send,
11
+ s(:send,
12
+ s(:send, nil, :params), :[],
13
+ s(:sym, :status)), :==,
14
+ s(:str, "activated")),
15
+ s(:ivasgn, :@clients,
16
+ s(:send,
17
+ s(:const, nil, :Client), :activated)),
18
+ s(:ivasgn, :@clients,
19
+ s(:send,
20
+ s(:const, nil, :Client), :inactivated)))),
21
+ s(:def, :create,
22
+ s(:args),
23
+ s(:begin,
24
+ s(:ivasgn, :@client,
25
+ s(:send,
26
+ s(:const, nil, :Client), :new,
27
+ s(:send,
28
+ s(:send, nil, :params), :[],
29
+ s(:sym, :client)))),
30
+ s(:if,
31
+ s(:send,
32
+ s(:ivar, :@client), :save),
33
+ s(:send, nil, :redirect_to,
34
+ s(:ivar, :@client)),
35
+ s(:send, nil, :render,
36
+ s(:str, "new"))))),
37
+ s(:def, :edit,
38
+ s(:args),
39
+ s(:begin,
40
+ s(:ivasgn, :@client,
41
+ s(:send,
42
+ s(:const, nil, :Client), :new,
43
+ s(:send,
44
+ s(:send, nil, :params), :[],
45
+ s(:sym, :client)))),
46
+ s(:if,
47
+ s(:send,
48
+ s(:send, nil, :request), :post?),
49
+ s(:block,
50
+ s(:send,
51
+ s(:ivar, :@client), :transaction),
52
+ s(:args),
53
+ s(:send,
54
+ s(:ivar, :@client), :update_attributes,
55
+ s(:send,
56
+ s(:send, nil, :params), :[],
57
+ s(:sym, :client)))), nil)))))
@@ -0,0 +1,49 @@
1
+
2
+ class ClientsController < ApplicationController
3
+ before_action :check_authorization
4
+
5
+ def index
6
+ if ::ScoutApm::AutoInstrument("params[:status] == \"activated\"",["ROOT/test/unit/auto_instrument/controller.rb:6:in `index'"]){params[:status] == "activated"}
7
+ @clients = ::ScoutApm::AutoInstrument("Client.activated",["ROOT/test/unit/auto_instrument/controller.rb:7:in `index'"]){Client.activated}
8
+ else
9
+ @clients = ::ScoutApm::AutoInstrument("Client.inactivated",["ROOT/test/unit/auto_instrument/controller.rb:9:in `index'"]){Client.inactivated}
10
+ end
11
+ end
12
+
13
+ def create
14
+ @client = ::ScoutApm::AutoInstrument("Client.new(params[:client])",["ROOT/test/unit/auto_instrument/controller.rb:14:in `create'"]){Client.new(params[:client])}
15
+ if ::ScoutApm::AutoInstrument("@client.save",["ROOT/test/unit/auto_instrument/controller.rb:15:in `create'"]){@client.save}
16
+ ::ScoutApm::AutoInstrument("redirect_to @client",["ROOT/test/unit/auto_instrument/controller.rb:16:in `create'"]){redirect_to @client}
17
+ else
18
+ # This line overrides the default rendering behavior, which
19
+ # would have been to render the "create" view.
20
+ ::ScoutApm::AutoInstrument("render \"new\"",["ROOT/test/unit/auto_instrument/controller.rb:20:in `create'"]){render "new"}
21
+ end
22
+ end
23
+
24
+ def edit
25
+ @client = ::ScoutApm::AutoInstrument("Client.new(params[:client])",["ROOT/test/unit/auto_instrument/controller.rb:25:in `edit'"]){Client.new(params[:client])}
26
+
27
+ if ::ScoutApm::AutoInstrument("request.post?",["ROOT/test/unit/auto_instrument/controller.rb:27:in `edit'"]){request.post?}
28
+ ::ScoutApm::AutoInstrument("@client.transaction do...",["ROOT/test/unit/auto_instrument/controller.rb:28:in `edit'"]){@client.transaction do
29
+ @client.update_attributes(params[:client])
30
+ end}
31
+ end
32
+ end
33
+
34
+ def data
35
+ @clients = ::ScoutApm::AutoInstrument("Client.all",["ROOT/test/unit/auto_instrument/controller.rb:35:in `data'"]){Client.all}
36
+
37
+ formatter = ::ScoutApm::AutoInstrument("proc do |row|...",["ROOT/test/unit/auto_instrument/controller.rb:37:in `data'"]){proc do |row|
38
+ row.to_json
39
+ end}
40
+
41
+ ::ScoutApm::AutoInstrument("respond_with @clients.each(&formatter).join(\"\\n\"), :content_type => 'application/json; boundary=NL'",["ROOT/test/unit/auto_instrument/controller.rb:41:in `data'"]){respond_with @clients.each(&formatter).join("\n"), :content_type => 'application/json; boundary=NL'}
42
+ end
43
+
44
+ def things
45
+ x = {}
46
+ x[:this] ||= 'foo'
47
+ x[:that] &&= ::ScoutApm::AutoInstrument("'foo'.size",["ROOT/test/unit/auto_instrument/controller.rb:47:in `things'"]){'foo'.size}
48
+ end
49
+ end
@@ -0,0 +1,49 @@
1
+
2
+ class ClientsController < ApplicationController
3
+ before_action :check_authorization
4
+
5
+ def index
6
+ if params[:status] == "activated"
7
+ @clients = Client.activated
8
+ else
9
+ @clients = Client.inactivated
10
+ end
11
+ end
12
+
13
+ def create
14
+ @client = Client.new(params[:client])
15
+ if @client.save
16
+ redirect_to @client
17
+ else
18
+ # This line overrides the default rendering behavior, which
19
+ # would have been to render the "create" view.
20
+ render "new"
21
+ end
22
+ end
23
+
24
+ def edit
25
+ @client = Client.new(params[:client])
26
+
27
+ if request.post?
28
+ @client.transaction do
29
+ @client.update_attributes(params[:client])
30
+ end
31
+ end
32
+ end
33
+
34
+ def data
35
+ @clients = Client.all
36
+
37
+ formatter = proc do |row|
38
+ row.to_json
39
+ end
40
+
41
+ respond_with @clients.each(&formatter).join("\n"), :content_type => 'application/json; boundary=NL'
42
+ end
43
+
44
+ def things
45
+ x = {}
46
+ x[:this] ||= 'foo'
47
+ x[:that] &&= 'foo'.size
48
+ end
49
+ end
@@ -0,0 +1,13 @@
1
+
2
+ class BrokenController < ApplicationController
3
+ rescue_from Exception do |e|
4
+ if e.is_a? Pundit::NotAuthorizedError
5
+ unauthorized_error
6
+ elsif e.is_a? ActionController::ParameterMissing
7
+ error(status: 422, message: e.message)
8
+ else
9
+ log_error(e)
10
+ error message: 'Internal error', exception: e
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,13 @@
1
+
2
+ class BrokenController < ApplicationController
3
+ rescue_from Exception do |e|
4
+ if e.is_a? Pundit::NotAuthorizedError
5
+ unauthorized_error
6
+ elsif e.is_a? ActionController::ParameterMissing
7
+ error(status: 422, message: e.message)
8
+ else
9
+ log_error(e)
10
+ error message: 'Internal error', exception: e
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,54 @@
1
+ require 'test_helper'
2
+
3
+ require 'scout_apm/auto_instrument'
4
+
5
+ class AutoInstrumentTest < Minitest::Test
6
+ ROOT = File.expand_path("../../", __dir__)
7
+
8
+ def source_path(name)
9
+ File.expand_path("auto_instrument/#{name}.rb", __dir__)
10
+ end
11
+
12
+ def instrumented_path(name)
13
+ File.expand_path("auto_instrument/#{name}-instrumented.rb", __dir__)
14
+ end
15
+
16
+ def instrumented_source(name)
17
+ File.read(instrumented_path(name))
18
+ end
19
+
20
+ # Autoinstruments adds a backtrace to each created layer. This is the full path to the
21
+ # test controller.rb file, which will be different on different environments.
22
+ # This normalizes backtraces across environments.
23
+ def normalize_backtrace(string)
24
+ string.gsub(ROOT, "ROOT")
25
+ end
26
+
27
+ # Use this to automatically update the test fixtures.
28
+ def update_instrumented_source(name)
29
+ source = ::ScoutApm::AutoInstrument::Rails.rewrite(source_path(name))
30
+ source = normalize_backtrace(source)
31
+ File.write(instrumented_path(name),source)
32
+ end
33
+
34
+ def test_controller_rewrite
35
+ # update_instrumented_source("controller")
36
+
37
+ assert_equal instrumented_source("controller"),
38
+ normalize_backtrace(::ScoutApm::AutoInstrument::Rails.rewrite(source_path("controller")))
39
+ end
40
+
41
+ def test_rescue_from_rewrite
42
+ # update_instrumented_source("rescue_from")
43
+
44
+ assert_equal instrumented_source("rescue_from"),
45
+ normalize_backtrace(::ScoutApm::AutoInstrument::Rails.rewrite(source_path("rescue_from")))
46
+ end
47
+
48
+ def test_assignments_rewrite
49
+ # update_instrumented_source("assignments")
50
+
51
+ assert_equal instrumented_source("assignments"),
52
+ normalize_backtrace(::ScoutApm::AutoInstrument::Rails.rewrite(source_path("assignments")))
53
+ end
54
+ end if defined? ScoutApm::AutoInstrument