diff --git a/lib/gitlab/middleware/path_traversal_check.rb b/lib/gitlab/middleware/path_traversal_check.rb index ff022983d8bc8e1dffc961af656948de44b3c313..79465f3cb307ddda18bb6bc6c5909db422518242 100644 --- a/lib/gitlab/middleware/path_traversal_check.rb +++ b/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 diff --git a/spec/lib/gitlab/middleware/path_traversal_check_spec.rb b/spec/lib/gitlab/middleware/path_traversal_check_spec.rb index 4d5a62e2b32b184dcbd9efeae139274c86c8952b..3d334a60c49a1cf5112ee3680eadee4a012bc98d 100644 --- a/spec/lib/gitlab/middleware/path_traversal_check_spec.rb +++ b/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