kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-11-29 15:13:12 +00:00
parent 548f365e6b
commit a22611115a
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gitlab/ci/pipeline/logger.rb
View File

@ -47,12 +47,12 @@ module Gitlab
return unless log?
attributes = {
caller: caller,
pipeline_creation_caller: caller,
project_id: project.id,
pipeline_id: pipeline.id,
persisted: pipeline.persisted?,
source: pipeline.source,
duration_s: age
pipeline_persisted: pipeline.persisted?,
pipeline_source: pipeline.source,
pipeline_creation_service_duration_s: age
}.stringify_keys.merge(observations_hash)
destination.info(attributes)

8
spec/lib/gitlab/ci/pipeline/logger_spec.rb
View File

@ -72,11 +72,11 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Logger do
let(:loggable_data) do
{
'pipeline_id' => pipeline.id,
'persisted' => true,
'pipeline_persisted' => true,
'project_id' => project.id,
'duration_s' => a_kind_of(Numeric),
'caller' => 'source',
'source' => pipeline.source,
'pipeline_creation_service_duration_s' => a_kind_of(Numeric),
'pipeline_creation_caller' => 'source',
'pipeline_source' => pipeline.source,
'pipeline_save_duration_s' => {
'avg' => 60, 'count' => 1, 'max' => 60, 'min' => 60
},

16
spec/services/ci/create_pipeline_service/logger_spec.rb
View File

@ -27,12 +27,12 @@ RSpec.describe Ci::CreatePipelineService do
let(:loggable_data) do
{
'caller' => 'Ci::CreatePipelineService',
'source' => 'push',
'pipeline_creation_caller' => 'Ci::CreatePipelineService',
'pipeline_source' => 'push',
'pipeline_id' => a_kind_of(Numeric),
'persisted' => true,
'pipeline_persisted' => true,
'project_id' => project.id,
'duration_s' => a_kind_of(Numeric),
'pipeline_creation_service_duration_s' => a_kind_of(Numeric),
'pipeline_creation_duration_s' => counters,
'pipeline_size_count' => counters,
'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => counters
@ -79,12 +79,12 @@ RSpec.describe Ci::CreatePipelineService do
context 'when the pipeline is not persisted' do
let(:loggable_data) do
{
'caller' => 'Ci::CreatePipelineService',
'source' => 'push',
'pipeline_creation_caller' => 'Ci::CreatePipelineService',
'pipeline_source' => 'push',
'pipeline_id' => nil,
'persisted' => false,
'pipeline_persisted' => false,
'project_id' => project.id,
'duration_s' => a_kind_of(Numeric),
'pipeline_creation_service_duration_s' => a_kind_of(Numeric),
'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => counters
}
end