tingyun_rpm 1.5.0 → 1.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ting_yun/instrumentation/active_record.rb +1 -2
- data/lib/ting_yun/instrumentation/support/action_controller_subscriber.rb +1 -1
- data/lib/ting_yun/instrumentation/support/split_controller.rb +3 -1
- data/lib/ting_yun/support/coerce.rb +1 -1
- data/lib/ting_yun/version.rb +2 -2
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 125910726e0cd29ecbd1f8ef11554ef3b12ce308
|
4
|
+
data.tar.gz: 0640b5631a7cf7789b3d0a8cd4d6beeb755616a9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1f649dac233f8bc87b8f37551e171c922299655d817b2052b06380bbccdd1486f2b171709bedd2f5c3ba962073603d5030b53c6cf06d25a4f8a3e4a711e56a0a
|
7
|
+
data.tar.gz: ecc612b7b540842486799eac571faa5f6d3e7ec96fb202fc9c650f8a42f8427fa0df5ddd3bae560ca20d8c23a282570664d1fae53b43a7b241142573e98058b5
|
@@ -80,8 +80,7 @@ TingYun::Support::LibraryDetection.defer do
|
|
80
80
|
depends_on do
|
81
81
|
defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
|
82
82
|
(!defined?(::ActiveRecord::VERSION) ||
|
83
|
-
::ActiveRecord::VERSION::MAJOR.to_i <= 3
|
84
|
-
(defined?(::Sinatra) && defined?(::Sinatra::Base) && TingYun::Instrumentation::Support::SinatraHelper.version_supported?))
|
83
|
+
::ActiveRecord::VERSION::MAJOR.to_i <= 3)
|
85
84
|
end
|
86
85
|
|
87
86
|
executes do
|
@@ -75,7 +75,7 @@ module TingYun
|
|
75
75
|
|
76
76
|
def metric_name
|
77
77
|
if TingYun::Agent.config[:'naming.rules_enabled'] && find_rule(method, uri, request.header, params)
|
78
|
-
@metric_name = "WebAction
|
78
|
+
@metric_name = "WebAction/#{namespace}/#{name(uri, request.header, params, request.cookie)}"
|
79
79
|
else
|
80
80
|
if TingYun::Agent.config[:'nbs.auto_action_naming']
|
81
81
|
@metric_name ||= "WebAction/Rails/#{metric_path}%2F#{metric_action}"
|
@@ -15,6 +15,7 @@ module TingYun
|
|
15
15
|
}
|
16
16
|
|
17
17
|
RULE = {
|
18
|
+
0=> :any,
|
18
19
|
1=> :eql?,
|
19
20
|
2=> :start_with?,
|
20
21
|
3=> :end_with?,
|
@@ -67,6 +68,7 @@ module TingYun
|
|
67
68
|
|
68
69
|
def raise_error(_v, _r, _v2, _t)
|
69
70
|
raise 'this param unexist so the rule is unmatched' if _v.nil? or _v2.nil? or _v2.strip.empty? rescue false
|
71
|
+
return if _v && _r==:any
|
70
72
|
unless _t == 0
|
71
73
|
raise 'this param is unmatched with the rule' unless _v.send(_r, _v2)
|
72
74
|
end
|
@@ -80,9 +82,9 @@ module TingYun
|
|
80
82
|
name << split_url(path.split('/'))
|
81
83
|
name << "?"
|
82
84
|
name << split_params(@rule["split"]["urlParams"], params)
|
85
|
+
name << split_header(@rule["split"]["headerParams"], header)
|
83
86
|
name << split_params(@rule["split"]["bodyParams"], params)
|
84
87
|
name << split_params(@rule["split"]["cookieParams"], cookie)
|
85
|
-
name << split_header(@rule["split"]["headerParams"], header)
|
86
88
|
name = name[0..-2] << split_method
|
87
89
|
name.strip
|
88
90
|
end
|
data/lib/ting_yun/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tingyun_rpm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- tingyun
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-10-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -485,3 +485,4 @@ signing_key:
|
|
485
485
|
specification_version: 4
|
486
486
|
summary: TingYun Ruby Agent
|
487
487
|
test_files: []
|
488
|
+
has_rdoc:
|