RUBY-2691 Update concurrently added code to use service_id delegation from connection

Author: p

lib/mongo/server/connection_base.rb

@@ -89,7 +89,9 @@ class ConnectionBase < ConnectionCommon
         :mongos?
 
       # @return [ nil | Object ] The service id, if any.
-      def_delegators :description, :service_id
+      def service_id
+        description&.service_id
+      end
 
       # Connection pool generation from which this connection was created.
       # May be nil.

lib/mongo/server/connection_common.rb

@@ -128,15 +128,15 @@ def add_server_diagnostics
         if respond_to?(:id)
           note << ", connection #{generation}:#{id}"
         end
-        if respond_to?(:description) && description&.service_id
-          note << ", service id #{description.service_id}"
+        if service_id
+          note << ", service id #{service_id}"
         end
         e.add_note(note)
         if respond_to?(:generation)
           # Non-monitoring connections
           e.generation = generation
           if respond_to?(:description)
-            e.service_id = description&.service_id
+            e.service_id = service_id
           end
         end
         raise e