tingyun_rpm 1.6.1 → 3.2.0

data/lib/ting_yun/configuration/manager.rb

@@ -90,7 +90,6 @@ module TingYun
         @server_source  = nil
         @manual_source = nil
         # @callbacks = Hash.new {|hash,key| hash[key] =[]}#存放需要merge本地和服务端配置的info'
-
         @configs_for_testing = []
 
         reset_cache

data/lib/ting_yun/configuration/server_source.rb

@@ -9,7 +9,7 @@ module TingYun
       # These keys appear *outside* of the agent_config hash in the connect
       # response, but should still be merged in as config settings to the
       # main agent configuration.
-      TOP_LEVEL_KEYS = [
+      TOP_LEVEL_KEYSV2 = [
           "applicationId",
           "tingyunIdSecret",
           "enabled",
@@ -19,6 +19,13 @@ module TingYun
           "config"
       ]
 
+      TOP_LEVEL_KEYS = [
+          "appId",
+          "idSecret",
+          "sessionKey",
+          "config"
+      ]
+
       def self.add_top_level_keys_for_testing(add_array)
         TOP_LEVEL_KEYS.concat add_array
       end
@@ -29,7 +36,6 @@ module TingYun
 
       def initialize(connect_reply)
         merged_settings = {}
-
         merge_top_level_keys(merged_settings, connect_reply)
         merge_agent_config_hash(merged_settings, connect_reply)
         filter_keys(merged_settings)

data/lib/ting_yun/configuration/yaml_source.rb

@@ -25,7 +25,7 @@ module TingYun
         rescue ScriptError, StandardError => e
           log_failure("Failed to read or parse configuration file at #{path}", e)
         end
-        booleanify_values(config, 'nbs.agent_enabled', 'enabled')
+        booleanify_values(config, 'agent_enabled', 'enabled')
         super(config, true)
       end
 

data/lib/ting_yun/frameworks/instance_methods.rb

@@ -38,7 +38,7 @@ module TingYun
       # then it will install the real agent and start it.
       #
       # What determines whether the agent is launched is the result of
-      # calling nbs.agent_enabled?  This will indicate whether the
+      # calling agent_enabled?  This will indicate whether the
       # instrumentation should/will be installed.  If we're in a mode
       # where tracers are not installed then we should not start the
       # agent.
@@ -60,7 +60,7 @@ module TingYun
 
         TingYun::Agent.agent = TingYun::Agent::Agent.instance
 
-        if TingYun::Agent.config[:'nbs.agent_enabled'] && !TingYun::Agent.agent.started?
+        if TingYun::Agent.config[:'agent_enabled'] && !TingYun::Agent.agent.started?
           start_agent
           install_instrumentation
         else

data/lib/ting_yun/frameworks/rails.rb

@@ -42,9 +42,9 @@ module TingYun
           end
         end
 
-        if !Agent.config[:'nbs.agent_enabled']
+        if !Agent.config[:'agent_enabled']
           # Might not be running if it does not think mongrel, thin, passenger, etc
-          # is running, if it thinks it's a rake task, or if the nbs.agent_enabled is false.
+          # is running, if it thinks it's a rake task, or if the agent_enabled is false.
           ::TingYun::Agent.logger.info("TingYun Agent is unable to run.")
         else
           install_browser_monitoring(rails_config)

data/lib/ting_yun/http/abstract_request.rb

@@ -17,6 +17,18 @@ module TingYun
         raise NotImplementedError, ERROR_MESSAGE + ':from method'
       end
 
+      def port
+        ""
+      end
+
+      def host
+        ""
+      end
+
+      def path
+        ""
+      end
+
 
     end
   end

data/lib/ting_yun/http/curb_wrappers.rb

@@ -19,7 +19,7 @@ require 'ting_yun/http/abstract_request'
       end
 
       def from
-        "curb%2Fhttp"
+        "curb http"
       end
 
       def host_from_header

data/lib/ting_yun/http/excon_wrappers.rb

@@ -49,7 +49,7 @@ module TingYun
         end
 
         def from
-          "excon%2Fhttp"
+          "excon http"
         end
 
         def host_from_header
@@ -63,6 +63,14 @@ module TingYun
           host_from_header || @datum[:host]
         end
 
+        def port
+          @port
+        end
+
+        def path
+          @path
+        end
+
         def [](key)
           @datum[:headers][key]
         end

data/lib/ting_yun/http/http_client_request.rb

@@ -11,11 +11,18 @@ module TingYun
       end
 
       def type
-        'HTTPClient'
+        @uri.scheme
       end
 
       def from
-        "http_client%2Fhttp"
+        "HttpClient"
+      end
+
+      def host
+        @uri.host || @proxy.host
+      end
+      def port
+        @uri.port || @uri.port
       end
 
       def [](key)
@@ -31,6 +38,10 @@ module TingYun
         URI("#{@proxy.scheme.downcase}://#{@proxy.host}:#{@proxy.port}#{@uri}")
       end
 
+      def path
+        @uri
+      end
+
       def args
         return @method, @uri, @query, @body, @header
       end

data/lib/ting_yun/http/net_http_request.rb

@@ -8,11 +8,11 @@ module TingYun
       end
 
       def type
-        'Net::HTTP'
+        @connection.use_ssl? ? 'https' : 'http'
       end
 
       def from
-        "net%2Fhttp"
+        "net http"
       end
 
       def host
@@ -23,6 +23,10 @@ module TingYun
         end
       end
 
+      def port
+        @connection.port
+      end
+
       def method
         @request.method
       end
@@ -35,6 +39,10 @@ module TingYun
         @request[key] = value
       end
 
+      def path
+        @request.path
+      end
+
       def uri
         case @request.path
           when /^https?:\/\//

data/lib/ting_yun/http/typhoeus_wrappers.rb

@@ -49,7 +49,7 @@ module TingYun
           TYPHOEUS
         end
         def from
-          "typhoeus%2Fhttp"
+          "typhoeus http"
         end
 
         LHOST = 'host'.freeze

data/lib/ting_yun/instrumentation/active_record.rb

@@ -41,17 +41,15 @@ module TingYun
       end
 
       def log_with_tingyun_instrumentation(*args, &block)
-
         state = TingYun::Agent::TransactionState.tl_get
         sql, name, _ = args
-        klass_name, *metrics = ::TingYun::Instrumentation::Support::ActiveRecordHelper.metrics_for(
+        @config= ::TingYun::Instrumentation::Support::ActiveRecordHelper.metrics_for(
             TingYun::Helper.correctly_encoded(name),
             TingYun::Helper.correctly_encoded(sql),
             @config)
 
-        scoped_metric = metrics.first
 
-        TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(metrics, {}, nil, klass_name) do
+        TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(nil, {}, nil, nil) do
           t0 = Time.now
           begin
             log_without_tingyun_instrumentation(*args, &block)
@@ -60,7 +58,7 @@ module TingYun
             state.timings.sql_duration = state.timings.sql_duration  + elapsed_time * 1000
 
             ::TingYun::Agent::Collector::TransactionSampler.notice_sql(sql, @config, elapsed_time, state, EXPLAINER)
-            ::TingYun::Agent::Collector::SqlSampler.notice_sql(sql, scoped_metric, @config, elapsed_time, state, EXPLAINER)
+            # ::TingYun::Agent::Collector::SqlSampler.notice_sql(sql, scoped_metric, @config, elapsed_time, state, EXPLAINER)
           end
 
         end

data/lib/ting_yun/instrumentation/bunny.rb

@@ -26,24 +26,27 @@ 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]
-
-            metric_name = "Message RabbitMQ/#{@channel.connection.host}:#{@channel.connection.port}%2F"
+            metric_name = "Message RabbitMQ/#{@channel.connection.host}:#{@channel.connection.port}/"
             if name.empty?
               if queue_name.start_with?("amq.")
-                metric_name << "Queue%2FTemp/Produce"
+                metric_name << "Queue/Temp/Produce"
               elsif queue_name.include?(".")
-                metric_name << "Topic%2F#{queue_name}/Produce"
+                metric_name << "Topic/#{queue_name}/Produce"
               else
-                metric_name << "Queue%2F#{queue_name}/Produce"
+                metric_name << "Queue/#{queue_name}/Produce"
               end
             else
-              metric_name << "Exchange%2F#{name}/Produce"
+              metric_name << "Exchange/#{name}/Produce"
             end
             summary_metrics = TingYun::Instrumentation::Support::ExternalHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Produce')
-            TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(summary_metrics.unshift(metric_name), {}, nil, metric_name) do
+            TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(summary_metrics.unshift(metric_name), {}, nil, "Bunny/Exchange") 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
+              opts[:headers]["X-Tingyun"] = create_tingyun_id  if TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
+              state.add_current_node_paramsV3(:vendor => "RabbitMQ")
+              state.add_current_node_paramsV3(:instance => "#{@channel.connection.host}:#{@channel.connection.port}")
+              state.add_current_node_paramsV3(:operation => "#{queue_name} #{self.name}",:key=> self.name)
+              state.add_current_node_params(:type => 'MQP',:method=>"publish")
+              # TingYun::Agent.record_metric("#{metric_name}/Byte",payload.bytesize) if payload
               publish_without_tingyun(payload, opts)
             end
           rescue => e
@@ -66,43 +69,46 @@ TingYun::Support::LibraryDetection.defer do
       if public_method_defined?(:call)
 
         def call_with_tingyun(*args)
-          return call_without_tingyun(*args) unless TingYun::Agent.config[:'nbs.mq.enabled']
+          return call_without_tingyun(*args) unless TingYun::Agent.config[:'mq.enabled']
           begin
 
             headers = args[1][:headers].clone rescue {}
 
 
-            tingyun_id_secret = headers["TingyunID"]
+            tingyun_id_secret = headers["X-Tingyun"]
 
             state = TingYun::Agent::TransactionState.tl_get
 
             if queue_name.start_with?("amq.")
-              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}%2FQueue%2FTemp/Consume"
-              transaction_name = "WebAction/RabbitMQ/Queue%2FTemp"
+              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}/Queue/Temp/Consume"
+              transaction_name = "RabbitMQ/Queue/FTemp"
             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}"
+              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}/Topic/#{queue_name}/Consume"
+              transaction_name = "RabbitMQ/Topic/#{queue_name}"
             else
-              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}%2FQueue%2F#{queue_name}/Consume"
-              transaction_name = "WebAction/RabbitMQ/Queue%2F#{queue_name}"
+              metric_name = "#{@channel.connection.host}:#{@channel.connection.port}/Queue/#{queue_name}/Consume"
+              transaction_name = "RabbitMQ/Queue/#{queue_name}"
             end
 
             state.save_referring_transaction_info(tingyun_id_secret.split(';')) if cross_app_enabled?(tingyun_id_secret)
 
             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}" , :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
-              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)
+              TingYun::Agent::Transaction.set_frozen_transaction_name!("#{state.action_type}/#{transaction_name}")
+              # TingYun::Agent.record_metric("Message RabbitMQ/#{metric_name}/Byte",args[2].bytesize) if args[2]
+              # TingYun::Agent.record_metric("Message RabbitMQ/#{metric_name}Wait", TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i) rescue 0
               state.add_custom_params("message.routingkey",queue_name)
+              state.add_current_node_params(:type => 'MQC',:method=>"call",:klass=> "Bunny/Consumer")
               state.current_transaction.attributes.add_agent_attribute(:tx_id, state.client_transaction_id)
-              headers.delete("TingyunID")
+              headers.delete("X-Tingyun")
               state.merge_request_parameters(headers)
               call_without_tingyun(*args)
-              state.current_transaction.attributes.add_agent_attribute(:entryTrace, build_payload(state)) if state.same_account? && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
+              tx_data =  build_payload(state)
+              state.current_transaction.attributes.add_agent_attribute(:entryTrace,tx_data) if TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
+              state.add_current_node_paramsV3(:vendor => "RabbitMQ",:key => queue_name)
+              state.add_current_node_paramsV3(:txData => TingYun::Support::Serialize::JSONWrapper.dump(tx_data))
+              state.add_current_node_paramsV3(:instance => "#{@channel.connection.host}:#{@channel.connection.port}")
+              state.add_current_node_paramsV3(:operation => "#{queue_name}",:bytes =>args[2].bytesize,:async_wait=>TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i)
             end
           rescue => e
             TingYun::Agent.logger.error("Failed to Bunny call_with_tingyun : ", e)
@@ -116,26 +122,20 @@ TingYun::Support::LibraryDetection.defer do
       end
 
       def cross_app_enabled?(tingyun_id_secret)
-        tingyun_id_secret && ::TingYun::Agent.config[:tingyunIdSecret] && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
+        tingyun_id_secret && ::TingYun::Agent.config[:idSecret] && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
       end
 
       def build_payload(state)
         timings = state.timings
+
         payload = {
-            :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,
-                :db => timings.sql_duration,
-                :ex => timings.external_duration,
-                :rds => timings.rds_duration,
-                :mc => timings.mc_duration,
-                :mon => timings.mon_duration,
-                :code => timings.app_execute_duration
-            }
+            :id => TingYun::Agent.config[:idSecret],
+            :tname => state.transaction_name,
+            :tid => state.current_transaction.guid,
+            :rid => state.trace_id,
+            :duration => timings.app_time_in_millis
         }
+
         payload
       end
     end
@@ -143,19 +143,23 @@ TingYun::Support::LibraryDetection.defer do
     ::Bunny::Channel.class_eval do
       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']
+          return basic_get_without_tingyun(*args) unless TingYun::Agent.config[:'mq.enabled']
           begin
             state = TingYun::Agent::TransactionState.tl_get
-            metric_name = "#{@connection.host}:#{@connection.port}%2FQueue%2F#{args[0]}/Consume"
+            metric_name = "#{@connection.host}:#{@connection.port}/Queue/#{args[0]}/Consume"
             summary_metrics = TingYun::Instrumentation::Support::ExternalHelper.metrics_for_message('RabbitMQ', "#{connection.host}:#{connection.port}", 'Consume')
-            TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(summary_metrics, {}, nil, "Message RabbitMQ/#{metric_name}") do
+            TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(summary_metrics, {}, nil, "Bunny/Channel") do
               basic_get_without_tingyun(*args)
+              state.add_current_node_paramsV3(:vendor => "RabbitMQ")
+              state.add_current_node_paramsV3(:instance => "#{@connection.host}:#{@connection.port}")
+              state.add_current_node_paramsV3(:operation => "#{args[0]}")
+              state.add_current_node_params(:type => 'MQC',:method=>"basic_get")
             end
           rescue =>e
             TingYun::Agent.logger.error("Failed to Bunny basic_get_with_tingyun : ", e)
             basic_get_without_tingyun(*args)
-          ensure
-            TingYun::Agent::Transaction.stop(state, Time.now.to_f, summary_metrics)
+          # ensure
+          #   TingYun::Agent::Transaction.stop(state, Time.now.to_f, summary_metrics)
           end
         end
 

data/lib/ting_yun/instrumentation/grape.rb

@@ -24,8 +24,10 @@ TingYun::Support::LibraryDetection.defer do
                   self.namespace.to_s.sub(%r{\A/}, ''), # removing leading slashes
                   self.options[:path].first.to_s.sub(%r{\A/}, ''),
           ].compact.select{ |n| n.to_s unless n.to_s.empty? }.join("/")
-          TingYun::Agent::Transaction.set_default_transaction_name(name, :controller)
-          run_without_tingyun(*args)
+          state = TingYun::Agent::TransactionState.tl_get
+          TingYun::Agent::Transaction.wrap(state,name,:controller,) do
+            run_without_tingyun(*args)
+          end
         rescue => e
           TingYun::Agent.logger.info("Error getting Grape Endpoint Name. Error: #{e.message}. Options: #{self.options.inspect}")
           TingYun::Agent.notice_error(e,:type=>:exception)

data/lib/ting_yun/instrumentation/http_client.rb

@@ -41,7 +41,7 @@ TingYun::Support::LibraryDetection.defer do
             args[1] = (::Module.private_method_defined? :to_resource_url) ? to_resource_url(args[1]) : urify(args[1])
             proxy = no_proxy?(args[1]) ? nil : @proxy
             tingyun_request = TingYun::Http::HttpClientRequest.new(proxy, *args, &block)
-            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{tingyun_request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{tingyun_request.from}")
+            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{tingyun_request.uri.to_s.gsub(/\/\z/,'')}/#{tingyun_request.from}")
             raise e
           end
         end

data/lib/ting_yun/instrumentation/kafka.rb

@@ -65,10 +65,10 @@ TingYun::Support::LibraryDetection.defer do
           begin
             state = TingYun::Agent::TransactionState.tl_get
             ip_and_hosts = @seed_brokers.map{|a| [a.host, a.port].join(':')}.join(',') rescue TingYun::Instrumentation::Kafka::UNKNOWN
-            metric_name = "Message Kafka/#{ip_and_hosts}%2FTopic%2F#{options[:topic]}/Produce"
+            metric_name = "Message Kafka/#{ip_and_hosts}/Topic/#{options[:topic]}/Produce"
             summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('Kafka', ip_and_hosts, 'Produce')
             TingYun::Agent::Transaction.wrap(state, metric_name, :Kafka, {}, summary_metrics) do
-              TingYun::Agent.record_metric("#{metric_name}%2FByte", args[0].bytesize) if args[0]
+              # TingYun::Agent.record_metric("#{metric_name}%2FByte", args[0].bytesize) if args[0]
               deliver_message_without_tingyun(*args, **options, &block)
             end
           rescue => e
@@ -87,11 +87,12 @@ TingYun::Support::LibraryDetection.defer do
               state = TingYun::Agent::TransactionState.tl_get
               state.reset
               ip_and_hosts = @seed_brokers.map{|a| [a.host, a.port].join(':')}.join(',') rescue TingYun::Instrumentation::Kafka::UNKNOWN
-              metric_name = "#{ip_and_hosts}%2FTopic%2F#{message.topic}/Consume"
+              metric_name = "#{ip_and_hosts}/Topic/#{message.topic}/Consume"
               summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('Kafka', ip_and_hosts, 'Consume')
-              TingYun::Agent::Transaction.start(state,:message, {:transaction_name => "WebAction/Kafka/Topic%2F#{message.topic}/Consume"})
+              TingYun::Agent::Transaction.start(state,:message, {:transaction_name =>
+                                                                     "WebAction/Kafka/Topic/#{message.topic}/Consume"})
               TingYun::Agent::Transaction.wrap(state, "Message Kafka/#{metric_name}" , :Kafka, {}, summary_metrics)  do
-                TingYun::Agent.record_metric("Message Kafka/#{metric_name}%2FByte",message.value.bytesize) if message.value
+                # TingYun::Agent.record_metric("Message Kafka/#{metric_name}%2FByte",message.value.bytesize) if message.value
                 block.call(message)
               end
             rescue => e
@@ -116,11 +117,12 @@ TingYun::Support::LibraryDetection.defer do
                 state = TingYun::Agent::TransactionState.tl_get
                 state.reset
                 ip_and_hosts = self.cluster.seed_brokers.map{|a| [a.host, a.port].join(':')}.join(',') rescue TingYun::Instrumentation::Kafka::UNKNOWN
-                metric_name = "#{ip_and_hosts}%2FTopic%2F#{message.topic}/Consume"
+                metric_name = "#{ip_and_hosts}/Topic/#{message.topic}/Consume"
                 summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('Kafka', ip_and_hosts, 'Consume')
-                TingYun::Agent::Transaction.start(state,:message, {:transaction_name => "WebAction/Kafka/Topic%2F#{message.topic}/Consume"})
+                TingYun::Agent::Transaction.start(state,:message, {:transaction_name =>
+                                                                       "WebAction/Kafka/Topic/#{message.topic}/Consume"})
                 TingYun::Agent::Transaction.wrap(state, "Message Kafka/#{metric_name}" , :Kafka, {}, summary_metrics)  do
-                  TingYun::Agent.record_metric("Message Kafka/#{metric_name}%2FByte", message.value.bytesize) if message.value
+                  # TingYun::Agent.record_metric("Message Kafka/#{metric_name}%2FByte", message.value.bytesize) if message.value
                   block.call(message)
                 end
               rescue => e
@@ -146,12 +148,13 @@ TingYun::Support::LibraryDetection.defer do
                 state = TingYun::Agent::TransactionState.tl_get
                 state.reset
                 ip_and_hosts = self.cluster.seed_brokers.map{|a| [a.host, a.port].join(':')}.join(',') rescue TingYun::Instrumentation::Kafka::UNKNOWN
-                metric_name = "#{ip_and_hosts}%2FTopic%2F#{batch.topic}/Consume"
+                metric_name = "#{ip_and_hosts}/Topic/#{batch.topic}/Consume"
                 summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('Kafka', ip_and_hosts, 'Consume')
-                TingYun::Agent::Transaction.start(state,:message, {:transaction_name => "WebAction/Kafka/Topic%2F#{message.topic}/Consume"})
+                TingYun::Agent::Transaction.start(state,:message, {:transaction_name =>
+                                                                       "WebAction/Kafka/Topic/#{message.topic}/Consume"})
                 TingYun::Agent::Transaction.wrap(state, "Message Kafka/#{metric_name}" , :Kafka, {}, summary_metrics)  do
                   bytesize = batch.messages.reduce(0){ |res, msg| res += (msg.value ? msg.value.bytesize : 0)}
-                  TingYun::Agent.record_metric("Message Kafka/#{metric_name}%2FByte", bytesize) if bytesize.to_i > 0
+                  # TingYun::Agent.record_metric("Message Kafka/#{metric_name}%2FByte", bytesize) if bytesize.to_i > 0
                   block.call(batch)
                 end
               rescue => e
@@ -178,10 +181,10 @@ TingYun::Support::LibraryDetection.defer do
           state = TingYun::Agent::TransactionState.tl_get
           return produce_without_tingyun(*args, **options, &block) unless state.current_transaction
           ip_and_hosts = @cluster.seed_brokers.map{|a| [a.host, a.port].join(':')}.join(',') rescue TingYun::Instrumentation::Kafka::UNKNOWN
-          metric_name = "Message Kafka/#{ip_and_hosts}%2FTopic%2F#{options[:topic]}/Produce"
+          metric_name = "Message Kafka/#{ip_and_hosts}/Topic/#{options[:topic]}/Produce"
           summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('Kafka', ip_and_hosts, 'Produce')
           TingYun::Agent::Transaction.wrap(state, metric_name, :Kafka, {}, summary_metrics) do
-            TingYun::Agent.record_metric("#{metric_name}%2FByte",args[0].bytesize) if args[0]
+            # TingYun::Agent.record_metric("#{metric_name}%2FByte",args[0].bytesize) if args[0]
             produce_without_tingyun(*args, **options, &block)
           end
         rescue => e
@@ -200,10 +203,10 @@ TingYun::Support::LibraryDetection.defer do
             begin
               state = TingYun::Agent::TransactionState.tl_get
               ip_and_hosts = @worker.producer.cluster.seed_brokers.map{|a| [a.host, a.port].join(':')}.join(',') rescue TingYun::Instrumentation::Kafka::UNKNOWN
-              metric_name = "Message Kafka/#{ip_and_hosts}%2FTopic%2F#{options[:topic]}/Produce"
+              metric_name = "Message Kafka/#{ip_and_hosts}/Topic/#{options[:topic]}/Produce"
               summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('Kafka', ip_and_hosts, 'Produce')
               TingYun::Agent::Transaction.wrap(state, metric_name, :Kafka, {}, summary_metrics) do
-                TingYun::Agent.record_metric("#{metric_name}%2FByte",args[0].bytesize) if args[0]
+                # TingYun::Agent.record_metric("#{metric_name}%2FByte",args[0].bytesize) if args[0]
                 produce_without_tingyun(*args, **options, &block)
               end
             rescue => e