appsignal 1.4.0.alpha.2 → 1.4.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rspec +3 -1
- data/.travis.yml +3 -1
- data/CHANGELOG.md +38 -1
- data/Rakefile +29 -12
- data/benchmark.rake +3 -7
- data/ext/agent.yml +11 -11
- data/ext/appsignal_extension.c +364 -72
- data/ext/extconf.rb +2 -4
- data/gemfiles/resque.gemfile +1 -0
- data/lib/appsignal.rb +40 -30
- data/lib/appsignal/auth_check.rb +1 -1
- data/lib/appsignal/cli/diagnose.rb +4 -3
- data/lib/appsignal/cli/install.rb +16 -15
- data/lib/appsignal/config.rb +31 -31
- data/lib/appsignal/event_formatter.rb +1 -1
- data/lib/appsignal/extension.rb +6 -0
- data/lib/appsignal/garbage_collection_profiler.rb +47 -0
- data/lib/appsignal/hooks.rb +1 -0
- data/lib/appsignal/hooks/active_support_notifications.rb +43 -0
- data/lib/appsignal/integrations/capistrano/appsignal.cap +1 -1
- data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb +2 -2
- data/lib/appsignal/integrations/mongo_ruby_driver.rb +1 -1
- data/lib/appsignal/integrations/object.rb +4 -4
- data/lib/appsignal/integrations/padrino.rb +1 -1
- data/lib/appsignal/integrations/sinatra.rb +1 -1
- data/lib/appsignal/integrations/webmachine.rb +2 -2
- data/lib/appsignal/js_exception_transaction.rb +7 -10
- data/lib/appsignal/marker.rb +3 -2
- data/lib/appsignal/rack/generic_instrumentation.rb +1 -1
- data/lib/appsignal/rack/sinatra_instrumentation.rb +13 -6
- data/lib/appsignal/rack/streaming_listener.rb +5 -3
- data/lib/appsignal/system.rb +36 -0
- data/lib/appsignal/transaction.rb +20 -20
- data/lib/appsignal/transmitter.rb +11 -7
- data/lib/appsignal/utils.rb +76 -2
- data/lib/appsignal/version.rb +1 -1
- data/spec/lib/appsignal/auth_check_spec.rb +0 -2
- data/spec/lib/appsignal/capistrano2_spec.rb +99 -79
- data/spec/lib/appsignal/capistrano3_spec.rb +57 -78
- data/spec/lib/appsignal/cli/diagnose_spec.rb +17 -15
- data/spec/lib/appsignal/cli/install_spec.rb +38 -20
- data/spec/lib/appsignal/cli/notify_of_deploy_spec.rb +2 -5
- data/spec/lib/appsignal/cli_spec.rb +2 -5
- data/spec/lib/appsignal/config_spec.rb +385 -158
- data/spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb +1 -3
- data/spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/event_formatter_spec.rb +0 -2
- data/spec/lib/appsignal/extension_spec.rb +7 -8
- data/spec/lib/appsignal/garbage_collection_profiler_spec.rb +71 -0
- data/spec/lib/appsignal/hooks/active_support_notifications_spec.rb +42 -0
- data/spec/lib/appsignal/hooks/celluloid_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/data_mapper_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/delayed_job_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/net_http_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/passenger_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/puma_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/rake_spec.rb +1 -2
- data/spec/lib/appsignal/hooks/redis_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/sequel_spec.rb +19 -21
- data/spec/lib/appsignal/hooks/shoryuken_spec.rb +1 -4
- data/spec/lib/appsignal/hooks/sidekiq_spec.rb +2 -3
- data/spec/lib/appsignal/hooks/unicorn_spec.rb +0 -2
- data/spec/lib/appsignal/hooks/webmachine_spec.rb +4 -11
- data/spec/lib/appsignal/hooks_spec.rb +0 -2
- data/spec/lib/appsignal/integrations/data_mapper_spec.rb +0 -1
- data/spec/lib/appsignal/integrations/grape_spec.rb +1 -3
- data/spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb +1 -2
- data/spec/lib/appsignal/integrations/object_spec.rb +32 -3
- data/spec/lib/appsignal/integrations/padrino_spec.rb +4 -11
- data/spec/lib/appsignal/integrations/railtie_spec.rb +1 -3
- data/spec/lib/appsignal/integrations/resque_active_job_spec.rb +1 -3
- data/spec/lib/appsignal/integrations/resque_spec.rb +2 -4
- data/spec/lib/appsignal/integrations/sinatra_spec.rb +33 -8
- data/spec/lib/appsignal/integrations/webmachine_spec.rb +6 -15
- data/spec/lib/appsignal/js_exception_transaction_spec.rb +3 -5
- data/spec/lib/appsignal/marker_spec.rb +35 -48
- data/spec/lib/appsignal/minutely_spec.rb +0 -2
- data/spec/lib/appsignal/rack/generic_instrumentation_spec.rb +0 -2
- data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb +0 -2
- data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb +3 -5
- data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb +47 -11
- data/spec/lib/appsignal/rack/streaming_listener_spec.rb +6 -7
- data/spec/lib/appsignal/system/container_spec.rb +67 -0
- data/spec/lib/appsignal/system_spec.rb +49 -0
- data/spec/lib/appsignal/transaction_spec.rb +30 -13
- data/spec/lib/appsignal/transmitter_spec.rb +53 -20
- data/spec/lib/appsignal/utils/gzip_spec.rb +10 -0
- data/spec/lib/appsignal/utils/params_sanitizer_spec.rb +0 -2
- data/spec/lib/appsignal/utils/query_params_sanitizer_spec.rb +0 -2
- data/spec/lib/appsignal/utils_spec.rb +59 -3
- data/spec/lib/appsignal_spec.rb +132 -58
- data/spec/spec_helper.rb +24 -116
- data/spec/support/fixtures/containers/cgroups/docker +14 -0
- data/spec/support/fixtures/containers/cgroups/docker_systemd +8 -0
- data/spec/support/fixtures/containers/cgroups/lxc +10 -0
- data/spec/support/fixtures/containers/cgroups/no_permission +0 -0
- data/spec/support/fixtures/containers/cgroups/none +1 -0
- data/spec/support/helpers/api_request_helper.rb +22 -0
- data/spec/support/helpers/dependency_helper.rb +61 -0
- data/spec/support/helpers/directory_helper.rb +27 -0
- data/spec/support/helpers/std_streams_helper.rb +35 -0
- data/spec/support/helpers/system_helpers.rb +24 -0
- data/spec/support/helpers/transaction_helpers.rb +7 -64
- data/spec/support/helpers/very_specific_error.rb +8 -0
- data/spec/support/mocks/fake_gc_profiler.rb +19 -0
- data/spec/support/project_fixture/config/appsignal.yml +10 -1
- metadata +60 -35
- data/circle.yml +0 -12
- data/lib/appsignal/subscriber.rb +0 -55
- data/lib/appsignal/update_active_support.rb +0 -20
- data/lib/vendor/active_support/notifications.rb +0 -212
- data/lib/vendor/active_support/notifications/fanout.rb +0 -157
- data/lib/vendor/active_support/notifications/instrumenter.rb +0 -73
- data/lib/vendor/active_support/per_thread_registry.rb +0 -53
- data/spec/lib/appsignal/subscriber_spec.rb +0 -160
- data/spec/lib/appsignal/update_active_support_spec.rb +0 -17
- data/spec/support/helpers/notification_helpers.rb +0 -14
@@ -0,0 +1,14 @@
|
|
1
|
+
14:name=systemd:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
2
|
+
13:pids:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
3
|
+
12:hugetlb:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
4
|
+
11:net_prio:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
5
|
+
10:perf_event:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
6
|
+
9:net_cls:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
7
|
+
8:freezer:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
8
|
+
7:devices:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
9
|
+
6:memory:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
10
|
+
5:blkio:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
11
|
+
4:cpuacct:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
12
|
+
3:cpu:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
13
|
+
2:cpuset:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
|
14
|
+
1:name=openrc:/docker
|
@@ -0,0 +1,8 @@
|
|
1
|
+
8:net_cls:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
2
|
+
7:freezer:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
3
|
+
6:devices:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
4
|
+
5:memory:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
5
|
+
4:blkio:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
6
|
+
3:cpu,cpuacct:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
7
|
+
2:cpuset:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
8
|
+
1:name=openrc:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
|
@@ -0,0 +1,10 @@
|
|
1
|
+
11:name=systemd:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
2
|
+
10:hugetlb:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
3
|
+
9:perf_event:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
4
|
+
8:blkio:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
5
|
+
7:freezer:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
6
|
+
6:devices:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
7
|
+
5:memory:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
8
|
+
4:cpuacct:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
9
|
+
3:cpu:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
10
|
+
2:cpuset:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
2:name=systemd:/user/0.user/1.session
|
@@ -0,0 +1,22 @@
|
|
1
|
+
module ApiRequestHelper
|
2
|
+
def stub_api_request(config, path, body = nil)
|
3
|
+
options = {
|
4
|
+
:query => {
|
5
|
+
:api_key => config[:push_api_key],
|
6
|
+
:name => config[:name],
|
7
|
+
:environment => config.env,
|
8
|
+
:hostname => config[:hostname],
|
9
|
+
:gem_version => Appsignal::VERSION
|
10
|
+
},
|
11
|
+
:headers => {
|
12
|
+
'Content-Encoding' => 'gzip',
|
13
|
+
'Content-Type' => 'application/json; charset=UTF-8',
|
14
|
+
}
|
15
|
+
}
|
16
|
+
if body.is_a? Hash
|
17
|
+
body = Appsignal::Utils::Gzip.compress(Appsignal::Utils::JSON.generate(body))
|
18
|
+
end
|
19
|
+
options[:body] = body if body
|
20
|
+
stub_request(:post, "#{config[:endpoint]}/1/#{path}").with(options)
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,61 @@
|
|
1
|
+
module DependencyHelper
|
2
|
+
module_function
|
3
|
+
|
4
|
+
def running_jruby?
|
5
|
+
defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
|
6
|
+
end
|
7
|
+
|
8
|
+
def rails_present?
|
9
|
+
dependency_present? 'rails'
|
10
|
+
end
|
11
|
+
|
12
|
+
def sequel_present?
|
13
|
+
dependency_present? 'sequel'
|
14
|
+
end
|
15
|
+
|
16
|
+
def resque_present?
|
17
|
+
dependency_present? 'resque'
|
18
|
+
end
|
19
|
+
|
20
|
+
def active_job_present?
|
21
|
+
dependency_present? 'activejob'
|
22
|
+
end
|
23
|
+
|
24
|
+
def active_support_present?
|
25
|
+
dependency_present? 'activesupport'
|
26
|
+
end
|
27
|
+
|
28
|
+
def sinatra_present?
|
29
|
+
dependency_present? 'sinatra'
|
30
|
+
end
|
31
|
+
|
32
|
+
def padrino_present?
|
33
|
+
dependency_present? 'padrino'
|
34
|
+
end
|
35
|
+
|
36
|
+
def grape_present?
|
37
|
+
dependency_present? 'grape'
|
38
|
+
end
|
39
|
+
|
40
|
+
def webmachine_present?
|
41
|
+
dependency_present? 'webmachine'
|
42
|
+
end
|
43
|
+
|
44
|
+
def capistrano_present?
|
45
|
+
dependency_present? 'capistrano'
|
46
|
+
end
|
47
|
+
|
48
|
+
def capistrano2_present?
|
49
|
+
capistrano_present? &&
|
50
|
+
Gem.loaded_specs['capistrano'].version < Gem::Version.new('3.0')
|
51
|
+
end
|
52
|
+
|
53
|
+
def capistrano3_present?
|
54
|
+
capistrano_present? &&
|
55
|
+
Gem.loaded_specs['capistrano'].version >= Gem::Version.new('3.0')
|
56
|
+
end
|
57
|
+
|
58
|
+
def dependency_present?(dependency_file)
|
59
|
+
Gem.loaded_specs.key? dependency_file
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
module DirectoryHelper
|
2
|
+
module_function
|
3
|
+
|
4
|
+
def project_dir
|
5
|
+
@project_dir ||= File.expand_path('..', spec_dir)
|
6
|
+
end
|
7
|
+
|
8
|
+
def spec_dir
|
9
|
+
APPSIGNAL_SPEC_DIR
|
10
|
+
end
|
11
|
+
|
12
|
+
def support_dir
|
13
|
+
@support_dir ||= File.join(spec_dir, 'support')
|
14
|
+
end
|
15
|
+
|
16
|
+
def tmp_dir
|
17
|
+
@tmp_dir ||= File.join(spec_dir, 'tmp')
|
18
|
+
end
|
19
|
+
|
20
|
+
def fixtures_dir
|
21
|
+
@fixtures_dir ||= File.join(support_dir, 'fixtures')
|
22
|
+
end
|
23
|
+
|
24
|
+
def resources_dir
|
25
|
+
@resources_dir ||= File.join(project_dir, 'resources')
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
module StdStreamsHelper
|
2
|
+
# Capture STDOUT in a variable
|
3
|
+
#
|
4
|
+
# Usage
|
5
|
+
#
|
6
|
+
# out_stream = StringIO.new
|
7
|
+
# capture_stdout(out_stream) { do_something }
|
8
|
+
def capture_stdout(stdout)
|
9
|
+
original_stdout = $stdout
|
10
|
+
$stdout = stdout
|
11
|
+
|
12
|
+
yield
|
13
|
+
|
14
|
+
$stdout = original_stdout
|
15
|
+
end
|
16
|
+
|
17
|
+
# Capture STDOUT and STDERR in variables
|
18
|
+
#
|
19
|
+
# Usage
|
20
|
+
#
|
21
|
+
# out_stream = StringIO.new
|
22
|
+
# err_stream = StringIO.new
|
23
|
+
# capture_std_streams(out_stream, err_stream) { do_something }
|
24
|
+
def capture_std_streams(stdout, stderr)
|
25
|
+
original_stdout = $stdout
|
26
|
+
$stdout = stdout
|
27
|
+
original_stderr = $stderr
|
28
|
+
$stderr = stderr
|
29
|
+
|
30
|
+
yield
|
31
|
+
|
32
|
+
$stdout = original_stdout
|
33
|
+
$stderr = original_stderr
|
34
|
+
end
|
35
|
+
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
module SystemHelpers
|
2
|
+
def recognize_as_heroku
|
3
|
+
ENV['DYNO'] = 'dyno1'
|
4
|
+
value = recognize_as_container :lxc do
|
5
|
+
yield
|
6
|
+
end
|
7
|
+
ENV.delete 'DYNO'
|
8
|
+
value
|
9
|
+
end
|
10
|
+
|
11
|
+
def recognize_as_container(file)
|
12
|
+
org_cgroup_file = Appsignal::System::Container::CGROUP_FILE
|
13
|
+
Appsignal::System::Container.send :remove_const, :CGROUP_FILE
|
14
|
+
Appsignal::System::Container.send :const_set, :CGROUP_FILE,
|
15
|
+
File.join(DirectoryHelper.fixtures_dir, 'containers', 'cgroups', file.to_s)
|
16
|
+
|
17
|
+
value = yield
|
18
|
+
|
19
|
+
Appsignal::System::Container.send :remove_const, :CGROUP_FILE
|
20
|
+
Appsignal::System::Container.send :const_set, :CGROUP_FILE, org_cgroup_file
|
21
|
+
|
22
|
+
value
|
23
|
+
end
|
24
|
+
end
|
@@ -1,61 +1,13 @@
|
|
1
1
|
module TransactionHelpers
|
2
2
|
def uploaded_file
|
3
|
-
if rails_present?
|
3
|
+
if DependencyHelper.rails_present?
|
4
4
|
ActionDispatch::Http::UploadedFile.new(:tempfile => '/tmp')
|
5
5
|
else
|
6
6
|
::Rack::Multipart::UploadedFile.new(File.join(fixtures_dir, '/uploaded_file.txt'))
|
7
7
|
end
|
8
8
|
end
|
9
9
|
|
10
|
-
def
|
11
|
-
appsignal_transaction(:process_action_event => notification_event).tap do |o|
|
12
|
-
o.set_tags('user_id' => 123)
|
13
|
-
begin
|
14
|
-
raise ArgumentError, 'oh no'
|
15
|
-
rescue ArgumentError => exception
|
16
|
-
exception.stub(:backtrace => [
|
17
|
-
File.join(project_fixture_path, 'app/controllers/somethings_controller.rb:10').to_s,
|
18
|
-
'/user/local/ruby/path.rb:8'
|
19
|
-
])
|
20
|
-
o.set_exception(exception)
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|
25
|
-
def regular_transaction
|
26
|
-
appsignal_transaction(:process_action_event => notification_event)
|
27
|
-
end
|
28
|
-
|
29
|
-
def regular_transaction_with_x_request_start
|
30
|
-
appsignal_transaction(
|
31
|
-
:process_action_event => notification_event,
|
32
|
-
'HTTP_X_REQUEST_START' => "t=#{((fixed_time - 0.04) * 1000).to_i}"
|
33
|
-
)
|
34
|
-
end
|
35
|
-
|
36
|
-
def slow_transaction(args={})
|
37
|
-
appsignal_transaction(
|
38
|
-
{
|
39
|
-
:process_action_event => notification_event(
|
40
|
-
:start => fixed_time,
|
41
|
-
:ending => fixed_time + Appsignal.config[:slow_request_threshold] / 999.99
|
42
|
-
)
|
43
|
-
}.merge(args)
|
44
|
-
)
|
45
|
-
end
|
46
|
-
|
47
|
-
def slower_transaction(args={})
|
48
|
-
appsignal_transaction(
|
49
|
-
{
|
50
|
-
:process_action_event => notification_event(
|
51
|
-
:start => fixed_time,
|
52
|
-
:ending => fixed_time + Appsignal.config[:slow_request_threshold] / 499.99
|
53
|
-
)
|
54
|
-
}.merge(args)
|
55
|
-
)
|
56
|
-
end
|
57
|
-
|
58
|
-
def background_job_transaction(args={}, payload=background_env_with_data)
|
10
|
+
def background_job_transaction(args={})
|
59
11
|
Appsignal::Transaction.create(
|
60
12
|
'1',
|
61
13
|
Appsignal::Transaction::BACKGROUND_JOB,
|
@@ -66,23 +18,14 @@ module TransactionHelpers
|
|
66
18
|
)
|
67
19
|
end
|
68
20
|
|
69
|
-
def
|
70
|
-
process_action_event = args.delete(:process_action_event)
|
71
|
-
args.delete(:events) || [
|
72
|
-
notification_event(:name => 'query.mongoid')
|
73
|
-
]
|
74
|
-
exception = args.delete(:exception)
|
21
|
+
def http_request_transaction(args={})
|
75
22
|
Appsignal::Transaction.create(
|
76
23
|
'1',
|
77
|
-
|
78
|
-
{
|
79
|
-
'HTTP_USER_AGENT' => 'IE6',
|
24
|
+
Appsignal::Transaction::HTTP_REQUEST,
|
25
|
+
Appsignal::Transaction::GenericRequest.new({
|
80
26
|
'SERVER_NAME' => 'localhost',
|
81
27
|
'action_dispatch.routes' => 'not_available'
|
82
|
-
}.merge(args)
|
83
|
-
)
|
84
|
-
o.set_action(process_action_event.name)
|
85
|
-
o.set_exception(exception) if exception
|
86
|
-
end
|
28
|
+
}.merge(args))
|
29
|
+
)
|
87
30
|
end
|
88
31
|
end
|
@@ -0,0 +1,8 @@
|
|
1
|
+
# This VerySpecificError is used for throwing errors in specs that are allowed
|
2
|
+
# or expected.
|
3
|
+
#
|
4
|
+
# For example, this error can be thrown to raise an exception in AppSignal's
|
5
|
+
# run, which should stop the program and the appsignal gem, but not crash the
|
6
|
+
# test suite.
|
7
|
+
class VerySpecificError < RuntimeError
|
8
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
class FakeGCProfiler
|
2
|
+
attr_accessor :total_time
|
3
|
+
attr_writer :clear_delay
|
4
|
+
|
5
|
+
def initialize(total_time = 0)
|
6
|
+
@total_time = total_time
|
7
|
+
end
|
8
|
+
|
9
|
+
def clear
|
10
|
+
sleep clear_delay
|
11
|
+
@total_time = 0
|
12
|
+
end
|
13
|
+
|
14
|
+
private
|
15
|
+
|
16
|
+
def clear_delay
|
17
|
+
@clear_delay ||= 0
|
18
|
+
end
|
19
|
+
end
|
@@ -16,8 +16,17 @@ test:
|
|
16
16
|
debug: true
|
17
17
|
active: true
|
18
18
|
|
19
|
-
|
19
|
+
old_config:
|
20
20
|
api_key: "def"
|
21
21
|
active: true
|
22
22
|
ignore_exceptions:
|
23
23
|
- StandardError
|
24
|
+
|
25
|
+
old_config_mixed_with_new_config:
|
26
|
+
push_api_key: "ghi"
|
27
|
+
api_key: "def"
|
28
|
+
active: true
|
29
|
+
ignore_errors:
|
30
|
+
- NoMethodError
|
31
|
+
ignore_exceptions:
|
32
|
+
- StandardError
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: appsignal
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.0.
|
4
|
+
version: 1.4.0.beta.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Beekman
|
@@ -9,104 +9,104 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-
|
12
|
+
date: 2016-10-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rack
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
requirements:
|
18
|
-
- -
|
18
|
+
- - ">="
|
19
19
|
- !ruby/object:Gem::Version
|
20
20
|
version: '0'
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
|
-
- -
|
25
|
+
- - ">="
|
26
26
|
- !ruby/object:Gem::Version
|
27
27
|
version: '0'
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: thread_safe
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
31
31
|
requirements:
|
32
|
-
- -
|
32
|
+
- - ">="
|
33
33
|
- !ruby/object:Gem::Version
|
34
34
|
version: '0'
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
38
38
|
requirements:
|
39
|
-
- -
|
39
|
+
- - ">="
|
40
40
|
- !ruby/object:Gem::Version
|
41
41
|
version: '0'
|
42
42
|
- !ruby/object:Gem::Dependency
|
43
43
|
name: rake
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
45
45
|
requirements:
|
46
|
-
- -
|
46
|
+
- - ">="
|
47
47
|
- !ruby/object:Gem::Version
|
48
48
|
version: '0'
|
49
49
|
type: :development
|
50
50
|
prerelease: false
|
51
51
|
version_requirements: !ruby/object:Gem::Requirement
|
52
52
|
requirements:
|
53
|
-
- -
|
53
|
+
- - ">="
|
54
54
|
- !ruby/object:Gem::Version
|
55
55
|
version: '0'
|
56
56
|
- !ruby/object:Gem::Dependency
|
57
57
|
name: rspec
|
58
58
|
requirement: !ruby/object:Gem::Requirement
|
59
59
|
requirements:
|
60
|
-
- - ~>
|
60
|
+
- - "~>"
|
61
61
|
- !ruby/object:Gem::Version
|
62
62
|
version: 2.14.1
|
63
63
|
type: :development
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
66
66
|
requirements:
|
67
|
-
- - ~>
|
67
|
+
- - "~>"
|
68
68
|
- !ruby/object:Gem::Version
|
69
69
|
version: 2.14.1
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: pry
|
72
72
|
requirement: !ruby/object:Gem::Requirement
|
73
73
|
requirements:
|
74
|
-
- -
|
74
|
+
- - ">="
|
75
75
|
- !ruby/object:Gem::Version
|
76
76
|
version: '0'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
79
|
version_requirements: !ruby/object:Gem::Requirement
|
80
80
|
requirements:
|
81
|
-
- -
|
81
|
+
- - ">="
|
82
82
|
- !ruby/object:Gem::Version
|
83
83
|
version: '0'
|
84
84
|
- !ruby/object:Gem::Dependency
|
85
85
|
name: timecop
|
86
86
|
requirement: !ruby/object:Gem::Requirement
|
87
87
|
requirements:
|
88
|
-
- -
|
88
|
+
- - ">="
|
89
89
|
- !ruby/object:Gem::Version
|
90
90
|
version: '0'
|
91
91
|
type: :development
|
92
92
|
prerelease: false
|
93
93
|
version_requirements: !ruby/object:Gem::Requirement
|
94
94
|
requirements:
|
95
|
-
- -
|
95
|
+
- - ">="
|
96
96
|
- !ruby/object:Gem::Version
|
97
97
|
version: '0'
|
98
98
|
- !ruby/object:Gem::Dependency
|
99
99
|
name: webmock
|
100
100
|
requirement: !ruby/object:Gem::Requirement
|
101
101
|
requirements:
|
102
|
-
- -
|
102
|
+
- - ">="
|
103
103
|
- !ruby/object:Gem::Version
|
104
104
|
version: '0'
|
105
105
|
type: :development
|
106
106
|
prerelease: false
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
|
-
- -
|
109
|
+
- - ">="
|
110
110
|
- !ruby/object:Gem::Version
|
111
111
|
version: '0'
|
112
112
|
description: The official appsignal.com gem
|
@@ -118,9 +118,9 @@ extensions:
|
|
118
118
|
- ext/extconf.rb
|
119
119
|
extra_rdoc_files: []
|
120
120
|
files:
|
121
|
-
- .gitignore
|
122
|
-
- .rspec
|
123
|
-
- .travis.yml
|
121
|
+
- ".gitignore"
|
122
|
+
- ".rspec"
|
123
|
+
- ".travis.yml"
|
124
124
|
- CHANGELOG.md
|
125
125
|
- Gemfile
|
126
126
|
- LICENSE
|
@@ -129,7 +129,6 @@ files:
|
|
129
129
|
- appsignal.gemspec
|
130
130
|
- benchmark.rake
|
131
131
|
- bin/appsignal
|
132
|
-
- circle.yml
|
133
132
|
- ext/agent.yml
|
134
133
|
- ext/appsignal_extension.c
|
135
134
|
- ext/extconf.rb
|
@@ -165,7 +164,9 @@ files:
|
|
165
164
|
- lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb
|
166
165
|
- lib/appsignal/event_formatter/moped/query_formatter.rb
|
167
166
|
- lib/appsignal/extension.rb
|
167
|
+
- lib/appsignal/garbage_collection_profiler.rb
|
168
168
|
- lib/appsignal/hooks.rb
|
169
|
+
- lib/appsignal/hooks/active_support_notifications.rb
|
169
170
|
- lib/appsignal/hooks/celluloid.rb
|
170
171
|
- lib/appsignal/hooks/data_mapper.rb
|
171
172
|
- lib/appsignal/hooks/delayed_job.rb
|
@@ -203,20 +204,15 @@ files:
|
|
203
204
|
- lib/appsignal/rack/rails_instrumentation.rb
|
204
205
|
- lib/appsignal/rack/sinatra_instrumentation.rb
|
205
206
|
- lib/appsignal/rack/streaming_listener.rb
|
206
|
-
- lib/appsignal/
|
207
|
+
- lib/appsignal/system.rb
|
207
208
|
- lib/appsignal/transaction.rb
|
208
209
|
- lib/appsignal/transmitter.rb
|
209
|
-
- lib/appsignal/update_active_support.rb
|
210
210
|
- lib/appsignal/utils.rb
|
211
211
|
- lib/appsignal/utils/params_sanitizer.rb
|
212
212
|
- lib/appsignal/utils/query_params_sanitizer.rb
|
213
213
|
- lib/appsignal/version.rb
|
214
214
|
- lib/sequel/extensions/appsignal_integration.rb
|
215
215
|
- lib/tasks/diag.rake
|
216
|
-
- lib/vendor/active_support/notifications.rb
|
217
|
-
- lib/vendor/active_support/notifications/fanout.rb
|
218
|
-
- lib/vendor/active_support/notifications/instrumenter.rb
|
219
|
-
- lib/vendor/active_support/per_thread_registry.rb
|
220
216
|
- resources/appsignal.yml.erb
|
221
217
|
- resources/cacert.pem
|
222
218
|
- spec/lib/appsignal/auth_check_spec.rb
|
@@ -236,6 +232,8 @@ files:
|
|
236
232
|
- spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
|
237
233
|
- spec/lib/appsignal/event_formatter_spec.rb
|
238
234
|
- spec/lib/appsignal/extension_spec.rb
|
235
|
+
- spec/lib/appsignal/garbage_collection_profiler_spec.rb
|
236
|
+
- spec/lib/appsignal/hooks/active_support_notifications_spec.rb
|
239
237
|
- spec/lib/appsignal/hooks/celluloid_spec.rb
|
240
238
|
- spec/lib/appsignal/hooks/data_mapper_spec.rb
|
241
239
|
- spec/lib/appsignal/hooks/delayed_job_spec.rb
|
@@ -269,10 +267,11 @@ files:
|
|
269
267
|
- spec/lib/appsignal/rack/rails_instrumentation_spec.rb
|
270
268
|
- spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
|
271
269
|
- spec/lib/appsignal/rack/streaming_listener_spec.rb
|
272
|
-
- spec/lib/appsignal/
|
270
|
+
- spec/lib/appsignal/system/container_spec.rb
|
271
|
+
- spec/lib/appsignal/system_spec.rb
|
273
272
|
- spec/lib/appsignal/transaction_spec.rb
|
274
273
|
- spec/lib/appsignal/transmitter_spec.rb
|
275
|
-
- spec/lib/appsignal/
|
274
|
+
- spec/lib/appsignal/utils/gzip_spec.rb
|
276
275
|
- spec/lib/appsignal/utils/params_sanitizer_spec.rb
|
277
276
|
- spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
|
278
277
|
- spec/lib/appsignal/utils_spec.rb
|
@@ -280,13 +279,24 @@ files:
|
|
280
279
|
- spec/lib/tmp/config/appsignal.yml
|
281
280
|
- spec/spec_helper.rb
|
282
281
|
- spec/support/delegate_matcher.rb
|
282
|
+
- spec/support/fixtures/containers/cgroups/docker
|
283
|
+
- spec/support/fixtures/containers/cgroups/docker_systemd
|
284
|
+
- spec/support/fixtures/containers/cgroups/lxc
|
285
|
+
- spec/support/fixtures/containers/cgroups/no_permission
|
286
|
+
- spec/support/fixtures/containers/cgroups/none
|
283
287
|
- spec/support/fixtures/generated_config.yml
|
284
288
|
- spec/support/fixtures/uploaded_file.txt
|
289
|
+
- spec/support/helpers/api_request_helper.rb
|
285
290
|
- spec/support/helpers/config_helpers.rb
|
291
|
+
- spec/support/helpers/dependency_helper.rb
|
292
|
+
- spec/support/helpers/directory_helper.rb
|
286
293
|
- spec/support/helpers/env_helpers.rb
|
287
|
-
- spec/support/helpers/
|
294
|
+
- spec/support/helpers/std_streams_helper.rb
|
295
|
+
- spec/support/helpers/system_helpers.rb
|
288
296
|
- spec/support/helpers/time_helpers.rb
|
289
297
|
- spec/support/helpers/transaction_helpers.rb
|
298
|
+
- spec/support/helpers/very_specific_error.rb
|
299
|
+
- spec/support/mocks/fake_gc_profiler.rb
|
290
300
|
- spec/support/mocks/mock_extension.rb
|
291
301
|
- spec/support/project_fixture/config/application.rb
|
292
302
|
- spec/support/project_fixture/config/appsignal.yml
|
@@ -307,17 +317,17 @@ require_paths:
|
|
307
317
|
- ext
|
308
318
|
required_ruby_version: !ruby/object:Gem::Requirement
|
309
319
|
requirements:
|
310
|
-
- -
|
320
|
+
- - ">="
|
311
321
|
- !ruby/object:Gem::Version
|
312
322
|
version: '1.9'
|
313
323
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
314
324
|
requirements:
|
315
|
-
- -
|
325
|
+
- - ">"
|
316
326
|
- !ruby/object:Gem::Version
|
317
327
|
version: 1.3.1
|
318
328
|
requirements: []
|
319
329
|
rubyforge_project:
|
320
|
-
rubygems_version: 2.
|
330
|
+
rubygems_version: 2.4.5
|
321
331
|
signing_key:
|
322
332
|
specification_version: 4
|
323
333
|
summary: Logs performance and exception data from your app to appsignal.com
|
@@ -339,6 +349,8 @@ test_files:
|
|
339
349
|
- spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
|
340
350
|
- spec/lib/appsignal/event_formatter_spec.rb
|
341
351
|
- spec/lib/appsignal/extension_spec.rb
|
352
|
+
- spec/lib/appsignal/garbage_collection_profiler_spec.rb
|
353
|
+
- spec/lib/appsignal/hooks/active_support_notifications_spec.rb
|
342
354
|
- spec/lib/appsignal/hooks/celluloid_spec.rb
|
343
355
|
- spec/lib/appsignal/hooks/data_mapper_spec.rb
|
344
356
|
- spec/lib/appsignal/hooks/delayed_job_spec.rb
|
@@ -372,10 +384,11 @@ test_files:
|
|
372
384
|
- spec/lib/appsignal/rack/rails_instrumentation_spec.rb
|
373
385
|
- spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
|
374
386
|
- spec/lib/appsignal/rack/streaming_listener_spec.rb
|
375
|
-
- spec/lib/appsignal/
|
387
|
+
- spec/lib/appsignal/system/container_spec.rb
|
388
|
+
- spec/lib/appsignal/system_spec.rb
|
376
389
|
- spec/lib/appsignal/transaction_spec.rb
|
377
390
|
- spec/lib/appsignal/transmitter_spec.rb
|
378
|
-
- spec/lib/appsignal/
|
391
|
+
- spec/lib/appsignal/utils/gzip_spec.rb
|
379
392
|
- spec/lib/appsignal/utils/params_sanitizer_spec.rb
|
380
393
|
- spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
|
381
394
|
- spec/lib/appsignal/utils_spec.rb
|
@@ -383,13 +396,24 @@ test_files:
|
|
383
396
|
- spec/lib/tmp/config/appsignal.yml
|
384
397
|
- spec/spec_helper.rb
|
385
398
|
- spec/support/delegate_matcher.rb
|
399
|
+
- spec/support/fixtures/containers/cgroups/docker
|
400
|
+
- spec/support/fixtures/containers/cgroups/docker_systemd
|
401
|
+
- spec/support/fixtures/containers/cgroups/lxc
|
402
|
+
- spec/support/fixtures/containers/cgroups/no_permission
|
403
|
+
- spec/support/fixtures/containers/cgroups/none
|
386
404
|
- spec/support/fixtures/generated_config.yml
|
387
405
|
- spec/support/fixtures/uploaded_file.txt
|
406
|
+
- spec/support/helpers/api_request_helper.rb
|
388
407
|
- spec/support/helpers/config_helpers.rb
|
408
|
+
- spec/support/helpers/dependency_helper.rb
|
409
|
+
- spec/support/helpers/directory_helper.rb
|
389
410
|
- spec/support/helpers/env_helpers.rb
|
390
|
-
- spec/support/helpers/
|
411
|
+
- spec/support/helpers/std_streams_helper.rb
|
412
|
+
- spec/support/helpers/system_helpers.rb
|
391
413
|
- spec/support/helpers/time_helpers.rb
|
392
414
|
- spec/support/helpers/transaction_helpers.rb
|
415
|
+
- spec/support/helpers/very_specific_error.rb
|
416
|
+
- spec/support/mocks/fake_gc_profiler.rb
|
393
417
|
- spec/support/mocks/mock_extension.rb
|
394
418
|
- spec/support/project_fixture/config/application.rb
|
395
419
|
- spec/support/project_fixture/config/appsignal.yml
|
@@ -399,3 +423,4 @@ test_files:
|
|
399
423
|
- spec/support/project_fixture/log/.gitkeep
|
400
424
|
- spec/support/rails/my_app.rb
|
401
425
|
- spec/support/stubs/delayed_job.rb
|
426
|
+
has_rdoc:
|