appoptics_apm 4.5.0 → 4.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/.travis.yml +7 -2
- data/lib/appoptics_apm.rb +0 -4
- data/lib/appoptics_apm/frameworks/grape.rb +7 -7
- data/lib/appoptics_apm/inst/sidekiq-worker.rb +1 -1
- data/lib/appoptics_apm/version.rb +1 -1
- data/lib/oboe_metal.rb +14 -10
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 31429d8883210f939e3c1792f0cfcbe3ffec4b24e104b9edb611ab41860442af
|
4
|
+
data.tar.gz: 8af8ffb315335518cd74f69c3e9d0c60335337ffe31b871eb497282e17f46c67
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a3f7e14c292b09293bdc22b053a67eceb128191e77795842b5e135f091def89375bd0e579f20e1b90fa10cbc88fe1ccb680a16597802bcd66d9eb4c68d8a349e
|
7
|
+
data.tar.gz: 29fd7b5b3964125306b7bf9f70bcaa77fcd30c3dea29ddc43c316cf00a1ec8993cff12d0c24ff07d693377481f3d3dc492d44067db7a3460d912f2d03b4b6ae5
|
data/.rubocop.yml
CHANGED
data/.travis.yml
CHANGED
@@ -11,10 +11,11 @@ env:
|
|
11
11
|
- DBTYPE=mysql
|
12
12
|
|
13
13
|
rvm:
|
14
|
+
- 2.6.0
|
14
15
|
- 2.5.3
|
15
16
|
- 2.4.5
|
16
17
|
- 2.3.8
|
17
|
-
- ruby-head
|
18
|
+
# - ruby-head
|
18
19
|
# - jruby-9.0.5.0
|
19
20
|
|
20
21
|
gemfile:
|
@@ -32,7 +33,11 @@ matrix:
|
|
32
33
|
exclude:
|
33
34
|
- rvm: ruby-head
|
34
35
|
gemfile: gemfiles/rails42.gemfile
|
36
|
+
- rvm: 2.6.0
|
37
|
+
gemfile: gemfiles/rails42.gemfile
|
35
38
|
|
39
|
+
- rmv: 2.6.0
|
40
|
+
env: DBTYPE=mysql
|
36
41
|
- rvm: 2.5.3
|
37
42
|
env: DBTYPE=mysql
|
38
43
|
- rvm: 2.4.5
|
@@ -95,7 +100,7 @@ install:
|
|
95
100
|
- popd
|
96
101
|
|
97
102
|
before_script:
|
98
|
-
- bundle
|
103
|
+
- bundle update --jobs=3 --retry=3
|
99
104
|
- bundle exec rake fetch_ext_deps
|
100
105
|
- bundle exec rake clean
|
101
106
|
- bundle exec rake compile
|
data/lib/appoptics_apm.rb
CHANGED
@@ -1,10 +1,6 @@
|
|
1
1
|
# Copyright (c) 2016 SolarWinds, LLC.
|
2
2
|
# All rights reserved.
|
3
3
|
|
4
|
-
# Backward compatibility for supported environment variables
|
5
|
-
ENV['APPOPTICS_GEM_VERBOSE'] = ENV['OBOE_GEM_VERBOSE'] if ENV.key?('OBOE_GEM_VERBOSE')
|
6
|
-
ENV['APPOPTICS_GEM_TEST'] = ENV['OBOE_GEM_TEST'] if ENV.key?('OBOE_GEM_TEST')
|
7
|
-
|
8
4
|
begin
|
9
5
|
require 'openssl'
|
10
6
|
require 'appoptics_apm/version'
|
@@ -26,13 +26,13 @@ module AppOpticsAPM
|
|
26
26
|
# Report Controller/Action and Transaction as best possible
|
27
27
|
report_kvs = {}
|
28
28
|
|
29
|
-
report_kvs[:Controller] = options[:for].
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
29
|
+
report_kvs[:Controller] = options[:for].to_s
|
30
|
+
report_kvs[:Action] =
|
31
|
+
if route&.pattern
|
32
|
+
route.options ? "#{route.options[:method]}#{route.pattern.origin}" : route.pattern.origin
|
33
|
+
else
|
34
|
+
args.empty? ? env['PATH_INFO'] : args[0]['PATH_INFO']
|
35
|
+
end
|
36
36
|
report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:grape][:collect_backtraces]
|
37
37
|
|
38
38
|
env['appoptics_apm.controller'] = report_kvs[:Controller]
|
@@ -39,7 +39,7 @@ module AppOpticsAPM
|
|
39
39
|
# are being lost. So we re-set the tracing mode to assure
|
40
40
|
# we sample as desired. Setting the tracing mode will re-update
|
41
41
|
# the liboboe settings.
|
42
|
-
AppOpticsAPM
|
42
|
+
AppOpticsAPM.set_tracing_mode(AppOpticsAPM::Config[:tracing_mode].to_sym)
|
43
43
|
|
44
44
|
# Continue the trace from the enqueue side?
|
45
45
|
if args[1].is_a?(Hash) && AppOpticsAPM::XTrace.valid?(args[1]['SourceTrace'])
|
data/lib/oboe_metal.rb
CHANGED
@@ -31,16 +31,7 @@ module AppOpticsAPM
|
|
31
31
|
when 'udp'
|
32
32
|
ENV['APPOPTICS_REPORTER_UDP'] = "#{AppOpticsAPM::Config[:reporter_host]}:#{AppOpticsAPM::Config[:reporter_port]}"
|
33
33
|
else # default is ssl, service_key is mandatory
|
34
|
-
|
35
|
-
if service_key == ''
|
36
|
-
AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY not set. Cannot submit data.'
|
37
|
-
AppOpticsAPM.loaded = false
|
38
|
-
return
|
39
|
-
elsif service_key !~ /^[0-9a-fA-F]{64}:[-.:_?\\\/\w ]{1,255}$/
|
40
|
-
AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY problem. No service name or api token in wrong format. Cannot submit data.'
|
41
|
-
AppOpticsAPM.loaded = false
|
42
|
-
return
|
43
|
-
end
|
34
|
+
return unless valid_service_key?
|
44
35
|
# Oboe will override these settings if there are env settings for them
|
45
36
|
options << AppOpticsAPM::Config[:service_key].to_s
|
46
37
|
options << AppOpticsAPM::Config[:hostname_alias].to_s
|
@@ -61,6 +52,19 @@ module AppOpticsAPM
|
|
61
52
|
end
|
62
53
|
alias :restart :start
|
63
54
|
|
55
|
+
def valid_service_key?
|
56
|
+
service_key = (ENV['APPOPTICS_SERVICE_KEY'] || AppOpticsAPM::Config[:service_key]).to_s
|
57
|
+
if service_key == ''
|
58
|
+
AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY not set. Cannot submit data.'
|
59
|
+
AppOpticsAPM.loaded = false
|
60
|
+
return false
|
61
|
+
elsif service_key !~ /^[0-9a-fA-F]{64}:[-.:_?\\\/\w ]{1,255}$/
|
62
|
+
AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY problem. No service name or api token in wrong format. Cannot submit data.'
|
63
|
+
AppOpticsAPM.loaded = false
|
64
|
+
return false
|
65
|
+
end
|
66
|
+
true
|
67
|
+
end
|
64
68
|
##
|
65
69
|
# sendReport
|
66
70
|
#
|
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.5.
|
4
|
+
version: 4.5.1
|
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:
|
13
|
+
date: 2019-02-05 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: json
|