gitlab-labkit 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888cc5479aac46e57a89719bf13d9403a83f4d92c4f6c2a280b4c71950fee250
-  data.tar.gz: 2d5cc94125a609627065b10faa15a85eec3998285686db906a3ce1f54ed1f89d
+  metadata.gz: fd5d320e1c751f2fea87cb55e57c3353b1255c62a126e97eba24a60642c9e0e0
+  data.tar.gz: 543e2fcd663bf562cb23426f0903acbafcf7f2edb6738e12dcc420fdfd8e26aa
 SHA512:
-  metadata.gz: bc655d31560edac3cc29db253c3ea9c20f5fddfc479ac6f76563d56dfd795f265b0119a4480fa9bd10f90c9652eba31f458625a48570b70119004e4bf8ff609f
-  data.tar.gz: 992a1a49adecaf7a52bb4caaec4484dc8feddcfc88fc83a8ddb4ada3b0aca0f6b50de32bf6a64062c9380482958175ff237a037d3c61023e4e541cb1efbd2230
+  metadata.gz: af194fc50ac69e6136c8e849b3445ed8f99c53eb555745ef5c03cbc5f42fde12b0a8fa33bb402c1fc80895feb4e9fba4a5c49cf345c77be10cc977f92cb105c4
+  data.tar.gz: e0b1dd39d3002edd45eb722d0aebe86e800688d878ab5e3beb79d060f65d7a3637ef3d5fb6351b9d80d81156542dd25dc0e3c291c4b7ce0485a4114752e69644

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

@@ -38,25 +38,34 @@ 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
 
         private
 
+        # Skip internal frames (determine_callsite, format_data, format_message, add, info) for performance.
+        INTERNAL_FRAMES_TO_SKIP = 5
+        MAX_FRAMES_TO_INSPECT = 15
+        private_constant :INTERNAL_FRAMES_TO_SKIP, :MAX_FRAMES_TO_INSPECT
+
         def determine_callsite
-          locations = caller_locations(1, 30) || []
+          locations = caller_locations(INTERNAL_FRAMES_TO_SKIP, MAX_FRAMES_TO_INSPECT) || []
+          locations = caller_locations(1, MAX_FRAMES_TO_INSPECT) || [] if locations.empty?
 
           locations.find do |loc|
             path = loc.path
@@ -77,12 +86,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.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Andrew Newdigate