gitlab-labkit 2.7.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f5227804a89cc5611c65a3c69e221b192e47cb40437c1c6f5ec722cd61e58b
-  data.tar.gz: 8c361ca03e53892c607cedf959adf94af0f45da7cf353915a67f284b5b4db3ab
+  metadata.gz: 7ad3bb9ba369010544041c2ab2d2ec2d8610c535c5b2c5e592fe0e8313c56a66
+  data.tar.gz: 4fa90bdb331f44920cc9969603db7189e42dec21c7fab1d7593e91455de323c3
 SHA512:
-  metadata.gz: cfc8ff84e29c5a292f409e91b4e44b74a6a7e18f243e22b4840070f7113be537fea7f2096e6033a980e2aa163db43718c7d6f5a5fbeb2797324018f697e77cb3
-  data.tar.gz: 4ca119aa945825d075dee174a6b9b2ec1d16f5786bb8eae1d778000ae66eb5243a3222259025f9d66fdf32086bb2c51eab4ba05fc8b53d5de071e3f7d9d13119
+  metadata.gz: 21c914360a54bb30e914e7b6771781657463b3febd83b81634b88513f2986d7d9f25016bae84781b69918429a49c13fdfdf7da8581d385bc13adb698c8728f1d
+  data.tar.gz: e8b1b9f46c438e2608a1f12e55d2fd3f518586795dfb0327b08fed8bcd6496525fb0fba71c5212fdab45b45a3ca1b3b9c792dc212a838a98124be37d698fd823

data/.mise.toml

@@ -1,5 +1,11 @@
 [settings]
 legacy_version_file = false
+# Install precompiled Ruby instead of building from source. The from-source
+# build compiles a vendored OpenSSL (ruby-build's `needs_openssl` check fails
+# because CI images ship the OpenSSL runtime but no dev headers/pkg-config),
+# and that compile is slow and fails in CI. Precompiled Ruby bundles its own
+# OpenSSL and sidesteps it. This becomes mise's default in 2026.8.0.
+ruby.compile = false
 
 [tools]
 # Please continue to use `.tool-versions` to specify tool versions, rather than adding them directly here.

data/lib/labkit/fields.rb

@@ -206,7 +206,7 @@ module Labkit
         Fields::SEVERITY => %w[level],
         Fields::LOG_MESSAGE => %w[msg custom_message extra.message fields.message graphql.message reason color_message exception.gitaly],
         Fields::CLASS_NAME => %w[class author_class exception.class extra.class extra.class_name],
-        Fields::SERVICE_NAME => %w[service grpc.service_name auth_service type component subcomponent],
+        Fields::SERVICE_NAME => %w[service grpc.service_name auth_service component subcomponent],
         Fields::GL_ORGANIZATION_ID => %w[organization_id],
         Fields::GL_PROJECT_PATH => %w[project_path full_path root_pipeline_project_path requested_project_path auth_project_path extra.gl_project_path],
       }.freeze

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.7.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Andrew Newdigate