instana 1.193.2 → 1.193.3.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +194 -133
- data/.gitignore +2 -0
- data/.rubocop.yml +5 -1147
- data/.rubocop_todo.yml +1140 -0
- data/Appraisals +96 -0
- data/Gemfile +11 -32
- data/Rakefile +16 -39
- data/bin/console +5 -4
- data/gemfiles/.bundle/config +1 -2
- data/gemfiles/cuba_30.gemfile +14 -0
- data/gemfiles/dalli_20.gemfile +14 -0
- data/gemfiles/excon_02.gemfile +14 -0
- data/gemfiles/graphql_10.gemfile +14 -0
- data/gemfiles/grpc_10.gemfile +14 -0
- data/gemfiles/net_http_01.gemfile +13 -0
- data/gemfiles/rack_16.gemfile +14 -0
- data/gemfiles/rack_20.gemfile +14 -0
- data/gemfiles/rails_42.gemfile +16 -0
- data/gemfiles/rails_50.gemfile +16 -0
- data/gemfiles/rails_52.gemfile +16 -0
- data/gemfiles/rails_60.gemfile +16 -0
- data/gemfiles/redis_40.gemfile +14 -0
- data/gemfiles/resque_122.gemfile +15 -0
- data/gemfiles/resque_20.gemfile +14 -0
- data/gemfiles/rest_client_16.gemfile +14 -0
- data/gemfiles/rest_client_20.gemfile +14 -0
- data/gemfiles/roda_20.gemfile +14 -0
- data/gemfiles/roda_30.gemfile +14 -0
- data/gemfiles/sidekiq_42.gemfile +14 -0
- data/gemfiles/sidekiq_50.gemfile +14 -0
- data/gemfiles/sinatra_14.gemfile +14 -0
- data/instana.gemspec +1 -7
- data/lib/instana/activator.rb +41 -0
- data/lib/instana/activators/cuba.rb +18 -0
- data/lib/instana/activators/dalli.rb +20 -0
- data/lib/instana/activators/excon.rb +17 -0
- data/lib/instana/activators/graphql.rb +19 -0
- data/lib/instana/activators/grpc_client.rb +17 -0
- data/lib/instana/activators/grpc_server.rb +17 -0
- data/lib/instana/activators/net_http.rb +17 -0
- data/lib/instana/activators/rack.rb +13 -0
- data/lib/instana/activators/rails.rb +15 -0
- data/lib/instana/activators/redis.rb +17 -0
- data/lib/instana/activators/resque_client.rb +18 -0
- data/lib/instana/activators/resque_worker.rb +30 -0
- data/lib/instana/activators/rest_client.rb +17 -0
- data/lib/instana/activators/roda.rb +18 -0
- data/lib/instana/activators/sidekiq_client.rb +21 -0
- data/lib/instana/activators/sidekiq_worker.rb +21 -0
- data/lib/instana/activators/sinatra.rb +18 -0
- data/lib/instana/frameworks/cuba.rb +6 -13
- data/lib/instana/frameworks/rails.rb +0 -1
- data/lib/instana/frameworks/roda.rb +7 -13
- data/lib/instana/frameworks/sinatra.rb +1 -8
- data/lib/instana/instrumentation/dalli.rb +0 -6
- data/lib/instana/instrumentation/excon.rb +51 -57
- data/lib/instana/instrumentation/graphql.rb +16 -18
- data/lib/instana/instrumentation/grpc.rb +4 -10
- data/lib/instana/instrumentation/instrumented_request.rb +2 -1
- data/lib/instana/instrumentation/net-http.rb +2 -5
- data/lib/instana/instrumentation/rack.rb +1 -0
- data/lib/instana/instrumentation/redis.rb +0 -5
- data/lib/instana/instrumentation/resque.rb +0 -25
- data/lib/instana/instrumentation/rest-client.rb +0 -5
- data/lib/instana/instrumentation/sidekiq-client.rb +0 -9
- data/lib/instana/instrumentation/sidekiq-worker.rb +0 -9
- data/lib/instana/setup.rb +3 -1
- data/lib/instana/version.rb +1 -1
- data/test/activator_test.rb +27 -0
- data/test/frameworks/cuba_test.rb +38 -40
- data/test/frameworks/rails/activerecord_test.rb +13 -13
- data/test/frameworks/rails_test.rb +15 -0
- data/test/frameworks/roda_test.rb +39 -41
- data/test/frameworks/sinatra_test.rb +61 -64
- data/test/instrumentation/excon_test.rb +1 -0
- data/test/instrumentation/grpc_test.rb +2 -1
- data/test/instrumentation/{net-http_test.rb → net_http_test.rb} +1 -0
- data/test/instrumentation/{instrumented_request_test.rb → rack_instrumented_request_test.rb} +1 -1
- data/test/{frameworks → instrumentation}/rack_test.rb +0 -1
- data/test/instrumentation/resque_test.rb +3 -11
- data/test/instrumentation/{rest-client_test.rb → rest_client_test.rb} +6 -0
- data/test/instrumentation/sidekiq-client_test.rb +1 -0
- data/test/instrumentation/sidekiq-worker_test.rb +1 -0
- data/test/{servers/grpc_50051.rb → support/apps/grpc/boot.rb} +1 -1
- data/test/{apps → support/apps/grpc}/grpc_server.rb +0 -0
- data/test/{servers/rackapp_6511.rb → support/apps/http_endpoint/boot.rb} +0 -0
- data/test/{servers/rails_3205.rb → support/apps/rails/boot.rb} +8 -14
- data/test/{models → support/apps/rails/models}/block.rb +1 -1
- data/test/{models → support/apps/rails/models}/block6.rb +0 -0
- data/test/support/apps/resque/boot.rb +2 -0
- data/test/{jobs → support/apps/resque/jobs}/resque_error_job.rb +0 -0
- data/test/{jobs → support/apps/resque/jobs}/resque_fast_job.rb +0 -0
- data/test/support/apps/sidekiq/boot.rb +21 -0
- data/test/{jobs → support/apps/sidekiq/jobs}/sidekiq_job_1.rb +0 -0
- data/test/{jobs → support/apps/sidekiq/jobs}/sidekiq_job_2.rb +0 -0
- data/test/{servers → support/apps}/sidekiq/worker.rb +2 -2
- data/test/support/helpers.rb +94 -0
- data/test/test_helper.rb +24 -138
- metadata +89 -81
- data/gemfiles/libraries.gemfile +0 -73
- data/gemfiles/rails32.gemfile +0 -51
- data/gemfiles/rails42.gemfile +0 -50
- data/gemfiles/rails50.gemfile +0 -52
- data/gemfiles/rails52.gemfile +0 -52
- data/gemfiles/rails60.gemfile +0 -72
- data/lib/instana/instrumentation.rb +0 -25
- data/lib/instana/test.rb +0 -43
- data/test/apps/cuba.rb +0 -19
- data/test/apps/roda.rb +0 -13
- data/test/apps/sinatra.rb +0 -9
- data/test/servers/helpers/sidekiq_worker_initializer.rb +0 -27
data/Appraisals
ADDED
@@ -0,0 +1,96 @@
|
|
1
|
+
appraise 'cuba-30' do
|
2
|
+
gem 'cuba', '>= 3.0', '< 4.0'
|
3
|
+
end
|
4
|
+
|
5
|
+
appraise 'dalli-20' do
|
6
|
+
gem 'dalli', '>= 2.0', '< 3.0'
|
7
|
+
end
|
8
|
+
|
9
|
+
appraise 'excon-02' do
|
10
|
+
gem 'excon', '>= 0.21.0', '< 1.0'
|
11
|
+
end
|
12
|
+
|
13
|
+
appraise 'grpc-10' do
|
14
|
+
gem 'grpc', '>= 1.0', '< 2.0'
|
15
|
+
end
|
16
|
+
|
17
|
+
appraise 'graphql-10' do
|
18
|
+
gem 'graphql', '>= 1.0', '< 2.0'
|
19
|
+
end
|
20
|
+
|
21
|
+
appraise 'rack-16' do
|
22
|
+
gem 'rack', '~> 1.6'
|
23
|
+
end
|
24
|
+
|
25
|
+
appraise 'rack-20' do
|
26
|
+
gem 'rack', '>= 2.0', '< 3.0'
|
27
|
+
end
|
28
|
+
|
29
|
+
appraise 'rails-42' do
|
30
|
+
gem 'rails', '>= 4.2', '< 5.0'
|
31
|
+
gem 'mysql2', '0.4.10'
|
32
|
+
gem 'pg', '~> 0.21'
|
33
|
+
end
|
34
|
+
|
35
|
+
appraise 'rails-50' do
|
36
|
+
gem 'rails', '>= 5.0', '< 5.1'
|
37
|
+
gem 'mysql2', '0.4.10'
|
38
|
+
gem 'pg'
|
39
|
+
end
|
40
|
+
|
41
|
+
appraise 'rails-52' do
|
42
|
+
gem 'rails', '>= 5.2', '< 6.0'
|
43
|
+
gem 'mysql2', '0.4.10'
|
44
|
+
gem 'pg'
|
45
|
+
end
|
46
|
+
|
47
|
+
appraise 'rails-60' do
|
48
|
+
gem 'rails', '>= 6.0', '< 6.1'
|
49
|
+
gem 'mysql2', '0.4.10'
|
50
|
+
gem 'pg'
|
51
|
+
end
|
52
|
+
|
53
|
+
appraise 'redis-40' do
|
54
|
+
gem 'redis', '>= 4.0.0', '< 5.0'
|
55
|
+
end
|
56
|
+
|
57
|
+
appraise 'rest-client-16' do
|
58
|
+
gem 'rest-client', '>= 1.6', '< 2.0'
|
59
|
+
end
|
60
|
+
|
61
|
+
appraise 'rest-client-20' do
|
62
|
+
gem 'rest-client', '>= 2.0', '< 3.0'
|
63
|
+
end
|
64
|
+
|
65
|
+
appraise 'resque-122' do
|
66
|
+
gem 'resque', '>= 1.22', '< 2.0'
|
67
|
+
gem 'redis', '~> 3.3', '>= 3.3.5'
|
68
|
+
end
|
69
|
+
|
70
|
+
appraise 'resque-20' do
|
71
|
+
gem 'resque', '>= 2.0', '< 3.0'
|
72
|
+
end
|
73
|
+
|
74
|
+
appraise 'roda-20' do
|
75
|
+
gem 'roda', '>= 2.0', '< 3.0'
|
76
|
+
end
|
77
|
+
|
78
|
+
appraise 'roda-30' do
|
79
|
+
gem 'roda', '>= 3.0', '< 4.0'
|
80
|
+
end
|
81
|
+
|
82
|
+
appraise 'net-http-01' do
|
83
|
+
# gem 'net-http', '~> 0.1.1'
|
84
|
+
end
|
85
|
+
|
86
|
+
appraise 'sinatra-14' do
|
87
|
+
gem 'sinatra', '1.4.7'
|
88
|
+
end
|
89
|
+
|
90
|
+
appraise 'sidekiq-42' do
|
91
|
+
gem 'sidekiq', '~> 4.2.10'
|
92
|
+
end
|
93
|
+
|
94
|
+
appraise 'sidekiq-50' do
|
95
|
+
gem 'sidekiq', '>= 5.0', '< 6.0'
|
96
|
+
end
|
data/Gemfile
CHANGED
@@ -1,41 +1,20 @@
|
|
1
1
|
source 'https://rubygems.org'
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
gem 'webmock'
|
9
|
-
gem 'puma'
|
3
|
+
gem 'rake'
|
4
|
+
gem 'minitest', '5.9.1'
|
5
|
+
gem 'minitest-reporters'
|
6
|
+
gem 'webmock'
|
7
|
+
gem 'puma'
|
10
8
|
|
11
|
-
|
12
|
-
if RUBY_VERSION < '2.2'
|
13
|
-
gem 'rack', '~> 1.6'
|
14
|
-
end
|
15
|
-
gem 'rack-test'
|
9
|
+
gem 'rubocop', '~> 1.9'
|
16
10
|
|
17
|
-
|
18
|
-
|
11
|
+
# Rack v2 dropped support for Ruby 2.2 and higher.
|
12
|
+
if RUBY_VERSION < '2.2'
|
13
|
+
gem 'rack', '~> 1.6'
|
19
14
|
end
|
15
|
+
gem 'rack-test'
|
20
16
|
|
21
|
-
|
22
|
-
gem 'ruby-debug', :platforms => [:mri_18, :jruby]
|
23
|
-
gem 'debugger', :platform => :mri_19
|
24
|
-
gem 'stackprof', :platform => [:mri_19, :mri_20]
|
25
|
-
|
26
|
-
if RUBY_VERSION > '1.8.7'
|
27
|
-
gem 'pry'
|
28
|
-
|
29
|
-
if RUBY_VERSION < '2.2'
|
30
|
-
gem 'byebug', '< 9.1.0', :platform => [:mri_19, :mri_20]
|
31
|
-
gem 'pry-byebug', :platform => [:mri_19, :mri_20]
|
32
|
-
else
|
33
|
-
gem 'pry-byebug', :platform => :ruby
|
34
|
-
end
|
35
|
-
else
|
36
|
-
gem 'pry', '0.9.12.4'
|
37
|
-
end
|
38
|
-
end
|
17
|
+
gem 'simplecov', '~> 0.21.2'
|
39
18
|
|
40
19
|
# instana.gemspec
|
41
20
|
gemspec
|
data/Rakefile
CHANGED
@@ -1,5 +1,7 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require 'bundler/gem_tasks'
|
2
|
+
require 'rake/testtask'
|
3
|
+
|
4
|
+
require 'json'
|
3
5
|
|
4
6
|
Rake::TestTask.new(:test) do |t|
|
5
7
|
t.verbose = false
|
@@ -8,43 +10,18 @@ Rake::TestTask.new(:test) do |t|
|
|
8
10
|
|
9
11
|
t.libs << "test"
|
10
12
|
t.libs << "lib"
|
11
|
-
|
12
|
-
|
13
|
-
'
|
14
|
-
'test/{
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
when /rails5/
|
23
|
-
t.test_files = %w(test/frameworks/rails/activerecord_test.rb
|
24
|
-
test/frameworks/rails/actioncontroller_test.rb
|
25
|
-
test/frameworks/rails/actionview5_test.rb)
|
26
|
-
when /rails42/
|
27
|
-
t.test_files = %w(test/frameworks/rails/activerecord_test.rb
|
28
|
-
test/frameworks/rails/actioncontroller_test.rb
|
29
|
-
test/frameworks/rails/actionview4_test.rb)
|
30
|
-
when /rails32/
|
31
|
-
t.test_files = %w(test/frameworks/rails/activerecord_test.rb
|
32
|
-
test/frameworks/rails/actioncontroller_test.rb
|
33
|
-
test/frameworks/rails/actionview3_test.rb)
|
34
|
-
when /libraries/
|
35
|
-
t.test_files = Dir['test/{instrumentation,frameworks}/*_test.rb']
|
13
|
+
|
14
|
+
if ENV['APPRAISAL_INITIALIZED']
|
15
|
+
appraised_group = File.basename(ENV['BUNDLE_GEMFILE']).split(/_[0-9]+\./).first
|
16
|
+
suite_files = Dir['test/{instrumentation,frameworks}/*_test.rb']
|
17
|
+
|
18
|
+
t.test_files = suite_files.select { |f| File.basename(f).start_with?(appraised_group) }
|
19
|
+
else
|
20
|
+
t.test_files = Dir[
|
21
|
+
'test/*_test.rb',
|
22
|
+
'test/{agent,tracing}/*_test.rb'
|
23
|
+
]
|
36
24
|
end
|
37
|
-
|
38
|
-
end
|
39
|
-
|
40
|
-
task :environment do
|
41
|
-
ENV['INSTANA_DEBUG'] = 'true'
|
42
|
-
Bundler.require(:default, :development)
|
43
|
-
end
|
44
|
-
|
45
|
-
task :console => :environment do
|
46
|
-
ARGV.clear
|
47
|
-
Pry.start
|
48
25
|
end
|
49
26
|
|
50
|
-
task :default => :
|
27
|
+
task :default => :test
|
data/bin/console
CHANGED
data/gemfiles/.bundle/config
CHANGED
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "cuba", ">= 3.0", "< 4.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "dalli", ">= 2.0", "< 3.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "excon", ">= 0.21.0", "< 1.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "graphql", ">= 1.0", "< 2.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "grpc", ">= 1.0", "< 2.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "rack", "~> 1.6"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "rack", ">= 2.0", "< 3.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "rails", ">= 4.2", "< 5.0"
|
13
|
+
gem "mysql2", "0.4.10"
|
14
|
+
gem "pg", "~> 0.21"
|
15
|
+
|
16
|
+
gemspec path: "../"
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "rails", ">= 5.0", "< 5.1"
|
13
|
+
gem "mysql2", "0.4.10"
|
14
|
+
gem "pg"
|
15
|
+
|
16
|
+
gemspec path: "../"
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "rails", ">= 5.2", "< 6.0"
|
13
|
+
gem "mysql2", "0.4.10"
|
14
|
+
gem "pg"
|
15
|
+
|
16
|
+
gemspec path: "../"
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "rails", ">= 6.0", "< 6.1"
|
13
|
+
gem "mysql2", "0.4.10"
|
14
|
+
gem "pg"
|
15
|
+
|
16
|
+
gemspec path: "../"
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file was generated by Appraisal
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.9.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rack-test"
|
11
|
+
gem "simplecov", "~> 0.21.2"
|
12
|
+
gem "redis", ">= 4.0.0", "< 5.0"
|
13
|
+
|
14
|
+
gemspec path: "../"
|