gitlab-labkit 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0038ac3c9b17772bb517d4e2fc9e61ca26d05647e3de991c4899dfc867f4d88
-  data.tar.gz: 041f4b6ee0f7257738b0bb7663adcbca06c9f520152cd7f7b8397b31ed280d7c
+  metadata.gz: 7ad3bb9ba369010544041c2ab2d2ec2d8610c535c5b2c5e592fe0e8313c56a66
+  data.tar.gz: 4fa90bdb331f44920cc9969603db7189e42dec21c7fab1d7593e91455de323c3
 SHA512:
-  metadata.gz: ee2a000a091c0eb8433911f6a0e17d7921c1477204ed9f5e5fb54a3b8d625c8361b7653134cb5231c7b78e4fdc6df74c1b3c9d92424b1a17533f35257b913115
-  data.tar.gz: dd0a54427b6a2181bfad09efda0536ca4c0b703e2ee8182214a0ce02079f7ee207423f4e7f7d4f40f564a98d2e2d6eaeac8b4e312cf288450c2c0d8e6d146c4f
+  metadata.gz: 21c914360a54bb30e914e7b6771781657463b3febd83b81634b88513f2986d7d9f25016bae84781b69918429a49c13fdfdf7da8581d385bc13adb698c8728f1d
+  data.tar.gz: e8b1b9f46c438e2608a1f12e55d2fd3f518586795dfb0327b08fed8bcd6496525fb0fba71c5212fdab45b45a3ca1b3b9c792dc212a838a98124be37d698fd823

data/lib/labkit/net_http_publisher.rb

@@ -48,15 +48,68 @@ module Labkit
           begin
             super
           ensure
-            payload[:duration] = (::Labkit::System.monotonic_time - start_time).to_f
+            # Fold in any connection-establishment time (DNS/TCP/TLS) measured by
+            # `#do_start`, so a slow connect is attributed to the request instead
+            # of vanishing. Counted once, on the first request of the connection.
+            payload[:duration] = (::Labkit::System.monotonic_time - start_time).to_f + take_connect_duration
           end
         payload[:code] = response.code
         response
       end
     end
 
+    # Net::HTTP establishes the connection (DNS resolution, TCP connect, TLS
+    # handshake) here, before any `#request` runs. With the explicit-start
+    # pattern (`Net::HTTP.start(host) { |http| http.request(...) }`) this happens
+    # entirely outside `#request`, so without instrumenting it a connection that
+    # hangs -- or fails with e.g. Net::OpenTimeout before any request is sent --
+    # would contribute nothing to external_http timing or counts.
+    def do_start
+      start_time = ::Labkit::System.monotonic_time
+
+      begin
+        super
+      rescue StandardError
+        # The connection failed before any request could be sent, so `#request`
+        # will never run to attribute this time. Emit a standalone event so the
+        # failure and the time spent are still visible.
+        ActiveSupport::Notifications.instrument(
+          ::Labkit::EXTERNAL_HTTP_NOTIFICATION_TOPIC, create_connect_payload
+        ) do |payload|
+          payload[:duration] = (::Labkit::System.monotonic_time - start_time).to_f
+          raise
+        end
+      end
+
+      @labkit_connect_duration = (::Labkit::System.monotonic_time - start_time).to_f
+    end
+    private :do_start
+
     private
 
+    def take_connect_duration
+      duration = @labkit_connect_duration || 0.0
+      @labkit_connect_duration = nil
+      duration
+    end
+
+    def create_connect_payload
+      {
+        method: nil,
+        host: address,
+        port: port,
+        scheme: use_ssl? ? "https" : "http",
+        path: nil,
+        query: nil,
+        fragment: nil
+      }.tap do |payload|
+        if proxy?
+          payload[:proxy_host] = proxy_address
+          payload[:proxy_port] = proxy_port
+        end
+      end
+    end
+
     def create_request_payload(request)
       payload = {
         method: request.method

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Andrew Newdigate