honeycomb-rails 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e8abdde1e706e01d1b26feba7dac25fca60d7c10aa6cadf8eb80b92d64d027
-  data.tar.gz: 87def2f4c965e144ab0225800bdcabbf44dd352f85f5dfc4b2708b34c5efc6e5
+  metadata.gz: 5d63f54aff8e75b9dc23176de419708a641c7ffa9feb6acc2ceea77ff9750093
+  data.tar.gz: 028d64690d7bbdc8bc071b75ae999683c3b28c9fd41406cd30ddaa1a082dbb19
 SHA512:
-  metadata.gz: 36e2f4d0938fd7588cd3d09fe79940479a044ff447476cd6c666c7cd00ce0829b5af1a30e69ab2152a0a590b8f7c003598afc4466c18451ae5e5be592eb5f1ea
-  data.tar.gz: a627f08ef0c6c7869962bf409f8c38d0293be235c9e3abd41abd3ee468f23c91ceac5a1d591afe3418d5c1b88eaa00a91ee9b4c1873ac940c4da06bbeee2421b
+  metadata.gz: 553739e9285b2fd043288f91336d90d782015b465a7f1e2aa8f572ccc3ea425c766508e995c4f591dc9a74c81f327c8c9731c3a2df9bd429a8bb571333e6ec2b
+  data.tar.gz: 58663a163b9b813cee39dd0bcc64990a238827e87cc331d74216a702eb38e7a03653bdfb92e4e0fef8560c0fb6db096c2da05c90a568467fe3d7d3c442737de7

data/lib/honeycomb-rails.rb

@@ -3,6 +3,7 @@ if !defined?(Rails)
 end
 
 require 'honeycomb-rails/config'
+require 'honeycomb-rails/version'
 
 module HoneycombRails
   class << self

data/lib/honeycomb-rails/config.rb

@@ -30,6 +30,7 @@ module HoneycombRails
     # Valid values:
     #
     # * :devise - if your app uses Devise for authentication
+    # * :devise_api - if your app uses Devise for authentication in an 'api' namespace
     # * :detect - autodetect how to determine the current user
     # * nil, false - disable recording current user
     #

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

@@ -33,6 +33,8 @@ module HoneycombRails
           honeycomb_user_metadata
         when :devise
           honeycomb_user_metadata_devise
+        when :devise_api
+          honeycomb_user_metadata_devise_api
         when Proc
           @honeycomb_user_proc = HoneycombRails.config.record_user
           honeycomb_user_metadata
@@ -55,10 +57,24 @@ module HoneycombRails
         end
       end
 
+      def honeycomb_user_metadata_devise_api
+        if respond_to?(:current_api_user) and current_api_user
+          {
+            current_user_id: current_api_user.id,
+            current_user_email: current_api_user.email,
+            current_user_admin: !!current_api_user.try(:admin?),
+          }
+        else
+          {}
+        end
+      end
+
       def honeycomb_detect_user_methods!
         if respond_to?(:current_user)
           # This could be more sophisticated, but it'll do for now
           HoneycombRails.config.record_user = :devise
+        elsif respond_to?(:current_api_user)
+          HoneycombRails.config.record_user = :devise_api
         else
           logger.error "HoneycombRails.config.record_user = :detect but couldn't detect user methods; disabling user recording."
           HoneycombRails.config.record_user = false

data/lib/honeycomb-rails/railtie.rb

@@ -22,7 +22,10 @@ module HoneycombRails
         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)
+      @libhoney = Libhoney::Client.new(
+        writekey: writekey,
+        user_agent_addition: HoneycombRails::USER_AGENT_SUFFIX,
+      )
 
       if HoneycombRails.config.capture_exceptions
         ::ActionController::Base.include(Overrides::ActionControllerFilters)

data/lib/honeycomb-rails/version.rb

@@ -0,0 +1,7 @@
+module HoneycombRails
+  GEM_NAME = 'honeycomb-rails'
+
+  VERSION = '0.5.1'
+
+  USER_AGENT_SUFFIX = "#{GEM_NAME}/#{VERSION}".freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Sam Stokes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: libhoney
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 description: |2
       Get fine-grained visibility into the behavior and performance of your
       Rails web app. This gem instruments your app to send events to Honeycomb
@@ -132,6 +118,7 @@ files:
 - lib/honeycomb-rails/subscribers.rb
 - lib/honeycomb-rails/subscribers/active_record.rb
 - lib/honeycomb-rails/subscribers/process_action.rb
+- lib/honeycomb-rails/version.rb
 homepage: https://github.com/honeycombio/honeycomb-rails
 licenses:
 - MIT
@@ -152,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easily instrument your Rails apps with Honeycomb