tingyun_rpm 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdc5d84fba459da89f499abfdfce47cf81995046
-  data.tar.gz: bade661f66b85afb9e4f5f0ab9c1088424343fb4
+  metadata.gz: 125910726e0cd29ecbd1f8ef11554ef3b12ce308
+  data.tar.gz: 0640b5631a7cf7789b3d0a8cd4d6beeb755616a9
 SHA512:
-  metadata.gz: a87bbc8cb3dc20381701255dc19773731d73415556861e977c1f483e8d7546ca9cfd9e435bbbf87a14047af5630f962ade76d3c37b55f3306ec1026003b00e6e
-  data.tar.gz: 57f728853e98684bd7c6188a29d53367194caea82fcf8a40f1b9896054e7b2e887ae7a17403e1f0275b65dfb4b345074060d50de9cdbd7c6af183ca9d6aa94ec
+  metadata.gz: 1f649dac233f8bc87b8f37551e171c922299655d817b2052b06380bbccdd1486f2b171709bedd2f5c3ba962073603d5030b53c6cf06d25a4f8a3e4a711e56a0a
+  data.tar.gz: ecc612b7b540842486799eac571faa5f6d3e7ec96fb202fc9c650f8a42f8427fa0df5ddd3bae560ca20d8c23a282570664d1fae53b43a7b241142573e98058b5

data/lib/ting_yun/instrumentation/active_record.rb

@@ -80,8 +80,7 @@ TingYun::Support::LibraryDetection.defer do
   depends_on do
     defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
         (!defined?(::ActiveRecord::VERSION) ||
-            ::ActiveRecord::VERSION::MAJOR.to_i <= 3 ||
-            (defined?(::Sinatra) && defined?(::Sinatra::Base) && TingYun::Instrumentation::Support::SinatraHelper.version_supported?))
+            ::ActiveRecord::VERSION::MAJOR.to_i <= 3)
   end
 
   executes do

data/lib/ting_yun/instrumentation/support/action_controller_subscriber.rb

@@ -75,7 +75,7 @@ module TingYun
 
         def metric_name
           if TingYun::Agent.config[:'naming.rules_enabled'] && find_rule(method, uri, request.header, params)
-            @metric_name =  "WebAction/Rails/#{namespace}/#{name(uri, request.header, params, request.cookie)}"
+            @metric_name =  "WebAction/#{namespace}/#{name(uri, request.header, params, request.cookie)}"
           else
             if TingYun::Agent.config[:'nbs.auto_action_naming']
               @metric_name ||= "WebAction/Rails/#{metric_path}%2F#{metric_action}"

data/lib/ting_yun/instrumentation/support/split_controller.rb

@@ -15,6 +15,7 @@ module TingYun
         }
 
         RULE = {
+          0=> :any,
           1=> :eql?,
           2=> :start_with?,
           3=> :end_with?,
@@ -67,6 +68,7 @@ module TingYun
 
         def raise_error(_v, _r, _v2, _t)
           raise 'this param unexist so the rule is unmatched' if _v.nil? or _v2.nil? or _v2.strip.empty? rescue false
+          return if _v && _r==:any
           unless _t == 0
             raise 'this param  is unmatched  with the rule' unless _v.send(_r, _v2)
           end
@@ -80,9 +82,9 @@ module TingYun
           name << split_url(path.split('/'))
           name << "?"
           name << split_params(@rule["split"]["urlParams"], params)
+          name << split_header(@rule["split"]["headerParams"], header)
           name << split_params(@rule["split"]["bodyParams"], params)
           name << split_params(@rule["split"]["cookieParams"], cookie)
-          name << split_header(@rule["split"]["headerParams"], header)
           name = name[0..-2] << split_method
           name.strip
         end

data/lib/ting_yun/support/coerce.rb

@@ -46,7 +46,7 @@ module TingYun
       end
 
       def url_encode(s)
-        s.to_s.b.gsub(/[^a-zA-Z0-9_\-.]/n) { |m|
+        s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n) { |m|
           sprintf("%%%02X", m.unpack("C")[0])
         }
       end

data/lib/ting_yun/version.rb

@@ -4,8 +4,8 @@
 module TingYun
   module VERSION
     MAJOR = 1
-    MINOR = 5
-    TINY = 0
+    MINOR = 6
+    TINY = 1
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -485,3 +485,4 @@ signing_key:
 specification_version: 4
 summary: TingYun Ruby Agent
 test_files: []
+has_rdoc: