lib/oboe/frameworks/rails/inst/connection_adapters/utils.rb in oboe-2.6.6.1 vs lib/oboe/frameworks/rails/inst/connection_adapters/utils.rb in oboe-2.6.7.1

- old
+ new

@@ -3,11 +3,11 @@ module Oboe module Inst module ConnectionAdapters module Utils - + def extract_trace_details(sql, name = nil, binds = []) opts = {} begin if Oboe::Config[:sanitize_sql] @@ -24,11 +24,11 @@ if ::Rails::VERSION::MAJOR == 2 config = ::Rails.configuration.database_configuration[::Rails.env] else config = ::Rails.application.config.database_configuration[::Rails.env] - end + end opts[:Database] = config["database"] if config.has_key?("database") opts[:RemoteHost] = config["host"] if config.has_key?("host") opts[:Flavor] = config["adapter"] if config.has_key?("adapter") rescue StandardError => e @@ -40,19 +40,19 @@ end # We don't want to trace framework caches. Only instrument SQL that # directly hits the database. def ignore_payload?(name) - %w(SCHEMA EXPLAIN CACHE).include? name.to_s or + %w(SCHEMA EXPLAIN CACHE).include? name.to_s or (name and name.to_sym == :skip_logging) or name == "ActiveRecord::SchemaMigration Load" end #def cfg # @config #end - + def execute_with_oboe(sql, name = nil) if Oboe.tracing? and !ignore_payload?(name) opts = extract_trace_details(sql, name) Oboe::API.trace('activerecord', opts || {}) do @@ -60,11 +60,11 @@ end else execute_without_oboe(sql, name) end end - + def exec_query_with_oboe(sql, name = nil, binds = []) if Oboe.tracing? and !ignore_payload?(name) opts = extract_trace_details(sql, name, binds) Oboe::API.trace('activerecord', opts || {}) do @@ -72,11 +72,11 @@ end else exec_query_without_oboe(sql, name, binds) end end - + def exec_delete_with_oboe(sql, name = nil, binds = []) if Oboe.tracing? and !ignore_payload?(name) opts = extract_trace_details(sql, name, binds) Oboe::API.trace('activerecord', opts || {}) do @@ -84,11 +84,11 @@ end else exec_delete_without_oboe(sql, name, binds) end end - + def exec_insert_with_oboe(sql, name = nil, binds = [], *args) if Oboe.tracing? and !ignore_payload?(name) opts = extract_trace_details(sql, name, binds) Oboe::API.trace('activerecord', opts || {}) do @@ -96,10 +96,10 @@ end else exec_insert_without_oboe(sql, name, binds, *args) end end - + def begin_db_transaction_with_oboe() if Oboe.tracing? opts = {} opts[:Query] = "BEGIN"