Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb')
-rw-r--r--spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb21
1 files changed, 15 insertions, 6 deletions
diff --git a/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb b/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
index 1b50ef3fcff..69c20a00c5a 100644
--- a/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
+++ b/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
@@ -4,10 +4,11 @@ RSpec.shared_context 'structured_logger' do
let(:timestamp) { Time.iso8601('2018-01-01T12:00:00.000Z') }
let(:created_at) { timestamp - 1.second }
let(:scheduling_latency_s) { 1.0 }
+ let(:worker_class) { "TestWorker" }
let(:job) do
{
- "class" => "TestWorker",
+ "class" => worker_class,
"args" => [1234, 'hello', { 'key' => 'value' }],
"retry" => false,
"queue" => "cronjob:test_queue",
@@ -31,7 +32,7 @@ RSpec.shared_context 'structured_logger' do
job.except(
'exception.backtrace', 'exception.class', 'exception.message'
).merge(
- 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: start',
+ 'message' => "#{worker_class} JID-da883554ee4fe414012f5f42: start",
'job_status' => 'start',
'pid' => Process.pid,
'created_at' => created_at.to_f,
@@ -55,7 +56,7 @@ RSpec.shared_context 'structured_logger' do
let(:end_payload) do
start_payload.merge(db_payload_defaults).merge(
- 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: done: 0.0 sec',
+ 'message' => "#{worker_class} JID-da883554ee4fe414012f5f42: done: 0.0 sec",
'job_status' => 'done',
'duration_s' => 0.0,
'completed_at' => timestamp.to_f,
@@ -67,15 +68,23 @@ RSpec.shared_context 'structured_logger' do
let(:deferred_payload) do
end_payload.merge(
- 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: deferred: 0.0 sec',
+ 'message' => "#{worker_class} JID-da883554ee4fe414012f5f42: deferred: 0.0 sec",
'job_status' => 'deferred',
- 'job_deferred_by' => :feature_flag
+ 'job_deferred_by' => :feature_flag,
+ 'deferred_count' => 1
+ )
+ end
+
+ let(:dropped_payload) do
+ end_payload.merge(
+ 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: dropped: 0.0 sec',
+ 'job_status' => 'dropped'
)
end
let(:exception_payload) do
end_payload.merge(
- 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: fail: 0.0 sec',
+ 'message' => "#{worker_class} JID-da883554ee4fe414012f5f42: fail: 0.0 sec",
'job_status' => 'fail',
'exception.class' => 'ArgumentError',
'exception.message' => 'Something went wrong',