gitlab-labkit 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d63e4f781c8e316f19c419a52485bd751cef83e713f7da971e3285709760a669
-  data.tar.gz: a13c2d6a3b9f217f0d65c5a755ff213db29b21dad1e20d2cc5ea17a5bea3dda5
+  metadata.gz: e99cf18b21d9da22b488d0dd0031fc9030aeded745239b4e72e8d3f7c1c36555
+  data.tar.gz: 664ba45d3535d3310431eece7890c58ddfa9cd8a9dfa3c235b66fd20b2b5480e
 SHA512:
-  metadata.gz: 5e5983bc819202df660c1965efb7d26dd74f89c7479d01974a3d4f56e5a2c09a4d9fa01cac41719d80048d6737a676cc3fb3d9492cfb1619eb715932cf2ad6ff
-  data.tar.gz: 44d1210ee82ef16a99150316f73b76be43942fedaad296b78c925a3e270a8e6b39e4e3cbf43e63488048b11f7d69b40ad3dcfdcc514b8d6bbb4dfe805a28173a
+  metadata.gz: f7959c2eb8f54ee928a7841c2b8de8011c1e2a481c3c6aaf8e94b53a7ca186e8c28ad192a641c4c8ffac5bd8fd39a2c7c6afad324dfae77531b00e3089de3dc0
+  data.tar.gz: 05d07f6b1dffe39907c372ca0cb1c638cbc3898f39faf33f82ef5e042c9ea916a94d297963706e0010bc30dc14df2ebf2a1d89a342866630753af233f52934d1

data/lib/labkit/fields.rb

@@ -102,6 +102,22 @@ module Labkit
     # Name of the service or component emitting the log event.
     SERVICE_NAME = "service_name"
 
+    # GitLab organization numeric ID.
+    GL_ORGANIZATION_ID = "gl_organization_id"
+
+    # GitLab project path.
+    GL_PROJECT_PATH = "gl_project_path"
+
+    # The endpoint_id of the current endpoint to be passed as caller_id when
+    # calling another service.
+    ENDPOINT_ID = "endpoint_id"
+
+    # The ID of the caller of the current service.
+    CALLER_ID = "caller_id"
+
+    # The endpoint_id of the original caller at the root of the call chain.
+    ROOT_CALLER_ID = "root_caller_id"
+
     # Get the constant name for a field value
     # @param field_value [String] The field value (e.g., "gl_user_id")
     # @return [String, nil] The constant name (e.g., "GL_USER_ID") or nil if not found
@@ -135,6 +151,8 @@ module Labkit
         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::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
 
       class << self

data/lib/labkit/user_experience_sli/experience.rb

@@ -61,7 +61,8 @@ module Labkit
       #
       # @yield [self] When a block is provided, the experience will be completed automatically.
       # @param extra [Hash] Additional data to include in the log event
-      # @return [self]
+      # @return [self] When no block is given.
+      # @return [Object] The result of the block when a block is given.
       # @raise [UserExperienceError] If the block raises an error.
       #
       # Usage:
@@ -104,7 +105,9 @@ module Labkit
       # Resume the User Experience.
       #
       # @yield [self] When a block is provided, the experience will be completed automatically.
-      # @param extra [Hash] Additional data to include in the log
+      # @param extra [Hash] Additional data to include in the log event
+      # @return [self] When no block is given.
+      # @return [Object] The result of the block when a block is given.
       def resume(**extra, &)
         return self unless ensure_started!
 
@@ -190,16 +193,12 @@ module Labkit
       end
 
       def completable(**extra, &)
-        begin
-          yield self
-        rescue StandardError => e
-          error!(e)
-          raise
-        ensure
-          complete(**extra)
-        end
-
-        self
+        yield self
+      rescue StandardError => e
+        error!(e)
+        raise
+      ensure
+        complete(**extra)
       end
 
       def ensure_incomplete!

data/lib/labkit/user_experience_sli/null.rb

@@ -11,12 +11,14 @@ module Labkit
       def id = 'null'
 
       def start(**_extra)
-        yield self if block_given?
+        return yield(self) if block_given?
+
         self
       end
 
       def resume(**_extra)
-        yield self if block_given?
+        return yield(self) if block_given?
+
         self
       end
 

metadata

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