activerecord-honeycomb 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88cec16f3ac4ed61cc371132a4152e9e320a64f2c7b18a57534868ca73ff2e62
-  data.tar.gz: 751e758dfdf184c1e635f800ff276a3933290307ae7e5d08460a9e8b714498c7
+  metadata.gz: 5513e1bf298b293e26b56aeaeb4d01d1f30f1f886523af3d7207c94c3649b191
+  data.tar.gz: 44d8d740273a31a1c0474f5225ee6879a43afa903fbfdf7854e6a6c5372eb1e8
 SHA512:
-  metadata.gz: d210ccbcafdb3ac139e7c02f390d67cf1341d9dc4ca4d5bb15072712a7797b2cdf572a2e1dcb6d95e137deb17387d51bf5037724d69a4dd2bd71a62a64411e48
-  data.tar.gz: 14854ef17ddca719d5e5771ff127062fd0659e9dc74b06dadb5a586c019e0047fa48026533b440975344e79d2c00588eea59d48366032ba35e5297fdb91050e7
+  metadata.gz: d4c0dc2140357e734883e1da31c64d13917b1d8e8cb45f7438b524ebfd6fd7918874e2324b7b8296c0222e02a21465981f3c0114acada918f3c62daae1e1b9e0
+  data.tar.gz: 8f0bfed8173a460fe3fe505191aeb7b1236b55a26e127b7b911675e94d19493347f65bf2381f1964ad9a0312b3882a082eec191555199057176050ac5fc41ce4

data/lib/active_record/connection_adapters/honeycomb_adapter.rb

@@ -21,8 +21,10 @@ module ActiveRecord
       real_connection = ::ActiveRecord::Base.send(spec.adapter_method, spec.config)
       logger.debug "#{log_prefix} obtained real database connection: #{real_connection.class.name}" if logger
 
-      unless real_connection.class.ancestors.include? ConnectionAdapters::HoneycombAdapter
-        real_connection.class.include ConnectionAdapters::HoneycombAdapter
+      if real_connection.class.ancestors.include? ConnectionAdapters::HoneycombAdapter
+        logger.debug "#{log_prefix} found #{real_connection.class} with #{ConnectionAdapters::HoneycombAdapter} already included"
+      else
+        real_connection.class.prepend ConnectionAdapters::HoneycombAdapter
       end
 
       real_connection
@@ -36,7 +38,7 @@ module ActiveRecord
         attr_reader :builder
         attr_accessor :logger
 
-        def included(klazz)
+        def prepended(klazz)
           debug "included into #{klazz.name}"
 
           if @client
@@ -65,32 +67,77 @@ module ActiveRecord
 
       delegate :builder, to: self
 
-      def execute(sql, *args)
-        sending_honeycomb_event do |event|
-          event.add_field 'db.sql', sql
+      def execute(sql, name = nil, *args)
+        sending_honeycomb_event(sql, name, []) do |event|
+          adding_span_metadata_if_available(event) do
+            super
+          end
+        end
+      end
 
-          adding_span_metadata_if_available(event, :statement) do
+      def exec_query(sql, name = 'SQL', binds = [], *args)
+        sending_honeycomb_event(sql, name, binds) do |event|
+          adding_span_metadata_if_available(event) do
             super
           end
         end
       end
 
-      def exec_query(sql, *args)
-        sending_honeycomb_event do |event|
-          event.add_field 'db.sql', sql
-          event.add_field 'name', query_name(sql)
+      def exec_insert(sql, name, binds, *args)
+        sending_honeycomb_event(sql, name, binds) do |event|
+          adding_span_metadata_if_available(event) do
+            super
+          end
+        end
+      end
 
-          adding_span_metadata_if_available(event, :query) do
+      def exec_delete(sql, name, binds = [], *args)
+        sending_honeycomb_event(sql, name, binds) do |event|
+          adding_span_metadata_if_available(event) do
+            super
+          end
+        end
+      end
+
+      def exec_update(sql, name, binds = [], *args)
+        sending_honeycomb_event(sql, name, binds) do |event|
+          adding_span_metadata_if_available(event) do
             super
           end
         end
       end
 
       private
-      def sending_honeycomb_event
-        event = builder.event
+      def sending_honeycomb_event(sql, name, binds)
+        # Some adapters have some of their exec* methods call each other,
+        # e.g mysql2 has exec_query call execute (via execute_and_free).
+        # We don't want to send two events for the same query, so we screen out
+        # multiple invocations of this wrapper method in the same call tree.
+        if !defined?(@honeycomb_event_depth)
+          @honeycomb_event_depth = 0
+        end
+        if @honeycomb_event_depth < 1
+          @honeycomb_event_depth = 1
+          event = builder.event
+
+          event.add_field 'db.sql', sql
+          event.add_field 'name', name || query_name(sql)
+
+          binds.each do |bind|
+            # ActiveRecord 5
+            if bind.respond_to?(:value) && bind.respond_to?(:name)
+              event.add_field "db.params.#{bind.name}", bind.value
+            else # ActiveRecord 4
+              column, value = bind
+              event.add_field "db.params.#{column.name}", value
+            end
+          end
+
+          start = Time.now
+        else
+          @honeycomb_event_depth += 1
+        end
 
-        start = Time.now
         yield event
       rescue Exception => e
         if event
@@ -99,6 +146,7 @@ module ActiveRecord
         end
         raise
       ensure
+        @honeycomb_event_depth -= 1
         if start && event
           finish = Time.now
           duration = finish - start
@@ -111,8 +159,8 @@ module ActiveRecord
         sql.sub(/\s+.*/, '').upcase
       end
 
-      def adding_span_metadata_if_available(event, name)
-        return yield unless defined?(::Honeycomb.trace_id)
+      def adding_span_metadata_if_available(event)
+        return yield unless event && defined?(::Honeycomb.trace_id)
 
         trace_id = ::Honeycomb.trace_id
 

data/lib/active_record/honeycomb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      TO DO *is* a description
+description: "    TO DO *is* a description\n"
 email:
 - support@honeycomb.io
 executables: []
@@ -124,7 +151,7 @@ files:
 - lib/activerecord/honeycomb.rb
 homepage: https://github.com/honeycombio/activerecord-honeycomb
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -134,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="