honeycomb-beeline 1.0.0.pre.beta3 → 1.0.0.pre.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b1b7ab0eda9a7af908e48d11f8b7d4e85daebc4a7aaf5495cc264c504d48b57
-  data.tar.gz: 1bb0266837751cfb7b1941f408a5a68908bce74d2ef3f2d6b12dbc05a23df5b6
+  metadata.gz: e026a4de28efbaa5b1d09cebf23c00041c8c8f8853328dee4dd4d58c3b69604e
+  data.tar.gz: b8555942f5a814c6f2d8669c2dba53ddef45b34e7061c0959cc510eb0fe897e0
 SHA512:
-  metadata.gz: 51d702c4bed8913233e7480777e76667871bbbd928415e5061688245c8c87d235aed6e537300a87464a23fa5f7d3a636003ab5cd005f34e2654aac8925f3ddb2
-  data.tar.gz: acf01866b9c5d8051270ff2c1900dcb19e4cf6dda83a6aa92f461d5911deb40a43c7b8f3ebb9748eace39df226b2e98f5da96e1ee0815edce85ec421262683ba
+  metadata.gz: 8c00e52947f68bc3234b40a787bd04b92272f95e25e5ec96ea1409fe4b5f327c14f18c02ea33aae7739359c6eb5c675772c4d9a044980d539ab90aa988553099
+  data.tar.gz: cf5f39769d95e77d58ba65337cc13eeebb5ad876707fb922b48d555f6e1227485257fadd78fcd0b0c3faebbd6bb2af8d314d13e851dc311333451457c0ecbe66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeycomb-beeline (1.0.0.pre.beta3)
+    honeycomb-beeline (1.0.0.pre.beta4)
       libhoney (~> 1.8)
 
 GEM

data/lib/honeycomb/beeline/version.rb

@@ -3,7 +3,7 @@
 module Honeycomb
   module Beeline
     NAME = "honeycomb-beeline".freeze
-    VERSION = "1.0.0-beta3".freeze
+    VERSION = "1.0.0-beta4".freeze
     USER_AGENT_SUFFIX = "#{NAME}/#{VERSION}".freeze
   end
 end

data/lib/honeycomb/integrations/rack.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require "rack"
+require "honeycomb/integrations/warden"
 
 module Honeycomb
-  # Automatically capture rack requests and create a trace
-  class Rack
+  # Rack specific methods for building middleware
+  module Rack
     RACK_FIELDS = [
       ["REQUEST_METHOD", "request.method"],
       ["PATH_INFO", "request.path"],
@@ -16,17 +17,6 @@ module Honeycomb
       ["rack.url_scheme", "request.protocol"],
     ].freeze
 
-    COMMON_USER_FIELDS = %i[
-      email
-      name
-      first_name
-      last_name
-      created_at
-      id
-    ].freeze
-
-    SCOPE_PATTERN = /^warden\.user\.([^.]+)\.key$/.freeze
-
     attr_reader :app, :client
 
     def initialize(app, client:)
@@ -68,27 +58,10 @@ module Honeycomb
       end
     end
 
-    def extract_user_information(env)
-      warden = env["warden"]
-
-      return unless warden
-
-      session = env["rack.session"] || {}
-      keys = session.keys.select do |key|
-        key.match(SCOPE_PATTERN)
-      end
-      warden_scopes = keys.map do |key|
-        key.gsub(SCOPE_PATTERN, "\1")
-      end
-      best_scope = warden_scopes.include?("user") ? "user" : warden_scopes.first
-
-      return unless best_scope
-
-      env["warden"].user(scope: best_scope, run_callbacks: false).tap do |user|
-        COMMON_USER_FIELDS.each do |field|
-          user.respond_to?(field) && yield("user.#{field}", user.send(field))
-        end
-      end
+    # Rack middleware
+    class Middleware
+      include Rack
+      include Warden
     end
   end
 end

data/lib/honeycomb/integrations/rails.rb

@@ -3,9 +3,10 @@
 require "rails/railtie"
 require "honeycomb/integrations/active_support"
 require "honeycomb/integrations/rack"
+require "honeycomb/integrations/warden"
 
 module Honeycomb
-  # Add Rails specific information to the Honeycomb::Rack middleware
+  # Rails specific methods for building middleware
   module Rails
     def add_package_information(env)
       yield "meta.package", "rails"
@@ -27,6 +28,13 @@ module Honeycomb
         end
       end
     end
+
+    # Rails middleware
+    class Middleware
+      include Rack
+      include Warden
+      include Rails
+    end
   end
 
   # Automatically capture rack requests and create a trace
@@ -37,12 +45,10 @@ module Honeycomb
         # what location should we insert the middleware at?
         app.config.middleware.insert_before(
           ::Rails::Rack::Logger,
-          Honeycomb::Rack,
+          Honeycomb::Rails::Middleware,
           client: Honeycomb.client,
         )
       end
     end
   end
 end
-
-Honeycomb::Rack.prepend Honeycomb::Rails

data/lib/honeycomb/integrations/sinatra.rb

@@ -2,9 +2,10 @@
 
 require "sinatra"
 require "honeycomb/integrations/rack"
+require "honeycomb/integrations/warden"
 
 module Honeycomb
-  # Add Sinatra specific information to the Honeycomb::Rack middleware
+  # Sinatra specific methods for building middleware
   module Sinatra
     def add_package_information(env)
       yield "meta.package", "sinatra"
@@ -12,7 +13,12 @@ module Honeycomb
 
       yield "request.route", env["sinatra.route"]
     end
+
+    # Sinatra middleware
+    class Middleware
+      include Rack
+      include Warden
+      include Sinatra
+    end
   end
 end
-
-Honeycomb::Rack.prepend Honeycomb::Sinatra

data/lib/honeycomb/integrations/warden.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Honeycomb
+  # Methods for extracing common warden/devise fields from a rack env hash
+  module Warden
+    COMMON_USER_FIELDS = %i[
+      email
+      name
+      first_name
+      last_name
+      created_at
+      id
+    ].freeze
+
+    SCOPE_PATTERN = /^warden\.user\.([^.]+)\.key$/.freeze
+
+    def extract_user_information(env)
+      warden = env["warden"]
+
+      return unless warden
+
+      session = env["rack.session"] || {}
+      keys = session.keys.select do |key|
+        key.match(SCOPE_PATTERN)
+      end
+      warden_scopes = keys.map do |key|
+        key.gsub(SCOPE_PATTERN, "\1")
+      end
+      best_scope = warden_scopes.include?("user") ? "user" : warden_scopes.first
+
+      return unless best_scope
+
+      env["warden"].user(scope: best_scope, run_callbacks: false).tap do |user|
+        COMMON_USER_FIELDS.each do |field|
+          user.respond_to?(field) && yield("user.#{field}", user.send(field))
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta3
+  version: 1.0.0.pre.beta4
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -231,6 +231,7 @@ files:
 - lib/honeycomb/integrations/rake.rb
 - lib/honeycomb/integrations/sequel.rb
 - lib/honeycomb/integrations/sinatra.rb
+- lib/honeycomb/integrations/warden.rb
 - lib/honeycomb/propagation.rb
 - lib/honeycomb/rollup_fields.rb
 - lib/honeycomb/span.rb