Extract instrumentation for reuse

Allows us to use the same method for Net::LDAP and Net::LDAP::Connection.

Author: mtodd

lib/net/ldap.rb

@@ -23,6 +23,7 @@ class LDAP
 require 'net/ldap/dataset'
 require 'net/ldap/password'
 require 'net/ldap/entry'
+require 'net/ldap/instrumentation'
 require 'net/ldap/version'
 
 # == Quick-start for the Impatient
@@ -242,6 +243,7 @@ class LDAP
 # and then keeps it open while it executes a user-supplied block.
 # Net::LDAP#open closes the connection on completion of the block.
 class Net::LDAP
+  include Net::LDAP::Instrumentation
 
   class LdapError < StandardError; end
 
@@ -1145,6 +1147,8 @@ def paged_searches_supported?
 # This is a private class used internally by the library. It should not
 # be called by user code.
 class Net::LDAP::Connection #:nodoc:
+  include Net::LDAP::Instrumentation
+
   LdapVersion = 3
   MaxSaslChallenges = 10
 
@@ -1245,21 +1249,6 @@ def setup_encryption(args)
     end
   end
 
-  # Internal: Instrument a block with the defined instrumentation service.
-  #
-  # Returns the return value of the block.
-  def instrument(event, payload = {})
-    return yield(payload) unless instrumentation_service
-
-    instrumentation_service.instrument(event, payload) do |payload|
-      payload[:result] = yield(payload)
-    end
-  end
-  private :instrument
-
-  attr_reader :instrumentation_service
-  private     :instrumentation_service
-
   #--
   # This is provided as a convenience method to make sure a connection
   # object gets closed without waiting for a GC to happen. Clients shouldn't

lib/net/ldap/instrumentation.rb

@@ -0,0 +1,16 @@
+module Net::LDAP::Instrumentation
+  attr_reader :instrumentation_service
+  private     :instrumentation_service
+
+  # Internal: Instrument a block with the defined instrumentation service.
+  #
+  # Returns the return value of the block.
+  def instrument(event, payload = {})
+    return yield(payload) unless instrumentation_service
+
+    instrumentation_service.instrument(event, payload) do |payload|
+      payload[:result] = yield(payload)
+    end
+  end
+  private :instrument
+end