activerecord-honeycomb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 730cba378624d817b73d3603ebee14a8fc3ba45229a1a737fc12abf64de48e39
-  data.tar.gz: fc04c3338cc58b78783ff713265e469d5e0a8814b4a36935ac0013fe396d3482
+  metadata.gz: 1686f5b56b0a372f7af11190a4206f6aa69e2e88efc761306db4de3bc96340ca
+  data.tar.gz: 14dcd90cb80a06bf4c4d8eb30ae8bb75af36bc5a92a2403cd05004bc9ea7b1d8
 SHA512:
-  metadata.gz: 3fcf4f1174030144183130cb130879f8be8fe87a7a51f343976d621c7a9e3a75d09861b3b89f5a4e6940759a59008d3329090fc59b4c3ba8d9ff8bd71bd990af
-  data.tar.gz: 2c4cfd32d8eb4f27e74829c085d7460f52dfb7aafaa916ab5a95975ee934f2aae47a22b495a21d81ffadc3aa08c229634241507b456b80ab73763963eadc6bcd
+  metadata.gz: 682f11006a356983eba992dd7fe89459f3765b4ec645732be97d20a252bf5ffd42ab7920dee3e9ecbbfebd1d9773106363608098313f7bf3d52e4c2afa2f5016
+  data.tar.gz: 31a130980f993521081dc276e3d622bc9e62fddba25db982d1a53e231086aaafa1053b4c99aeef8e2ac30c73a2a0d1d160898b07eba77e7a53f1a3716e1cf4f4

data/lib/active_record/connection_adapters/honeycomb_adapter.rb

@@ -4,20 +4,24 @@ require 'securerandom'
 module ActiveRecord
   module ConnectionHandling
     def honeycomb_connection(config)
+      log_prefix = "ActiveRecord::ConnectionHandling#honeycomb_connection"
+
       real_config = config.merge(adapter: config.fetch(:real_adapter))
 
-      client = config[:honeycomb_client]
+      logger = config[:honeycomb_logger]
+      logger ||= ::Honeycomb.logger if defined?(::Honeycomb.logger)
+      ConnectionAdapters::HoneycombAdapter.logger ||= logger
+
+      ConnectionAdapters::HoneycombAdapter.client ||= config[:honeycomb_client]
 
+      logger.debug "#{log_prefix} resolving real database config" if logger
       resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(Base.configurations)
       spec = resolver.spec(real_config)
 
       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.extend(Module.new do
-          private
-          define_method(:honeycomb_client) { client }
-        end) if client
         real_connection.class.include ConnectionAdapters::HoneycombAdapter
       end
 
@@ -27,30 +31,40 @@ module ActiveRecord
 
   module ConnectionAdapters
     module HoneycombAdapter
-      def self.included(klazz)
-        # TODO ugh clean this up
-        @_honeycomb ||= begin
-          if klazz.respond_to? :honeycomb_client, true # include private
-            klazz.send(:honeycomb_client)
+      class << self
+        attr_accessor :client
+        attr_reader :builder
+        attr_accessor :logger
+
+        def included(klazz)
+          debug "included into #{klazz.name}"
+
+          if @client
+            debug "configured with #{@client.class.name}"
           elsif defined?(::Honeycomb.client)
-            ::Honeycomb.client
+            debug "initialized with #{::Honeycomb.client.class.name} from honeycomb-beeline"
+            @client = ::Honeycomb.client
           else
-            raise "Can't work without magic global Honeycomb.client at the moment"
+            raise "Please ensure your database config sets :honeycomb_client in order to use #{self.name} (try ActiveRecord::Honeycomb.munge_config)"
           end
+
+          @builder = @client.builder.add(
+            'type' => 'db',
+            'meta.package' => 'activerecord',
+            'meta.package_version' => ActiveRecord::VERSION::STRING,
+          )
+
+          super
         end
-        klazz.class_exec(@_honeycomb) do |honeycomb_|
-          define_method(:builder) do
-            honeycomb_.builder.
-              add(
-                'type' => 'db',
-                'meta.package' => 'activerecord',
-                'meta.package_version' => ActiveRecord::VERSION::STRING,
-              )
-          end
+
+        private
+        def debug(msg)
+          @logger.debug("#{self.name}: #{msg}") if @logger
         end
-        super
       end
 
+      delegate :builder, to: self
+
       def execute(sql, *args)
         sending_honeycomb_event do |event|
           event.add_field 'db.sql', sql
@@ -74,7 +88,6 @@ module ActiveRecord
 
       private
       def sending_honeycomb_event
-        raise 'something went horribly wrong' unless builder # TODO
         event = builder.event
 
         start = Time.now

data/lib/active_record/honeycomb.rb

@@ -9,6 +9,7 @@ module ActiveRecord
       )
       munged['honeycomb_client'] = client if client
       munged['honeycomb_logger'] = logger if logger
+      logger.debug "#{self.name}: injected HoneycombAdapter config, original adapter was #{munged['real_adapter'].inspect}" if logger
       munged
     end
   end

data/lib/active_record/honeycomb/version.rb

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

data/lib/activerecord-honeycomb/auto_install.rb

@@ -2,9 +2,12 @@ module ActiveRecord
   module Honeycomb
     module AutoInstall
       class << self
-        def available?(**_)
+        def available?(logger: nil)
           gem 'activerecord'
-        rescue Gem::LoadError
+          logger.debug "#{self.name}: detected ActiveRecord, okay to autoinitialise" if logger
+          true
+        rescue Gem::LoadError => e
+          logger.debug "Didn't detect ActiveRecord (#{e.class}: #{e.message}), not autoinitialising activerecord-honeycomb" if logger
           false
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney