gitlab-labkit 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84b7e5d8dd7ac808b13eddd6bd9b9c01e70a0542192a65ba2ef197648998d060
-  data.tar.gz: b597d7bdbf957cd7affb670255bff5fbb56a0efe3d2f2426a85e21651c07dd14
+  metadata.gz: 9feee9c8b400e6d23dae0a6b743f9e3a6f3074e005d8961686c8440d814a4b2f
+  data.tar.gz: 971fc652faca19f0a57e151db5d776c75f64be9b04d7ffccd4a4d4dd7b6a3d2a
 SHA512:
-  metadata.gz: d6f68fe206dceade497c046cb39d98157a16461e322e852e60618e4d3c4ae4c67b01155a1d73180a74898e4acffef6cfc9b076d61f3bd190c62c7cb766b79831
-  data.tar.gz: 3e087a7d38e003655216d3c2761b2dfcecd92c40fa18eaf3d49431105d4c9306e526e5bd8ab6c8625d54f9277eff5d177d43c541a5bcc8062010c369e3cb35c9
+  metadata.gz: 432a9a9842ca1e17cd1b25fa25303cb219c20a0f4cdd4201ac79a998fc8a72848f4a5dda0a9d3e31e3a0e312d88f97b9760915324892d7c5d2d607f18021e40e
+  data.tar.gz: 995aa133640851db2a9d649bd877705853cdfdce69959dd578f437d1d6e589193966202ffa83707f887ee28745d26bbcc2f96c4f87c3a68e951d3e3aeeb83cab

data/.copier-answers.yml

@@ -3,7 +3,7 @@
 # See the project for instructions on how to update the project
 #
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v1.50.0
+_commit: v1.51.0
 _src_path: https://gitlab.com/gitlab-com/gl-infra/common-template-copier.git
 ee_licensed: false
 gitlab_namespace: gitlab-org/ruby/gems

data/.gitlab-ci.yml

@@ -19,13 +19,13 @@ include:
   # It includes standard checks, gitlab-scanners, validations and release processes
   # common to all projects using this template library.
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/standard.md
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v3.24
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v4.8
 
   # Runs rspec tests and rubocop on the project
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/ruby.md
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v3.24
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v4.8
 
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v3.24
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v4.8
 
 # Attach a redis service to the rspec job from common-ci-tasks/ruby-build.
 # GitLab merges keys when a local job has the same name as an included one,

data/.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
   # Documentation available at
   # https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/docs/pre-commit.md
   - repo: https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks
-    rev: v3.24  # renovate:managed
+    rev: v4.8  # renovate:managed
 
     hooks:
       - id: shellcheck  # Run shellcheck for changed Shell files

data/lib/labkit/fields.rb

@@ -21,6 +21,10 @@ module Labkit
     # filtering in Kibana and Grafana.
     DUO_WORKFLOW_DEFINITION = "duo_workflow_definition"
 
+    # Unique identifier for a Duo Workflow instance. Identifies a specific
+    # workflow run, enabling per-workflow tracing in logs.
+    DUO_WORKFLOW_ID = "duo_workflow_id"
+
     # Error type or classification (e.g. "NoMethodError", "ValidationError").
     ERROR_TYPE = "error_type"
 
@@ -125,6 +129,7 @@ module Labkit
       GL_USER_ID => 1,
       GL_USER_NAME => 1,
       DUO_WORKFLOW_DEFINITION => 0,
+      DUO_WORKFLOW_ID => 0,
       ERROR_TYPE => 0,
       ERROR_MESSAGE => 1,
       HTTP_STATUS_CODE => 1,

data/lib/labkit/logging/field_validator.rb

@@ -101,7 +101,9 @@ module Labkit
             warn baseline_generation_message(new_offenses)
           else
             warn report_new_offenses(new_offenses)
-            raise "New LabKit logging offenses detected"
+            # Raise with exit code 2 to bypass the RSpec retry mechanism
+            # See https://gitlab.com/gitlab-org/quality/tooling/labkit-spec/-/work_items/2
+            raise SystemExit.new(2) # rubocop:disable Style/RaiseArgs
           end
         end
 

metadata

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