tingyun_rpm 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1312053248f2f8ee7864297cbd3b53e7c72f8c24
-  data.tar.gz: 209f00934dcbd9b67152afbf30bba4a9daa87f1e
+  metadata.gz: 42cfa48ff65b496435593ce17a380b7bff332c65
+  data.tar.gz: f5afe74bed3f331d60977bebfdf4c51da40c3a47
 SHA512:
-  metadata.gz: f030da33af531d464405b2f5842d4914273640b22af31cfb796c2b69027cb9c719f263c3fb7645d9ada5198716d469083529ad2ef5cc520784ac4cb50573a836
-  data.tar.gz: c13ba652fdf33e0cbbe29fabcef3f2cdb348e8c76ab47bfbaa1f904c3e47aea587f90a8137794cef801b6ce5da5323a1167fd26f8dde8eb5e025f66d88cfd314
+  metadata.gz: ba7ada9279f07888fbacfe7f1ed7334f66143d99138a7395448225f7d98e0ef2cb9db4596c8e84b3cc53ac7567477452dd6a0614b6d40d0460e0c1a55b34cc5a
+  data.tar.gz: 12c24299ef09a1698720cca513e4b5bdfbd2b7065cec4e1d1e350ce06a69fc4f2adb40b02acca889735933d58b9367fd9046e786369ee3fdf0c4924d62d25e5d

data/lib/ting_yun/agent/datastore/metric_helper.rb

@@ -44,12 +44,6 @@ module TingYun
           end
         end
 
-        def self.metrics_for_message(product, ip_host, operation)
-          metrics = TingYun::Agent::Transaction.recording_web_transaction? ? [ALL_WEB, ALL] : [ALL_BACKGROUND, ALL]
-          metrics = metrics.map { |suffix| "Message #{product}/NULL/#{suffix}" }
-          metrics.unshift "Message #{product}/#{ip_host}/#{operation}"
-        end
-
         def self.metrics_for(product, operation, host = UNKNOWN, port = 0, dbname = UNKNOWN, collection = nil,  generic_product = nil )
           dbname ||= UNKNOWN
           host ||= UNKNOWN

data/lib/ting_yun/instrumentation/bunny.rb

@@ -39,8 +39,8 @@ TingYun::Support::LibraryDetection.defer do
             else
               metric_name << "Exchange%2F#{name}/Produce"
             end
-            summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Produce')
-            TingYun::Agent::Transaction.wrap(state, metric_name , :RabbitMq, {}, summary_metrics)  do
+            summary_metrics = TingYun::Instrumentation::Support::ExternalHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Produce')
+            TingYun::Agent::Transaction.wrap(state, metric_name , :RabbitMQ, {}, summary_metrics)  do
               opts[:headers] = {} unless opts[:headers]
               opts[:headers]["TingyunID"] = create_tingyun_id("mq")  if TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
               TingYun::Agent.record_metric("#{metric_name}%2FByte",payload.bytesize) if payload
@@ -89,9 +89,9 @@ TingYun::Support::LibraryDetection.defer do
 
             state.save_referring_transaction_info(tingyun_id_secret.split(';')) if cross_app_enabled?(tingyun_id_secret)
 
-            summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Consume')
+            summary_metrics = TingYun::Instrumentation::Support::ExternalHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Consume')
 
-            TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :RabbitMq, {:mq=> true}, summary_metrics)  do
+            TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :message, {:mq=> true}, summary_metrics)  do
               TingYun::Agent::Transaction.set_frozen_transaction_name!(transaction_name)
               TingYun::Agent.record_metric("Message RabbitMQ/#{metric_name}%2FByte",args[2].bytesize) if args[2]
               TingYun::Agent.record_metric("Message RabbitMQ/#{metric_name}%2FWait", TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i) rescue 0
@@ -147,8 +147,8 @@ TingYun::Support::LibraryDetection.defer do
           begin
             state = TingYun::Agent::TransactionState.tl_get
             metric_name = "#{@connection.host}:#{@connection.port}%2FQueue%2F#{args[0]}/Consume"
-            summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('RabbitMQ', "#{connection.host}:#{connection.port}", 'Consume')
-            TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :RabbitMq, {}, summary_metrics)  do
+            summary_metrics = TingYun::Instrumentation::Support::ExternalHelper.metrics_for_message('RabbitMQ', "#{connection.host}:#{connection.port}", 'Consume')
+            TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :RabbitMQ, {}, summary_metrics)  do
               basic_get_without_tingyun(*args)
             end
           rescue =>e

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

@@ -23,6 +23,12 @@ module TingYun
           end
           guid
         end
+
+        def self.metrics_for_message(product, ip_host, operation)
+          metrics =["AllWeb", "All"]
+          metrics = metrics.map { |suffix| "Message #{product}/NULL/#{suffix}" }
+          metrics.unshift "Message #{product}/#{ip_host}/#{operation}"
+        end
       end
     end
   end

data/lib/ting_yun/version.rb

@@ -3,21 +3,9 @@
 
 module TingYun
   module VERSION
-
     MAJOR = 1
-
     MINOR = 4
-
-
-
-
-    TINY = 1
-
-
-
-
-
-
+    TINY = 2
     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.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake