lib/ting_yun/instrumentation/bunny.rb in tingyun_rpm-1.4.2 vs lib/ting_yun/instrumentation/bunny.rb in tingyun_rpm-1.5.0
- old
+ new
@@ -38,11 +38,11 @@
end
else
metric_name << "Exchange%2F#{name}/Produce"
end
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
+ TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(summary_metrics.unshift(metric_name), {}, nil, metric_name) 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
@@ -146,17 +146,17 @@
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::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
+ TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(summary_metrics, {}, nil, "Message RabbitMQ/#{metric_name}") do
basic_get_without_tingyun(*args)
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, summary_metrics)
+ TingYun::Agent::Transaction.stop(state, Time.now.to_f, summary_metrics)
end
end
alias_method :basic_get_without_tingyun, :basic_get
alias_method :basic_get, :basic_get_with_tingyun
\ No newline at end of file