faraday-honeycomb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 540f228bab59da3cb1fd0fe6f9d78742f8de6201c327637aff03ef38bfeddab8
-  data.tar.gz: 7e973e706ef49733be242f4437f03c31203337ae66e2b96bba760f0a5d28c5bb
+  metadata.gz: d9c9cf8d005f26ecd2f3e391a7695211718480900810d57c1c1656cc1ed5f240
+  data.tar.gz: a645970ff844448583057f69f41e758e7643ef3125895bf2936e5d8fa7837522
 SHA512:
-  metadata.gz: 692dc42dca8604f1e9a8d92f8296682248890f3225245e3d053625c9b3ea5a5a31c7beee58217ca448d0b87d9b18e391066cf270a58726dd6e5aaf4402d71d68
-  data.tar.gz: d91e396292fc619b9025bbac3b7cdb387767d80b5b7725c3f963949188e2ad8e8640b9a23c9af5b60a6ea20a764a31eff896d22a03a6d423ee90a3530109956e
+  metadata.gz: 283d54bd078a653f7e6b309099f9d3597815eef830bf0a1fc92a423fd3e3a9ca7bca44aa49d9fd5f65797ffdfb324cca4ef88f37f645f4b09b30dd7cdc9152d9
+  data.tar.gz: 2acf6c044ba3c1296ecda0562175453edeaee51ed5aa1ce679296d6335e69ddcc33f617b1636e077d6c62dea3958f4742f148efcf60a46c2fa064967e1053281

data/lib/faraday-honeycomb/auto_install.rb

@@ -23,13 +23,13 @@ module Faraday
               block = if orig_block
                 proc do |b|
                   logger.debug "Adding Faraday::Honeycomb::Middleware in #{self}.new{}" if logger
-                  b.use :honeycomb, client: honeycomb_client
+                  b.use :honeycomb, client: honeycomb_client, logger: logger
                   orig_block.call(b)
                 end
               else
                 proc do |b|
                   logger.debug "Adding Faraday::Honeycomb::Middleware in #{self}.new" if logger
-                  b.use :honeycomb, client: honeycomb_client
+                  b.use :honeycomb, client: honeycomb_client, logger: logger
                   b.adapter Faraday.default_adapter
                 end
               end

data/lib/faraday/honeycomb/middleware.rb

@@ -9,8 +9,20 @@ module Faraday
     USER_AGENT_SUFFIX = "#{GEM_NAME}/#{VERSION}"
 
     class Middleware
-      def initialize(app, options = {})
-        honeycomb = options[:client] || Libhoney::Client.new(options.merge(user_agent_addition: USER_AGENT_SUFFIX))
+      def initialize(app, client: nil, logger: nil)
+        @logger = logger
+        @logger ||= ::Honeycomb.logger if defined?(::Honeycomb.logger)
+
+        honeycomb = if client
+          debug "initialized with #{client.class.name} via :client option"
+          client
+        elsif defined?(::Honeycomb.client)
+          debug "initialized with #{::Honeycomb.client.class.name} from honeycomb-beeline"
+          ::Honeycomb.client
+        else
+          debug "initializing new Libhoney::Client"
+          Libhoney::Client.new(options.merge(user_agent_addition: USER_AGENT_SUFFIX))
+        end
         @builder = honeycomb.builder.
           add(
             'type' => 'http_client',
@@ -49,6 +61,10 @@ module Faraday
       end
 
       private
+      def debug(msg)
+        @logger.debug("#{self.class.name}: #{msg}") if @logger
+      end
+
       def add_request_fields(event, env)
         loud_method = env.method.upcase.to_s
 

data/lib/faraday/honeycomb/version.rb

@@ -1,7 +1,7 @@
 module Faraday
   module Honeycomb
     GEM_NAME = 'faraday-honeycomb'
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
 
     MIN_FARADAY_VERSION = '0.8'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -97,7 +97,7 @@ dependencies:
 description: |2
       TO DO *is* a description
 email:
-- sam@honeycomb.io
+- support@honeycomb.io
 executables: []
 extensions: []
 extra_rdoc_files: []