tingyun_rpm 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a46f9e5110b810ddbb29e1b593e25bf725c831
-  data.tar.gz: f6b0999a21a723f30279702f07c286cfa0ad17ca
+  metadata.gz: 50bb695bb83ad9675c4a47086f7f2a5e326207a9
+  data.tar.gz: 112c143fc64d673606db5703acf36f3c622beaf2
 SHA512:
-  metadata.gz: f20f812206d86863956dc05afb7da78c2e559dc95ef9d9971e3d5d0d3210f1739ddb011e0234b634038c7c0204520fde8914f55bf2772a55070702a5e8ab9a83
-  data.tar.gz: b58306111cfcc24c1f88d3467da3b9a77e5e410b8c8b93e2ebdafafe5c72922828e03c9abb6a89b00ff75d8a8dfd71163b6b582363ce7139a78cb034a6aef36c
+  metadata.gz: ffd6c131b719fd67ce6738b7c100966bff3fc11b71af209288497461d913601e8f0f7c21f12361564263226eec68c1b72f29dfed0be94bbe0ad054eaf1389ed9
+  data.tar.gz: bcc3e5c521ce1207d6c9b6d37ba4fd3f7d11dd0f3d7efefea03553724db8d075aad32dc4f307a2343e8a44acbc995630cdb9a456c2144414131ac481ad5e2ac7

data/lib/ting_yun/agent/transaction/trace_node.rb

@@ -86,6 +86,10 @@ module TingYun
           @params = p
         end
 
+        def merge(hash)
+          params.merge! hash
+        end
+
         def each_call(&blk)
           blk.call self
 

data/lib/ting_yun/agent/transaction/transaction_state.rb

@@ -64,7 +64,6 @@ module TingYun
         @sql_sampler_transaction_data = nil
         @thrift_return_data = nil
         @timings = nil
-        @client_req_id = nil
       end
 
       # TT's and SQL
@@ -169,6 +168,9 @@ module TingYun
         current_transaction.attributes.merge_request_parameters(hash)
       end
 
+      def add_current_node_params(hash)
+        transaction_sample_builder.current_node.merge hash if transaction_sample_builder
+      end
     end
   end
 end

data/lib/ting_yun/agent/transaction/transaction_timings.rb

@@ -54,7 +54,7 @@ module TingYun
       # Helpers
 
       def slow_action_tracer?
-        return app_time_in_seconds > TingYun::Agent.config[:'nbs.action_tracer.action_threshold']
+        return app_time_in_millis > TingYun::Agent.config[:'nbs.action_tracer.action_threshold']
       end
 
       def convert_to_milliseconds(value_in_seconds)

data/lib/ting_yun/configuration/default_source.rb

@@ -676,7 +676,7 @@ module TingYun
             :allowed_from_server => true,
             :description => 'Quantile'
         },
-        :'nbs.mq.conume' => {
+        :'nbs.mq.enabled' => {
             :default => false,
             :public => true,
             :type => Boolean,

data/lib/ting_yun/instrumentation/bunny.rb

@@ -2,10 +2,14 @@ TingYun::Support::LibraryDetection.defer do
   named :bunny
 
   depends_on do
-    defined?(::Bunny::VERSION) && false
+    defined?(::Bunny::VERSION)
+  end
+  depends_on do
+    !::TingYun::Agent.config[:disable_rabbitmq]
   end
 
 
+
   executes do
     TingYun::Agent.logger.info 'Installing bunny(for rabbitmq) Instrumentation'
     require 'ting_yun/support/helper'
@@ -22,17 +26,23 @@ TingYun::Support::LibraryDetection.defer do
             state = TingYun::Agent::TransactionState.tl_get
             return publish_without_tingyun(payload, opts) unless state.execution_traced?
             queue_name = opts[:routing_key]
-            opts[:headers] = {} unless opts[:headers]
-            opts[:headers][:TingyunID] = create_tingyun_id("mq")
+
             metric_name = "Message RabbitMQ/#{@channel.connection.host}:#{@channel.connection.port}%2F"
             if name.empty?
-              metric_name << "Queue%2F#{queue_name}/Produce"
+              if queue_name.start_with?("amq.")
+                metric_name << "Queue%2FTemp/Produce"
+              elsif queue_name.include?(".")
+                metric_name << "Topic%2F#{queue_name}/Produce"
+              else
+                metric_name << "Queue%2F#{queue_name}/Produce"
+              end
             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
+              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
               publish_without_tingyun(payload, opts)
             end
@@ -53,30 +63,47 @@ TingYun::Support::LibraryDetection.defer do
 
     ::Bunny::Consumer.class_eval do
 
-      if public_method_defined?(:call) && TingYun::Agent.config[:'nbs.mq.conume']
+      if public_method_defined?(:call)
 
         def call_with_tingyun(*args)
+          return call_without_tingyun(*args) unless TingYun::Agent.config[:'nbs.mq.enabled']
           begin
-            headers = args[1]&&args[1][:headers].clone
+
+            headers = args[1][:headers].clone rescue {}
+
+
             tingyun_id_secret = headers["TingyunID"]
+
             state = TingYun::Agent::TransactionState.tl_get
-            metric_name = "#{@channel.connection.host}:#{@channel.connection.port}%2FQueue%2F#{queue_name}/Consume"
-            summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Consume')
-            TingYun::Agent::Transaction.start(state,:message, { :transaction_name => "WebAction/RabbitMQ/Queue%2F#{queue_name}/Consume"})
+
+            if queue_name.start_with?("amq.")
+              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}%2FQueue%2FTemp/Consume"
+              transaction_name = "WebAction/RabbitMQ/Queue%2FTemp"
+            elsif queue_name.include?(".")
+              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}%2FTopic%2F#{queue_name}/Consume"
+              transaction_name = "WebAction/RabbitMQ/Topic%2F#{queue_name}"
+            else
+              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}%2FQueue%2F#{queue_name}/Consume"
+              transaction_name = "WebAction/RabbitMQ/Queue%2F#{queue_name}"
+            end
+
             state.save_referring_transaction_info(tingyun_id_secret.split(';')) if cross_app_enabled?(tingyun_id_secret)
