honeycomb-rails 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce38870b1d7d5dc68b425b3e4bf323ea3e26b4d59b2bad85270b17f4f444b2e
-  data.tar.gz: 8f30aa96990892d0cb6515b119bff5aac96045e1b9fc1bb1137febd72b7ac91a
+  metadata.gz: f13e00c09b5b340fcb8f28d6b6f18499bb6ca7111e6156d5b5c8c12a2aeaecbf
+  data.tar.gz: c96bded26cbc16d04faeb0587bfc7f7009b018417faed39a94cb14dddffb52d9
 SHA512:
-  metadata.gz: ca245585297cb2f654828cf2729b064a174c13187023dfdd9b113c793ad39dd0084edb065a6476e75fd35bd5d8c36e08527065d3b48a8887b8fdf8a4fa89d1a6
-  data.tar.gz: ee159ce39880ac7438fb904d5d8600d824df005fce2d42002bc63d934f8e861f9bc84047a6c5046f3122ebb594bada4128e73c8912377f89038d76f97bb6f50d
+  metadata.gz: e86add2fcc2a429723abe7cd3cec1ce31d2014537b18aacf017756728100b0dfee76a84f9580fb3a20f4671578709b817e47dbafd934a11a03374e5c430d1e18
+  data.tar.gz: 36696d9e6f59b6098da73e94784f5a5fe8315ad34fde2ce326f6d68e02f8ff7096dc0d8b6f76f6c52c87b681c30e28867911fe72cc0d93c367cf7620082bd260

data/lib/honeycomb-rails/config.rb

@@ -57,9 +57,10 @@ module HoneycombRails
     # * 1 or lower - disable sampling on this dataset; capture all events
     # * TODO: :rails - default Rails dynamic sampling?
     #
-    # You can also pass a Proc, which will be called with the current controller
-    # instance during each request, and which should return a sample rate for
-    # the request in question.
+    # You can also pass a Proc, which will be called with the
+    # ActiveSupport::Notifications payload that was used to populate the
+    # Honeycomb event, and which should return a sample rate for the request
+    # in question.
     attr_accessor :sample_rate
 
     # If set to true, captures exception class name / message along with Rails

data/lib/honeycomb-rails/extensions/action_controller.rb

@@ -2,18 +2,6 @@ module HoneycombRails
   module Extensions
     module ActionController
       module InstanceMethods
-        def self.included(controller_class)
-          super
-
-          controller_class.before_action do
-            honeycomb_initialize
-          end
-        end
-
-        def honeycomb_initialize
-          @honeycomb_metadata = {}
-        end
-
         # Hash of metadata to be added to the event we will send to Honeycomb
         # for the current request.
         #
@@ -23,7 +11,9 @@ module HoneycombRails
         #     honeycomb_metadata[:num_posts] = @posts.size
         #
         # @return [Hash<String=>Any>]
-        attr_reader :honeycomb_metadata
+        def honeycomb_metadata
+          @honeycomb_metadata ||= {}
+        end
       end
     end
   end

data/lib/honeycomb-rails/railtie.rb

@@ -18,6 +18,10 @@ module HoneycombRails
     # the app's config/initializers has taken effect.
     config.after_initialize do
       writekey = HoneycombRails.config.writekey
+      if writekey.blank?
+        HoneycombRails.config.logger.warn("No write key defined! (Check your config's `writekey` value in config/initializers/honeycomb.rb) No events will be sent to Honeycomb.")
+      end
+
       @libhoney = Libhoney::Client.new(writekey: writekey)
 
       if HoneycombRails.config.capture_exceptions
@@ -41,7 +45,7 @@ module HoneycombRails
       end
 
       if subscribers.empty?
-        HoneycombRails.config.logger.warn("No subscribers defined (are both HoneycombRails.config.dataset and HoneycombRails.config.db_dataset both blank?")
+        HoneycombRails.config.logger.warn("No subscribers defined (are both HoneycombRails.config.dataset and HoneycombRails.config.db_dataset both blank?)")
       end
 
       subscribers.each(&:subscribe!)

data/lib/honeycomb-rails/subscribers/active_record.rb

@@ -20,7 +20,12 @@ module HoneycombRails
         data = event.payload.slice(:name, :connection_id)
         data[:sql] = event.payload[:sql].strip
         event.payload[:binds].each do |b|
-          data["bind_#{ b.name }".to_sym] = b.value
+          case b
+          when Array
+            data["bind_#{ b[0].name }".to_sym] = b[1]
+          else
+            data["bind_#{ b.name }".to_sym] = b.value
+          end
         end
         data[:duration] = event.duration
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sam Stokes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Easily instrument your Rails apps with Honeycomb