honeycomb-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c95c50f630565d5361f03554f7b905a373e1a2eb6e3f365e0d94bfd4822089d
-  data.tar.gz: 573d2276a9733acacc498eb925e6d16e42ec9b6ca54e24d391fe2a234f9f87ce
+  metadata.gz: 20540b339eef388e9906ce50a0c3b7efbb8cb282189400bf7230d1005f166ea7
+  data.tar.gz: 855af5e90804fdab8f7f2aba2641352673ef5e6ce1abff2953f9926077b2b968
 SHA512:
-  metadata.gz: 63883618d112d94d725847a25b216e5420319a2d6b14487475696fce3a6f9d3d4885e64ada33a6eb3ec4d3553bdbaa91b898b3d078d5b10427ee8c90367f4f3f
-  data.tar.gz: e2919d3b901f50d46b9488559e06d116b337057495c134abeb0d7942e1ffac8fedcd9374388537ba19e3a6df1ca271cd259bbf362302a5c9737a60641e6d4708
+  metadata.gz: be8cb30c03e21a4ca871d85817526dc627b5c35b8192f047a5342a86656bf45fde7bcf1ac8270603a1d8daec7ac02e54f356a3d0e7449f0f3fbffb668e7ecefa
+  data.tar.gz: ce2c4b9085ac5e8471619b3747cc99eb07e7a759ebdd5f8a223bd9decc3ad368fc07789fbd46416cd31caf44f6279c624b1a6f972a384f8bb49c1563976d2582

data/lib/honeycomb-rails/config.rb

@@ -8,6 +8,7 @@ module HoneycombRails
       @db_dataset = 'active_record'
       @record_flash = true
       @record_user = :detect
+      @logger = Rails.logger
     end
 
     # Whether to record flash messages (default: true).
@@ -17,6 +18,10 @@ module HoneycombRails
       !!@record_flash
     end
 
+    # If set, routes HoneycombRails-specific log output to this logger
+    # (defaults to Rails.logger)
+    attr_accessor :logger
+
     # If set, determines how to record the current user during request processing (default: :detect). Set to nil or false to disable.
     #
     # Valid values:
@@ -30,10 +35,14 @@ module HoneycombRails
     # about the current user.
     attr_accessor :record_user
 
-    # The Honeycomb dataset to send request events to (default: 'rails').
+    # Send request events to the Honeycomb dataset with this name (default:
+    # 'rails'). Set to nil or an empty string to disable.
     attr_accessor :dataset
-    # The Honeycomb dataset to send ActiveRecord query events to (default: 'active_record').
+
+    # Send ActiveRecord query events to the Honeycomb dataset with this name
+    # (default: 'active_record'). Set to nil or empty string to disable.
     attr_accessor :db_dataset
+
     # The Honeycomb write key for your team (must be specified).
     attr_accessor :writekey
   end

data/lib/honeycomb-rails/overrides/action_controller_instrumentation.rb

@@ -44,7 +44,7 @@ module HoneycombRails
       end
 
       def honeycomb_user_metadata_devise
-        if current_user
+        if respond_to?(:current_user) and current_user
           {
             current_user_id: current_user.id,
             current_user_email: current_user.email,

data/lib/honeycomb-rails/railtie.rb

@@ -18,18 +18,29 @@ module HoneycombRails
     # the app's config/initializers has taken effect.
     config.after_initialize do
       writekey = HoneycombRails.config.writekey
-      dataset = HoneycombRails.config.dataset
-      @libhoney = Libhoney::Client.new(writekey: writekey, dataset: dataset)
+      @libhoney = Libhoney::Client.new(writekey: writekey)
     end
 
     config.after_initialize do
-      db_builder = @libhoney.builder
-      db_builder.dataset = HoneycombRails.config.db_dataset
+      subscribers = []
 
-      [
-        Subscribers::ProcessAction.new(@libhoney),
-        Subscribers::ActiveRecord.new(db_builder),
-      ].each(&:subscribe!)
+      if !HoneycombRails.config.dataset.blank?
+        req_builder = @libhoney.builder
+        req_builder.dataset = HoneycombRails.config.dataset
+        subscribers.push(Subscribers::ProcessAction.new(req_builder))
+      end
+
+      if !HoneycombRails.config.db_dataset.blank?
+        db_builder = @libhoney.builder
+        db_builder.dataset = HoneycombRails.config.db_dataset
+        subscribers.push(Subscribers::ActiveRecord.new(db_builder))
+      end
+
+      if subscribers.empty?
+        HoneycombRails.config.logger.warn("No subscribers defined (are both HoneycombRails.config.dataset and HoneycombRails.config.db_dataset both blank?")
+      end
+
+      subscribers.each(&:subscribe!)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Stokes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-12-05 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.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Easily instrument your Rails apps with Honeycomb