gitlab-labkit 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93345552c013b93d13d6f87e2160c737489e75ccdb63ba1638cd22a8c92508a1
-  data.tar.gz: e55c8ec4d4d17a9d207b3b0ff9af27b92821d6b7210a304a192e120a07c19141
+  metadata.gz: 8de30f81c7d686614fa1a01ba73fbfd73ffa3ecaf06bf38cd8698fc6ad98fb43
+  data.tar.gz: 4a118dddf92c9affdc04f4ec39f7d2029edada61bf919dd9e9269dfc9b0ab740
 SHA512:
-  metadata.gz: 97c4077db5b62456809cb9fea6850d6e4977cbcd0979562d704eb6ef55eb8aca3fce2ecf6a89beb7d496f8c88b94c46e1a00cd9b06b6b5591255cb0158601b8a
-  data.tar.gz: 9c91a4e8e5c36fbbd9f65587ff00f756a5112adb8b1c8d22cf4a9401dac8b7c8628bf2b294afa19bb03eac247d9f5ccdd3a32bfae23ad7300c3eb78cb6681b15
+  metadata.gz: 874641186b4d1de6df98dc69fbd12e3e0be6c4f1b15501cc2dd91341f5b5a843d3c000404067197864aca071328b3fdac13aeb9f6ff38cc561d245c1bcfbcf76
+  data.tar.gz: e30bc5213eae9ac3bdf1cd7e9d3ab3cff3455f82e7cd79d9868b077f0fe44ededfdd1f6346db2b3546b5bcb127dbe2fa7d64529e7972c4bcb9880874e835ba21

data/gitlab-labkit.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   # Please maintain alphabetical order for dependencies
   spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.0.0"
   spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.0.0"
-  spec.add_runtime_dependency "grpc", ">= 1.37" # Be sure to update the "grpc-tools" dev_dependency too
+  spec.add_runtime_dependency "grpc", ">= 1.62" # 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", "< 6.0"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "faraday", "~> 1.0"
   spec.add_development_dependency "gitlab-dangerfiles", "~> 2.11.0"
   spec.add_development_dependency "gitlab-styles", "~> 6.2.0"
-  spec.add_development_dependency "grpc-tools", ">= 1.37"
+  spec.add_development_dependency "grpc-tools", ">= 1.62"
   spec.add_development_dependency "httparty", "~> 0.17.3"
   spec.add_development_dependency "httpclient", "~> 2.8.3"
   spec.add_development_dependency "pry", "~> 0.12"

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.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '1.62'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '1.62'
 - !ruby/object:Gem::Dependency
   name: jaeger-client
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +194,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '1.62'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '1.62'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement