Add latest changes from gitlab-org/gitlab@master

1 files changed, 29 insertions, 0 deletions

diff --git a/spec/support/shared_examples/lib/gitlab/json_logger_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/json_logger_shared_examples.rb
new file mode 100644
index 00000000000..8a5e8397c3d
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/json_logger_shared_examples.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a json logger' do |extra_params|
+  let(:now) { Time.now }
+  let(:correlation_id) { Labkit::Correlation::CorrelationId.current_id }
+
+  it 'formats strings' do
+    output = subject.format_message('INFO', now, 'test', 'Hello world')
+    data = Gitlab::Json.parse(output)
+
+    expect(data['severity']).to eq('INFO')
+    expect(data['time']).to eq(now.utc.iso8601(3))
+    expect(data['message']).to eq('Hello world')
+    expect(data['correlation_id']).to eq(correlation_id)
+    expect(data).to include(extra_params)
+  end
+
+  it 'formats hashes' do
+    output = subject.format_message('INFO', now, 'test', { hello: 1 })
+    data = Gitlab::Json.parse(output)
+
+    expect(data['severity']).to eq('INFO')
+    expect(data['time']).to eq(now.utc.iso8601(3))
+    expect(data['hello']).to eq(1)
+    expect(data['message']).to be_nil
+    expect(data['correlation_id']).to eq(correlation_id)
+    expect(data).to include(extra_params)
+  end
+end