gitlab-labkit 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4c330d977763fb6063a9caab83352d59f32c46ac10a097f33f468cb06b2ddc
-  data.tar.gz: 558fae5ff6684b13cce03ee9b5f306c949a19c1a44b89c3fcae0567caa8175cc
+  metadata.gz: a3f875b5fa4af36bdb6646a69d5acab871bd2fe84ee6876a57958e9264441378
+  data.tar.gz: f86e176c5bed6fcbeae0ac82570b7b98349a56dac3b032cb0072573206ea273e
 SHA512:
-  metadata.gz: f1cd4013a210766f17a988f7922e900b9b00f74089fdde68e143cc718da629bd5d7442248ee47d15d0d7aa513e85eae6d9d642a5ddbfa5eddbe74046f7674cbb
-  data.tar.gz: 22dae3a5fb187c7118f4dd86df667982c1e72ef023d5a52aad1c6c10813845f3128d714973957c3ddca2b436b1419115904ca5bd76510315f57a7a8d3cd48078
+  metadata.gz: d47772da83bcf81c149e957c4e692042ce1388dc774abbfcf9e9d3a765fa9fda88da1b8742314df3b1010e800935327cf4338c0f7ef05f6d2141d8aad3cb317d
+  data.tar.gz: fc070e4ef55f7fac9bedf2af11a88aa5c27aff9c8cae3d634b78a3381e2694a67871a7c16c7865950ad3f7d7371c10cc14e1bbeb38c9bca8f36d00c68717a70c

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.36.0
+_commit: v1.38.0
 _src_path: https://gitlab.com/gitlab-com/gl-infra/common-template-copier.git
 ee_licensed: false
 golang: false

data/.gitlab-ci-asdf-versions.yml

@@ -1,5 +1,5 @@
 # DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables.sh to update this
 variables:
-    GL_ASDF_RUBY_VERSION: "3.4.7"
+    GL_ASDF_RUBY_VERSION: "3.4.8"
     GL_ASDF_SHELLCHECK_VERSION: "0.11"
     GL_ASDF_SHFMT_VERSION: "3.12"

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@v2.78
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v3.4
 
   # 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@v2.78
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v3.4
 
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v2.78
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v3.4
 
 .test_template: &test_definition
   extends: .with_bundle

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.0  # renovate:managed
+    rev: v3.4  # renovate:managed
 
     hooks:
       - id: shellcheck  # Run shellcheck for changed Shell files

data/.tool-versions

@@ -1,3 +1,3 @@
-ruby 3.4.7
+ruby 3.4.8
 shfmt 3.12
 shellcheck 0.11

data/gitlab-labkit.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "grpc", ">= 1.75" # Be sure to update the "grpc-tools" dev_dependency too
   spec.add_runtime_dependency "google-protobuf", ">= 3.25", "< 5.0"
   spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
-  spec.add_runtime_dependency 'json_schemer', '~> 2.4.0'
+  spec.add_runtime_dependency 'json_schemer', '>= 2.3.0', '< 3.0'
   spec.add_runtime_dependency "openssl", "~> 3.3.2"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
   spec.add_runtime_dependency "pg_query", ">= 6.1.0", "< 7.0"

data/lib/labkit/logging/json_logger.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "time"
+require "date"
 require "logger"
 require "json"
 
@@ -52,7 +53,7 @@ module Labkit
           data[:message] = message
         when Hash
           reject_reserved_log_keys!(message)
-          format_time!(data)
+          format_time!(message)
           data.merge!(message)
         end
 
@@ -81,11 +82,23 @@ module Labkit
 
       def format_time!(hash)
         hash.each do |key, value|
-          if value.is_a?(Time)
-            hash[key] = value.utc.iso8601(3)
-          elsif value.is_a?(Hash)
-            format_time!(value)
-          end
+          hash[key] = convert_time_value(value)
+        end
+      end
+
+      def convert_time_value(value)
+        case value
+        when Time
+          value.utc.iso8601(3)
+        when DateTime
+          value.to_time.utc.iso8601(3)
+        when Hash
+          format_time!(value)
+          value
+        when Array
+          value.map { |v| convert_time_value(v) }
+        else
+          value
         end
       end
     end

data/scripts/prepare-dev-env.sh

@@ -53,8 +53,11 @@ fi
 
 # install mise/asdf dependencies
 echo "installing required plugins with mise install.."
-mise plugins update
+mise plugins update -q
 mise install
+
+# set PROMPT_COMMAND to empty value for mise if unset
+: "${PROMPT_COMMAND:=}"
 eval "$(mise activate bash)"
 
 # pre-commit is optional

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrew Newdigate
@@ -101,16 +101,22 @@ dependencies:
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -555,7 +561,6 @@ files:
 - lib/labkit/user_experience_sli/null.rb
 - lib/labkit/user_experience_sli/registry.rb
 - renovate.json
-- scripts/install-asdf-plugins.sh
 - scripts/prepare-dev-env.sh
 - scripts/update-asdf-version-variables.sh
 homepage: https://gitlab.com/gitlab-org/labkit-ruby

data/scripts/install-asdf-plugins.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Vendored from https://gitlab.com/gitlab-com/gl-infra/common-template-copier
-# Consider contributing upstream when updating this file
-
-# This file is deprecated: going forward running `mise install` should be sufficient.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-echo >&2 -e "2024-08-07: this file is deprecated: going forward, simply run 'mise install' to install plugins."
-echo >&2 -e "Recommended reading: https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/docs/developer-setup.md"
-
-mise install