gitlab-labkit 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d8908ac363f634bae5e4a138d34f9d9e83f44297d17ff370bacb0e573c88ceb
-  data.tar.gz: b9527b0b05d8b828a4b3bf890b35af60d9ae6e4e893e98558577d419f9bddb5a
+  metadata.gz: a29bc2351fbe292697c582547316e370a7320826be10ecb9ef26580b1d5d3dce
+  data.tar.gz: f489a1fdd02e6a8ba3750c93bcab4baaa4907983abcaf81544e3ec300234a88e
 SHA512:
-  metadata.gz: d658010fd0809876abf220bcdb5b401a19cde96a9ce25006ddf83efac22a6cc7b80bb633b0aa60becb3874138b88da5697898ba77f0b5a7edb199013392dfff5
-  data.tar.gz: c35a260846129ae94108189da9c844753a9937b7a8606ad8db043625cea8cf409a62483a1a80510c7b6fc3080de70afc87af888b9285cabef520c0d115f54fda
+  metadata.gz: f5b4397587a97aa9aadb2b8b4606c675337110ab65d410f211d0c33a0e89fc6b4c2b68f8d07d78906ccd680e31612439d4b316ba955b770a7074582d6b7f80e4
+  data.tar.gz: 521c43e11ede3e207218574c00b5644f2907deb19d876213c862818c0e3c12ff65f1eaeaa4c6b9b1afeb0a59f9d20a67552c7a8a7d8dbb48997d9cc7d55d30ac

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

data/lib/labkit/logging/field_validator/log_interceptor.rb

@@ -18,6 +18,7 @@ module Labkit
         class << self
           def register_wrapper_pattern(pattern)
             wrapper_patterns << pattern
+            @combined_ignore_pattern = nil
           end
 
           def wrapper_patterns
@@ -26,6 +27,11 @@ module Labkit
 
           def reset_wrapper_patterns!
             @wrapper_patterns = nil
+            @combined_ignore_pattern = nil
+          end
+
+          def combined_ignore_pattern
+            @combined_ignore_pattern ||= Regexp.union(IGNORE_PATHS + wrapper_patterns)
           end
         end
 
@@ -38,17 +44,20 @@ module Labkit
           callsite_path = normalize_path(location.path)
           return data unless callsite_path
 
-          all_fields = extract_string_keys(data)
           logger_class = self.class.name || 'AnonymousLogger'
 
-          all_fields.each do |field|
-            standard_field = Labkit::Fields::Deprecated.standard_field_for(field)
-            next unless standard_field
+          deprecated_lookup = Labkit::Fields::Deprecated.all
+          if data.is_a?(Hash)
+            data.each_key do |key|
+              key_str = key.to_s
+              standard_field = deprecated_lookup[key_str]
+              next unless standard_field
 
-            Registry.instance.record_offense(callsite_path, location.lineno, field, standard_field, logger_class)
+              Registry.instance.record_offense(callsite_path, location.lineno, key_str, standard_field, logger_class)
+            end
           end
 
-          Registry.instance.check_for_removed_offenses(callsite_path, all_fields, logger_class)
+          Registry.instance.check_for_removed_offenses(callsite_path, data, logger_class)
 
           data
         end
@@ -63,13 +72,13 @@ module Labkit
         def determine_callsite
           locations = caller_locations(INTERNAL_FRAMES_TO_SKIP, MAX_FRAMES_TO_INSPECT) || []
           locations = caller_locations(1, MAX_FRAMES_TO_INSPECT) || [] if locations.empty?
+          ignore_pattern = LogInterceptor.combined_ignore_pattern
 
           locations.find do |loc|
             path = loc.path
 
             next if path == __FILE__
-            next if IGNORE_PATHS.any? { |pattern| pattern.match?(path) }
-            next if LogInterceptor.wrapper_patterns.any? { |pattern| pattern.match?(path) }
+            next if ignore_pattern.match?(path)
 
             true
           end
@@ -83,12 +92,6 @@ module Labkit
           start_idx += 1 if absolute_path[start_idx] == '/'
           absolute_path[start_idx..]
         end
-
-        def extract_string_keys(data)
-          return Set.new unless data.is_a?(Hash)
-
-          data.keys.to_set(&:to_s)
-        end
       end
     end
   end

data/lib/labkit/logging/field_validator/registry.rb

@@ -109,6 +109,12 @@ module Labkit
           config = Config.load
           config.fetch('offenses', [])
         end
+
+        def extract_string_keys(data)
+          return Set.new unless data.is_a?(Hash)
+
+          data.keys.to_set(&:to_s)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Andrew Newdigate