appoptics_apm 4.2.1 → 4.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +6 -2
- data/Dockerfile_test +1 -0
- data/lib/appoptics_apm/config.rb +1 -1
- data/lib/appoptics_apm/inst/sidekiq-client.rb +4 -2
- data/lib/appoptics_apm/inst/sidekiq-worker.rb +5 -5
- data/lib/appoptics_apm/version.rb +1 -1
- data/run_tests_docker.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1177c37c4ef9faf18d4ac7cc9d3ae521512b7853
|
4
|
+
data.tar.gz: 90e612e51a74f8767452087b40b6d5500a06ff8f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 07b21a9dccda5a46e8d30059d20f0d5361b8936cf3da8c2add1cf1d9ce1dcb7b2aa815f1c71cc50fb01f4191f5529fbef4b532f27023ddda92a395b6d19115f0
|
7
|
+
data.tar.gz: fcb45549e655a4cc8e28e6f939a765ba9393eee8591095cc784cd545e6b8ccf314aa38d36ca1510369937212f4aee2aac3a349b3452f8b245394aa81fe256dfe
|
data/.travis.yml
CHANGED
@@ -12,7 +12,7 @@ env:
|
|
12
12
|
|
13
13
|
rvm:
|
14
14
|
- 2.5.1
|
15
|
-
- 2.4.
|
15
|
+
- 2.4.4
|
16
16
|
- 2.3.6
|
17
17
|
# - jruby-9.0.5.0
|
18
18
|
|
@@ -24,8 +24,8 @@ gemfile:
|
|
24
24
|
- gemfiles/frameworks.gemfile
|
25
25
|
# - gemfiles/rails32.gemfile # We currently are not supporting Rails 3.2
|
26
26
|
- gemfiles/rails42.gemfile
|
27
|
-
# - gemfiles/rails50.gemfile
|
28
27
|
- gemfiles/rails51.gemfile
|
28
|
+
# - gemfiles/rails52.gemfile # postgres test needs fixing first
|
29
29
|
- gemfiles/delayed_job.gemfile
|
30
30
|
|
31
31
|
matrix:
|
@@ -34,6 +34,8 @@ matrix:
|
|
34
34
|
env: DBTYPE=mysql
|
35
35
|
- rvm: 2.4.3
|
36
36
|
env: DBTYPE=mysql
|
37
|
+
- rvm: 2.4.4
|
38
|
+
env: DBTYPE=mysql
|
37
39
|
|
38
40
|
- gemfile: gemfiles/noop.gemfile
|
39
41
|
env: DBTYPE=mysql
|
@@ -47,6 +49,8 @@ matrix:
|
|
47
49
|
env: DBTYPE=mysql
|
48
50
|
- gemfile: gemfiles/rails51.gemfile
|
49
51
|
env: DBTYPE=mysql
|
52
|
+
- gemfile: gemfiles/rails52.gemfile
|
53
|
+
env: DBTYPE=mysql
|
50
54
|
- gemfile: gemfiles/delayed_job.gemfile
|
51
55
|
env: DBTYPE=mysql
|
52
56
|
|
data/Dockerfile_test
CHANGED
data/lib/appoptics_apm/config.rb
CHANGED
@@ -92,7 +92,7 @@ module AppOpticsAPM
|
|
92
92
|
|
93
93
|
AppOpticsAPM.logger.warn "\n# Logging of outgoing HTTP query args"
|
94
94
|
@@instrumentation.each do |config|
|
95
|
-
AppOpticsAPM.logger.warn "AppOpticsAPM::Config[:#{config}][:log_args] = #{@@config[config][:log_args]}"
|
95
|
+
AppOpticsAPM.logger.warn "AppOpticsAPM::Config[:#{config}][:log_args] = #{@@config[config][:log_args] || false}"
|
96
96
|
end
|
97
97
|
|
98
98
|
AppOpticsAPM.logger.warn "\n# Bunny Controller and Action"
|
@@ -15,10 +15,10 @@ module AppOpticsAPM
|
|
15
15
|
report_kvs[:Flavor] = :sidekiq
|
16
16
|
report_kvs[:Queue] = queue
|
17
17
|
report_kvs[:Retry] = msg['retry']
|
18
|
-
report_kvs[:JobName] = worker_class
|
18
|
+
report_kvs[:JobName] = msg['wrapped'] || worker_class
|
19
19
|
report_kvs[:MsgID] = msg['jid']
|
20
20
|
report_kvs[:Args] = msg['args'].to_s[0..1024] if AppOpticsAPM::Config[:sidekiqclient][:log_args]
|
21
|
-
report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace
|
21
|
+
report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces]
|
22
22
|
rescue => e
|
23
23
|
AppOpticsAPM.logger.warn "[appoptics_apm/sidekiq] Non-fatal error capturing KVs: #{e.message}"
|
24
24
|
end
|
@@ -44,6 +44,8 @@ module AppOpticsAPM
|
|
44
44
|
end
|
45
45
|
|
46
46
|
if defined?(::Sidekiq) && AppOpticsAPM::Config[:sidekiqclient][:enabled]
|
47
|
+
::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq client' if AppOpticsAPM::Config[:verbose]
|
48
|
+
|
47
49
|
::Sidekiq.configure_client do |config|
|
48
50
|
config.client_middleware do |chain|
|
49
51
|
::AppOpticsAPM.logger.info '[appoptics_apm/loading] Adding Sidekiq client middleware' if AppOpticsAPM::Config[:verbose]
|
@@ -15,16 +15,16 @@ module AppOpticsAPM
|
|
15
15
|
report_kvs[:Flavor] = :sidekiq
|
16
16
|
report_kvs[:Queue] = queue
|
17
17
|
report_kvs[:Retry] = msg['retry']
|
18
|
-
report_kvs[:JobName] =
|
18
|
+
report_kvs[:JobName] = msg['wrapped'] || msg['class']
|
19
19
|
report_kvs[:MsgID] = msg['jid']
|
20
20
|
report_kvs[:Args] = msg['args'].to_s[0..1024] if AppOpticsAPM::Config[:sidekiqworker][:log_args]
|
21
|
-
report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace
|
21
|
+
report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces]
|
22
22
|
|
23
23
|
# Webserver Spec KVs
|
24
24
|
report_kvs[:'HTTP-Host'] = Socket.gethostname
|
25
25
|
report_kvs[:Controller] = "Sidekiq_#{queue}"
|
26
|
-
report_kvs[:Action] = msg['class']
|
27
|
-
report_kvs[:URL] = "/sidekiq/#{queue}/#{msg['class']}"
|
26
|
+
report_kvs[:Action] = msg['wrapped'] || msg['class']
|
27
|
+
report_kvs[:URL] = "/sidekiq/#{queue}/#{msg['wrapped'] || msg['class']}"
|
28
28
|
rescue => e
|
29
29
|
AppOpticsAPM.logger.warn "[appoptics_apm/sidekiq] Non-fatal error capturing KVs: #{e.message}"
|
30
30
|
end
|
@@ -56,7 +56,7 @@ module AppOpticsAPM
|
|
56
56
|
end
|
57
57
|
|
58
58
|
if defined?(::Sidekiq) && AppOpticsAPM::Config[:sidekiqworker][:enabled]
|
59
|
-
::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq' if AppOpticsAPM::Config[:verbose]
|
59
|
+
::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq worker' if AppOpticsAPM::Config[:verbose]
|
60
60
|
|
61
61
|
::Sidekiq.configure_server do |config|
|
62
62
|
config.server_middleware do |chain|
|
data/run_tests_docker.rb
CHANGED
@@ -27,6 +27,6 @@ travis['matrix']['exclude'].each do |h|
|
|
27
27
|
end
|
28
28
|
|
29
29
|
matrix.each do |args|
|
30
|
-
`docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}`
|
31
30
|
puts "docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}"
|
31
|
+
`docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}`
|
32
32
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: appoptics_apm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.2.
|
4
|
+
version: 4.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Maia Engeli
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2018-
|
13
|
+
date: 2018-06-11 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: json
|