gitlab-labkit 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d14a6537b13d635133bda037b3c0d005c212414affacc546f6ba60cfc433c8
-  data.tar.gz: 40b259acc97328cf5a12156b8415308750d1ded3bda89b190aae6b66be66be50
+  metadata.gz: 9df561103bdda6bf8f2aeb6a198b78e881f759312763df6ace096f148475ca86
+  data.tar.gz: 2560672a5ae35355619da45f4d74caaa97682c3dca7b87090264b44d458c68b3
 SHA512:
-  metadata.gz: 41fa558041ba46e4b3280fe37273e8a819b19c62a9c5539cfcb6200dc94b5f25dc2ed5f0dde861c8653dd02d0d91a0a948220729cd022ea346de7cb94cc64acc
-  data.tar.gz: a9966f49707dd37b1aa730e14745eb8f2181c5505e643531114e92d6c154c93ed3b185b1b5ab991663ed069a9ab4228a9ca8e8c64019f4a79d048130ef049086
+  metadata.gz: 9bfcebe79a6ae1802b48266d693b35dcc0a26680714ef6575338d1cc67be423005f5364f105d0ac07825f92a038aef5151cc3bcba743ec7a0e4ac8e8348b26b7
+  data.tar.gz: 583f3c4cad2869e29c62ad98e773095e1e9f8ea3d1b99f2993057021ce12afb55e08f81679d475387ef54f75cd9089344eb020cae8f15469437a050aa628abb6

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.41.2
+_commit: v1.43.0
 _src_path: https://gitlab.com/gitlab-com/gl-infra/common-template-copier.git
 ee_licensed: false
 golang: false
@@ -15,3 +15,4 @@ release_platform: false
 ruby: true
 rubygem: true
 terraform: false
+truncated_tags: true

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.8"
+    GL_ASDF_RUBY_VERSION: "4.0.1"
     GL_ASDF_SHELLCHECK_VERSION: "0.11"
-    GL_ASDF_SHFMT_VERSION: "3.12"
+    GL_ASDF_SHFMT_VERSION: "3.13"

data/.gitlab-ci.yml

@@ -19,29 +19,28 @@ 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.8
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v3.11
 
   # 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.8
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v3.11
 
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v3.8
-
-.test_template: &test_definition
-  extends: .with_bundle
-  image: ruby:${RUBY_VERSION}
-  stage: validate
-  script:
-    - gem install bundler --no-document
-    - bundle config --local path vendor
-    - bundle install
-    - bundle exec rake verify build install
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v3.11
 
 ruby-versions:
-  <<: *test_definition
+  extends: rspec
+  image: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/ruby:${RUBY_VERSION}
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["3.4"]
+
+# These versions aren't built in common CI tasks, so use a public ruby image
+legacy-ruby-versions:
+  extends: rspec
+  image: ruby:${RUBY_VERSION}
   parallel:
     matrix:
-      - RUBY_VERSION: ["3.2", "3.3"]
+      - RUBY_VERSION: ["3.3"]
 
 deploy:
   rules:

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

data/.tool-versions

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

data/gitlab-labkit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = %w[labkit-logging]
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = "~> 3.2"
+  spec.required_ruby_version = ">= 3.3", "< 5"
 
   # Please maintain alphabetical order for dependencies
   spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.1.0"
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency "excon", "~> 0.78.1"
-  spec.add_development_dependency "faraday", "~> 1.10.3"
+  spec.add_development_dependency "faraday", "~> 2.13"
   spec.add_development_dependency "gitlab-dangerfiles", "~> 2.11.0"
   spec.add_development_dependency "gitlab-styles", "~> 13.1"
   spec.add_development_dependency "grpc-tools", ">= 1.75"

data/lib/labkit/tracing/open_telemetry_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "base64"
-require "cgi"
+require "cgi/escape"
 require "active_support"
 require "active_support/core_ext"
 

data/lib/labkit/tracing/tracing_utils.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "cgi"
+require "uri"
 require "active_support/core_ext/string/starts_ends_with"
 require "opentracing"
 
@@ -80,7 +80,7 @@ module Labkit
       def self.parse_query_string(query)
         return {} unless query
 
-        CGI.parse(query).symbolize_keys.transform_values(&:first)
+        URI.decode_www_form(query).each_with_object({}) { |(k, v), h| h[k.to_sym] ||= v }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Andrew Newdigate
@@ -267,14 +267,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.3
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.3
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: gitlab-dangerfiles
   requirement: !ruby/object:Gem::Requirement
@@ -665,16 +665,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '3.3'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Instrumentation for GitLab
 test_files: []