+            TingYun::Agent::Transaction.start(state,:message, { :transaction_name => transaction_name})
+            summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Consume')
             TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :RabbitMq, {}, summary_metrics)  do
-              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 nil
+              TingYun::Agent.record_metric("MessageRabbitMQ/#{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
               if state.current_transaction
                 state.add_custom_params("message.byte",args[2].bytesize)
                 state.add_custom_params("message.wait",TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i)
                 state.add_custom_params("message.routingkey",queue_name)
+                state.current_transaction.attributes.add_agent_attribute(:tx_id, state.client_transaction_id)
                 headers.delete("TingyunID")
                 state.merge_request_parameters(headers)
               end
               call_without_tingyun(*args)
-              state.current_transaction.attributes.add_agent_attribute(:entryTrace, build_payload(state)) if state.same_account?
             end
+            state.current_transaction.attributes.add_agent_attribute(:entryTrace, build_payload(state)) if state.same_account? && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
           rescue => e
             TingYun::Agent.logger.error("Failed to Bunny call_with_tingyun : ", e)
             call_without_tingyun(*args)
@@ -91,13 +118,13 @@ TingYun::Support::LibraryDetection.defer do
       end
 
       def cross_app_enabled?(tingyun_id_secret)
-        tingyun_id_secret && ::TingYun::Agent.config[:tingyunIdSecret]
+        tingyun_id_secret && ::TingYun::Agent.config[:tingyunIdSecret] && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
       end
 
       def build_payload(state)
         timings = state.timings
         payload = {
-            :applicationId => TingYun::Agent.config[:tingyunIdSecret].split('|')[1],
+            :applicationId => state.client_tingyun_id_secret.split('|')[1],
             :transactionId => state.client_transaction_id,
             :externalId => state.extenel_req_id,
             :time => {
@@ -116,8 +143,9 @@ TingYun::Support::LibraryDetection.defer do
     end
 
     ::Bunny::Channel.class_eval do
-      if public_method_defined?(:basic_get)&& TingYun::Agent.config[:'nbs.mq.conume']
+      if public_method_defined?(:basic_get)
         def basic_get_with_tingyun(*args)
+          return basic_get_without_tingyun(*args) unless TingYun::Agent.config[:'nbs.mq.enabled']
           begin
             state = TingYun::Agent::TransactionState.tl_get
             metric_name = "#{@connection.host}:#{@connection.port}%2FQueue%2F#{args[0]}/Consume"

data/lib/ting_yun/instrumentation/kafka.rb

@@ -78,7 +78,7 @@ TingYun::Support::LibraryDetection.defer do
         end
       end
 
-      if public_method_defined?(:each_message)&& TingYun::Agent.config[:'nbs.mq.conume']
+      if public_method_defined?(:each_message)
         alias_method :each_message_without_tingyun, :each_message
 
         def each_message(*args, **options, &block)
@@ -108,7 +108,7 @@ TingYun::Support::LibraryDetection.defer do
 
     if defined?(::Kafka::Consumer)
       Kafka::Consumer.class_eval do
-        if public_method_defined?(:each_message) && TingYun::Agent.config[:'nbs.mq.conume']
+        if public_method_defined?(:each_message)
           alias_method :each_message_without_tingyun, :each_message
           def each_message(*args, **options, &block)
             wrap_block = Proc.new do |message|
@@ -138,7 +138,7 @@ TingYun::Support::LibraryDetection.defer do
           end
         end
 
-        if public_method_defined?(:each_batch) && TingYun::Agent.config[:'nbs.mq.conume']
+        if public_method_defined?(:each_batch)
           alias_method :each_batch_without_tingyun, :each_batch
           def each_batch(*args, **options, &block)
             wrap_block = Proc.new do |batch|

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

@@ -8,9 +8,10 @@ module TingYun
         def create_tingyun_id(protocol)
           state = TingYun::Agent::TransactionState.tl_get
           externel_guid = tingyun_externel_guid
-          state.transaction_sample_builder.current_node["externalId"] = externel_guid
+          state.extenel_req_id = externel_guid
           cross_app_id  = TingYun::Agent.config[:tingyunIdSecret] or
               raise TingYun::Agent::CrossAppTracing::Error, "no tingyunIdSecret configured"
+          state.add_current_node_params(:txId=>state.request_guid, :externalId=>state.extenel_req_id)
           "#{cross_app_id};c=1;x=#{state.request_guid};e=#{externel_guid};s=#{TingYun::Helper.time_to_millis(Time.now)};p=#{protocol}"
         end
 

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -29,7 +29,7 @@ module TingYun
             :type => 'perfMetrics',
             :timeFrom => stats_hash.started_at.to_i,
             :timeTo => stats_hash.harvested_at.to_i || Time.now.to_i,
-            :interval => 60,
+            :interval =>  TingYun::Agent.config[:data_report_period],
             :actions => action_array,
             :apdex => adpex_array,
             :components => components_array,

data/lib/ting_yun/version.rb

@@ -8,7 +8,7 @@ module TingYun
 
     MINOR = 3
 
-    TINY = 0
+    TINY = 1
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake