gitlab-labkit 0.34.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 055b54fa0c70710ac7796bed71051182a1921fced13cc810b612b91d879d2e01
-  data.tar.gz: c7fefe90826c89b0b5b02574de915dcf5d8302206040995038a2af6e3ef13e9f
+  metadata.gz: 48e2df6dd68eddc3928dad7c12f616bc124c16c55fd3d94947a21f23dc9cd732
+  data.tar.gz: 4b7dd6dffbb2936d6464b5777ac01db0c2142cdfa79b0527419a3750fcbe6b60
 SHA512:
-  metadata.gz: 458031e8e142a268907cea3310e147e11252f120d2f0e4263b39356fb3d4712d0fdbba208d4734f5b0fefd85e59873555d75edffc64777026bb75c42d6c4234e
-  data.tar.gz: d3bb5f85bb85eb0cf0321103d3262c6d35db736a2b704551ed1ba9cbcaa0ac4e780afcdd6217d45efc3696fa4bb1ec62fca1c74a315500c5258b7253b9b1d942
+  metadata.gz: f7eea840bb4724fedc0f0789d87f234a4f997dce9cdefece2ea839c09c4c0a6a2494f80048d8fbb9dcd0545e1ec4fca0e1600fb528bbeffd6369458868ebb94c
+  data.tar.gz: d2274b20b41924ed939e2f09d9ae0dcefbdcfff8bed448d8c045373c1afa72785f2a9e528036e535460807cd59532f4d5eb96b45949abea24eb33b9de6ca15ca

data/.gitlab-ci.yml

@@ -26,7 +26,7 @@ ruby:
   <<: *test_definition
   parallel:
     matrix:
-      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
+      - RUBY_VERSION: ["3.0", "3.1", "3.2"]
 
 static-analysis:
   before_script:
@@ -35,7 +35,6 @@ static-analysis:
     - rake verify
 
 danger-review:
-  image: ruby:3.0
   stage: test
   except:
     - tags

data/.ruby-version

@@ -1 +1 @@
-2.7.7
+3.1.4

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.7
+ruby 3.1.4 3.2.2

data/gitlab-labkit.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary = "Instrumentation for GitLab"
   spec.homepage = "https://gitlab.com/gitlab-org/labkit-ruby"
-  spec.metadata = { "source_code_uri" => "https://gitlab.com/gitlab-org/labkit-ruby" }
+  spec.metadata = { "source_code_uri" => "https://gitlab.com/gitlab-org/ruby/gems/labkit-ruby" }
   spec.license = "MIT"
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|tools)/}) }
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "grpc", ">= 1.37" # Be sure to update the "grpc-tools" dev_dependency too
   spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
-  spec.add_runtime_dependency "pg_query", "~> 4.2.3"
+  spec.add_runtime_dependency "pg_query", ">= 4.2.3", "< 6.0"
   spec.add_runtime_dependency "redis", ">3.0.0", "<6.0.0"
 
   # Please maintain alphabetical order for dev dependencies

data/lib/labkit/context.rb

@@ -66,10 +66,6 @@ module Labkit
         "#{LOG_KEY}.#{key}"
       end
 
-      def known_log_keys
-        @known_log_keys ||= (KNOWN_KEYS.map(&method(:log_key)) + RAW_KEYS).freeze
-      end
-
       private
 
       def contexts

data/lib/labkit/middleware/sidekiq/context/client.rb

@@ -9,7 +9,15 @@ module Labkit
         # be reinstantiated by Sidekiq-server when running the job.
         class Client
           def call(_worker_class, job, _queue, _redis_pool)
-            Labkit::Context.with_context do |context|
+            attributes = {}
+
+            # Don't overwrite the correlation_id from the job. A new context
+            # will always generate a new correlation_id and we'd rather carry
+            # through the correlation_id from the previous job if it is
+            # present (eg. for retries).
+            attributes[Labkit::Context::CORRELATION_ID_KEY] = job["correlation_id"] if job["correlation_id"]
+
+            Labkit::Context.with_context(attributes) do |context|
               job.merge!(context.to_h)
 
               yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.1
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -96,16 +96,22 @@ dependencies:
   name: pg_query
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -446,7 +452,7 @@ homepage: https://gitlab.com/gitlab-org/labkit-ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://gitlab.com/gitlab-org/labkit-ruby
+  source_code_uri: https://gitlab.com/gitlab-org/ruby/gems/labkit-ruby
 post_install_message:
 rdoc_options: []
 require_paths: