bunny.rb in tingyun_rpm-1.3.1

- old
+ new

@@ -1,13 +1,17 @@
 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'
     require 'ting_yun/instrumentation/support/external_helper'
   end
@@ -20,21 +24,27 @@
         def publish_with_tingyun(payload, opts = {})
           begin
             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
           rescue => e
             TingYun::Agent.logger.error("Failed to Bunny publish_with_tingyun : ", e)
@@ -51,34 +61,51 @@
 
     end
 
     ::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)
           ensure
             TingYun::Agent::Transaction.stop(state, Time.now, summary_metrics)
@@ -89,17 +116,17 @@
         alias_method :call, :call_with_tingyun
 
       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 => {
                 :duration => timings.app_time_in_millis,
                 :qu => timings.queue_time_in_millis,
@@ -114,11 +141,12 @@
         payload
       end
     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"
             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
\ No newline at end of file