rack-honeycomb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb430ad6e4cfc6990e23f4c8e532ac84564b2e280ca402d9396c44cce0e3959c
-  data.tar.gz: ac15988e41bc4a15fd2f9d185825f4db38da5f800a7d90a2f3beb16272e2949f
+  metadata.gz: ef7c4729ce175288104850f4fe2202cf8cb51efa5b65b6e2cb4083df152c9368
+  data.tar.gz: 53be46494b255ff4bc3fed40ef1d6e7a2bd529238dcca359098d06671c16a759
 SHA512:
-  metadata.gz: a990c747ca3624d37c6e3392b1398d7e53bb2340f222bf1f3394207e7c961fd1be41ab71555e5675c81e3246cc2597685e727ad3cb512dc7e394ce614818b309
-  data.tar.gz: 303c79ad7ea9a38716ac4e8610cd9c69c87b95554ab4fe1972473e2137701a81a65958a7db8f5fb43f526d0c180e5c659f136cae9215bf364ab2bedf58be8c2d
+  metadata.gz: f710981f56110b49ebec88e178255c63d330bdedb2a97a7133eacc5cebd6912259b9318828f277017d51254dee23362acbbde803b70b1645524ede3d3bad7c79
+  data.tar.gz: 7041b6dbec9a01c3a0e18c0885fd7d4c1b85238768af9c6c088d1be436d986b00af0b9716ed00a008450c47a35fbeff091e9c0cf712bcf9df25aa7dcfc55d09f

data/lib/rack-honeycomb/auto_install.rb

@@ -5,7 +5,9 @@ module Rack
       class << self
         def available?(logger: nil)
           gem 'rack'
+          logger.debug "#{self.name}: detected rack" if logger
           gem 'sinatra'
+          logger.debug "#{self.name}: detected sinatra, okay to autoinitialise" if logger
           true
         rescue Gem::LoadError => e
           if e.name == 'sinatra'
@@ -26,7 +28,9 @@ module Rack
 
           ::Sinatra::Base.define_singleton_method(:build) do |*args, &block|
             if !AutoInstall.already_added
-              self.use Rack::Honeycomb::Middleware, client: honeycomb_client
+              logger.debug "Adding Rack::Honeycomb::Middleware to #{self}" if logger
+
+              self.use Rack::Honeycomb::Middleware, client: honeycomb_client, logger: logger
               AutoInstall.already_added = true
             else
               # In the case of nested Sinatra apps - apps composed of other apps
@@ -35,9 +39,8 @@ module Rack
               # each child app. In that case, it's hard to hook in our
               # middleware reliably - so instead, we just want to warn the user
               # and avoid doing anything silly.
-
               unless AutoInstall.already_warned
-                warn "Honeycomb auto-instrumentation of Sinatra will probably not work, try manual installation"
+                logger.warn "Honeycomb auto-instrumentation of Sinatra will probably not work, try manual installation" if logger
                 AutoInstall.already_warned = true
               end
             end

data/lib/rack/honeycomb/middleware.rb

@@ -29,11 +29,17 @@ module Rack
       def initialize(app, options = {})
         @app, @options = app, options
 
+        @logger = options.delete(:logger)
+        @logger ||= ::Honeycomb.logger if defined?(::Honeycomb.logger)
+
         honeycomb = if client = options.delete(: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.
@@ -41,7 +47,7 @@ module Rack
             'meta.package' => 'rack',
             'meta.package_version' => RACK_VERSION,
             'type' => EVENT_TYPE,
-            'local_hostname' => Socket.gethostname,
+            'meta.local_hostname' => Socket.gethostname,
           )
 
         @service_name = options.delete(:service_name) || :rack
@@ -78,6 +84,10 @@ module Rack
       end
 
       private
+      def debug(msg)
+        @logger.debug("#{self.class.name}: #{msg}") if @logger
+      end
+
       def add_request_fields(event, env)
         event.add_field('name', "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}")
 

data/lib/rack/honeycomb/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Honeycomb
-    VERSION="0.2.1"
+    VERSION="0.2.2"
   end
 end

data/rack-honeycomb.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'pry-byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - The Honeycomb.io Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack middleware for logging request data to Honeycomb.
 email: support@honeycomb.io
 executables: []