Merge branch '413766-fix-execution-time-log' into 'master'

Path traversal middleware: log the execution time in ms

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133465



Merged-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Approved-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>
Co-authored-by: David Fernandez <dfernandez@gitlab.com>

lib/gitlab/middleware/path_traversal_check.rb

@@ -17,7 +17,7 @@ def call(env)
             check(env, log_params)
           end
 
-          log_params[:duration_s] = execution_time.round(5) if execution_time
+          log_params[:duration_ms] = execution_time.round(5) if execution_time
 
           log(log_params) unless log_params.empty?
         end
@@ -29,7 +29,7 @@ def call(env)
 
       def measure_execution_time(&blk)
         if Feature.enabled?(:log_execution_time_path_traversal_middleware, Feature.current_request)
-          Benchmark.realtime(&blk)
+          Benchmark.ms(&blk)
         else
           yield
 

spec/lib/gitlab/middleware/path_traversal_check_spec.rb

@@ -31,7 +31,7 @@
                 .and_call_original
         expect(::Gitlab::AppLogger)
           .to receive(:warn)
-                .with({ class_name: described_class.name, duration_s: instance_of(Float) })
+                .with({ class_name: described_class.name, duration_ms: instance_of(Float) })
                 .and_call_original
 
         expect(subject).to eq(fake_response)
@@ -68,7 +68,7 @@
           .to receive(:warn)
                 .with({
                   class_name: described_class.name,
-                  duration_s: instance_of(Float),
+                  duration_ms: instance_of(Float),
                   message: described_class::PATH_TRAVERSAL_MESSAGE,
                   fullpath: fullpath
                 }).and_call_original