activerecord-honeycomb 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bc4eab86d0578bcb7c93ef32c30c4b49b68a8b5140611253d9cc45572a1f66
-  data.tar.gz: 8c597b10ed77363ea930a794ccbf9f7bb91f93b1782e42671bcf115b7983b7b2
+  metadata.gz: 574eb4905dd3709c208d25eeda5769690aafadccef51fdd2987980a47a2a3e0d
+  data.tar.gz: 50c9cad4093777e96e188ce2606517b4009ac70c72e720cbda606f9f60397714
 SHA512:
-  metadata.gz: 5320563ca868a56c0245042e13e4a0cd5eb0321e35f60cf06ab711571d6ac1ac49683f33ce2fb0675ff4de4f750d652dc5e783200f7ea492858b0a2f8bd85acd
-  data.tar.gz: d65ea71e23b8a0cc71d1e4579687dac3393ec11a7d3ec38213d0876ed0e94ae417adc527a68fc1dd8ed696f7cc4e3a52ee1ddf44ccb0c1fe80861da6b7b7d06f
+  metadata.gz: 99c326d55013f7deabb23b0dcefd8620f03786c4ed7fae741ad629b8e2a288347adaa0a029a2ef4942ecf0cd0d2419f768d89f85b75bf7a96d24a2ba1a035491
+  data.tar.gz: 0fa3717e6d7917f3bb070f515312a0bbb7ef1ff035b2d0995fc1bf3b389635500f903e5aef06e3c80f02c00d0eb61428c61ccd637d19f7b4e1b54ea160cac916

data/lib/active_record/connection_adapters/honeycomb_adapter.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'active_support/backtrace_cleaner'
 require 'securerandom'
 
 module ActiveRecord
@@ -121,6 +122,7 @@ module ActiveRecord
           event = builder.event
 
           event.add_field 'db.sql', sql
+          event.add_field 'db.caller', extract_query_source_location(caller)
           event.add_field 'name', name || query_name(sql)
 
           binds.each do |bind|
@@ -188,6 +190,24 @@ module ActiveRecord
           yield
         end
       end
+
+      def extract_query_source_location(locations)
+        backtrace_cleaner.clean(locations).first
+      end
+
+      def backtrace_cleaner
+        @backtrace_cleaner ||=
+          if defined?(Rails)
+            Rails.backtrace_cleaner
+          else
+            ActiveSupport::BacktraceCleaner.new.tap do |cleaner|
+              # Ignore ourselves
+              cleaner.add_silencer { |l| l.include?(__FILE__) }
+              # Ignore activerecord
+              cleaner.add_silencer { |l| l.include?("activerecord") }
+            end
+          end
+      end
     end
   end
 end

data/lib/active_record/honeycomb.rb

@@ -6,6 +6,8 @@ module ActiveRecord
       def munge_config(config, client: nil, logger: nil)
         config = resolve_config(config)
 
+        return config if config.key?('real_adapter') || config.key?(:real_adapter)
+
         munged = config.merge(
           'adapter' => 'honeycomb',
           'real_adapter' => config.fetch('adapter'),

data/lib/active_record/honeycomb/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module Honeycomb
     GEM_NAME = 'activerecord-honeycomb'
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -112,16 +112,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement