vmpooler 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4642648148ddd5b7d470163c4509ccad6f3a377f0f20dc1a43a940aaacf6a157
-  data.tar.gz: 7fe2d19cbfb839a750872d09adf01048d23dba9aa345b6e1150e3787f5c47f51
+  metadata.gz: cfe402b5631b6e688652f35e2c037262a2ffac519b20056cb77568f42a91276f
+  data.tar.gz: 05543eaca4e5fc1503b8cef7cb0d97acdc3967a4548442a7d062b7f462322062
 SHA512:
-  metadata.gz: bf2dc2f68527913308264c10f7c986523e9bc4922cc1b1283a9125596d74e474f30ae973ecec7c29c6c7f524ab016cc98e59caffa690185af588e00505de7a0e
-  data.tar.gz: 357a8436751c0e47d29bd00cea9f9e380548f6a19ed541e6c0487d5da9afc7840aadae79911d17439571339cf1b8a6e8c414fb2653ac6a72f1c254c8903bcb3d
+  metadata.gz: ca532eca7480d11d6e754e13aa7c417fe7fd8da3e72e850a07408ac9f2ff6160dd9c243656b68923de1eca1c7d48a34b31415646176963e356102dca422d85a1
+  data.tar.gz: 75e33d5896da53c96aa2190da5920d733610084bd229525b5938c3ce32527ab65c44229bc5cd13b560a19def10f6e297eb7f258ae5d02496adedd5bbe7ec96b3

data/lib/vmpooler/api/helpers.rb

@@ -181,8 +181,7 @@ module Vmpooler
         /^\d{4}-\d{2}-\d{2}$/ === date_str
       end
 
-      # NOTE: domain is not needed here, so we should update the callers of this method
-      def hostname_shorten(hostname, domain=nil)
+      def hostname_shorten(hostname)
         hostname[/[^.]+/]
       end
 
@@ -540,17 +539,15 @@ module Vmpooler
           },
           kind: :client
         ) do
-          Timeout.timeout(timeout) do
-            target_host = host
-            target_host = "#{host}.#{domain}" if domain
-            span = OpenTelemetry::Trace.current_span
-            span.set_attribute('net.peer.name', target_host)
-            sock = TCPSocket.new target_host, port
-            begin
-              yield sock if block_given?
-            ensure
-              sock.close
-            end
+          target_host = host
+          target_host = "#{host}.#{domain}" if domain
+          span = OpenTelemetry::Trace.current_span
+          span.set_attribute('net.peer.name', target_host)
+          sock = TCPSocket.new(target_host, port, connect_timeout: timeout)
+          begin
+            yield sock if block_given?
+          ensure
+            sock.close
           end
         end
       end