gitlab-labkit 0.35.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93345552c013b93d13d6f87e2160c737489e75ccdb63ba1638cd22a8c92508a1
-  data.tar.gz: e55c8ec4d4d17a9d207b3b0ff9af27b92821d6b7210a304a192e120a07c19141
+  metadata.gz: 48e2df6dd68eddc3928dad7c12f616bc124c16c55fd3d94947a21f23dc9cd732
+  data.tar.gz: 4b7dd6dffbb2936d6464b5777ac01db0c2142cdfa79b0527419a3750fcbe6b60
 SHA512:
-  metadata.gz: 97c4077db5b62456809cb9fea6850d6e4977cbcd0979562d704eb6ef55eb8aca3fce2ecf6a89beb7d496f8c88b94c46e1a00cd9b06b6b5591255cb0158601b8a
-  data.tar.gz: 9c91a4e8e5c36fbbd9f65587ff00f756a5112adb8b1c8d22cf4a9401dac8b7c8628bf2b294afa19bb03eac247d9f5ccdd3a32bfae23ad7300c3eb78cb6681b15
+  metadata.gz: f7eea840bb4724fedc0f0789d87f234a4f997dce9cdefece2ea839c09c4c0a6a2494f80048d8fbb9dcd0545e1ec4fca0e1600fb528bbeffd6369458868ebb94c
+  data.tar.gz: d2274b20b41924ed939e2f09d9ae0dcefbdcfff8bed448d8c045373c1afa72785f2a9e528036e535460807cd59532f4d5eb96b45949abea24eb33b9de6ca15ca

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.35.1
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack