Sort like logrus

2 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab_logger.rb b/lib/gitlab_logger.rb
index eba592c..cdca25b 100644
--- a/lib/gitlab_logger.rb
+++ b/lib/gitlab_logger.rb
@@ -79,7 +79,7 @@ class GitlabLogger
       format_key_value(:msg, data.delete(:msg))
     ]
 
-    data.each { |k, v| result << format_key_value(k, v) }
+    data.sort.each { |k, v| result << format_key_value(k, v) }
     result.join(' ')
   end
 
diff --git a/spec/gitlab_logger_spec.rb b/spec/gitlab_logger_spec.rb
index 48e3623..741ee13 100644
--- a/spec/gitlab_logger_spec.rb
+++ b/spec/gitlab_logger_spec.rb
@@ -28,6 +28,15 @@ describe GitlabLogger do
     output.string.lines.first.chomp
   end
 
+  describe 'field sorting' do
+    it 'sorts fields, except time, level, msg' do
+      # Intentionally put 'foo' before 'baz' to see the effect of sorting
+      subject.info('hello world', foo: 'bar', baz: 'qux')
+
+      expect(first_line).to eq('time="1973-11-29T21:33:09+00:00" level=info msg="hello world" baz=qux foo=bar pid=1234')
+    end
+  end
+
   describe '#info' do
     context 'when the log level is too high' do
       let(:level) { Logger::ERROR }