Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bdc707ff
Commit
bdc707ff
authored
Oct 08, 2021
by
Marius Bobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add metrics to track invalid job traces
Add metrics to track invalid job traces
parent
f23c3794
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
100 additions
and
0 deletions
+100
-0
app/services/ci/update_build_state_service.rb
app/services/ci/update_build_state_service.rb
+2
-0
lib/gitlab/ci/trace/metrics.rb
lib/gitlab/ci/trace/metrics.rb
+23
-0
spec/lib/gitlab/ci/trace/metrics_spec.rb
spec/lib/gitlab/ci/trace/metrics_spec.rb
+23
-0
spec/services/ci/update_build_state_service_spec.rb
spec/services/ci/update_build_state_service_spec.rb
+52
-0
No files found.
app/services/ci/update_build_state_service.rb
View file @
bdc707ff
...
@@ -73,9 +73,11 @@ module Ci
...
@@ -73,9 +73,11 @@ module Ci
::
Gitlab
::
Ci
::
Trace
::
Checksum
.
new
(
build
).
then
do
|
checksum
|
::
Gitlab
::
Ci
::
Trace
::
Checksum
.
new
(
build
).
then
do
|
checksum
|
unless
checksum
.
valid?
unless
checksum
.
valid?
metrics
.
increment_trace_operation
(
operation: :invalid
)
metrics
.
increment_trace_operation
(
operation: :invalid
)
metrics
.
increment_error_counter
(
type: :chunks_invalid_checksum
)
if
checksum
.
corrupted?
if
checksum
.
corrupted?
metrics
.
increment_trace_operation
(
operation: :corrupted
)
metrics
.
increment_trace_operation
(
operation: :corrupted
)
metrics
.
increment_error_counter
(
type: :chunks_invalid_size
)
end
end
next
unless
log_invalid_chunks?
next
unless
log_invalid_chunks?
...
...
lib/gitlab/ci/trace/metrics.rb
View file @
bdc707ff
...
@@ -21,6 +21,12 @@ module Gitlab
...
@@ -21,6 +21,12 @@ module Gitlab
:corrupted
# malformed trace found after comparing CRC32 and size
:corrupted
# malformed trace found after comparing CRC32 and size
].
freeze
].
freeze
TRACE_ERROR_TYPES
=
[
:chunks_invalid_size
,
# used to be :corrupted
:chunks_invalid_checksum
,
# used to be :invalid
:archive_invalid_checksum
# malformed trace found into object store after comparing MD5
].
freeze
def
increment_trace_operation
(
operation: :unknown
)
def
increment_trace_operation
(
operation: :unknown
)
unless
OPERATIONS
.
include?
(
operation
)
unless
OPERATIONS
.
include?
(
operation
)
raise
ArgumentError
,
"unknown trace operation:
#{
operation
}
"
raise
ArgumentError
,
"unknown trace operation:
#{
operation
}
"
...
@@ -33,6 +39,14 @@ module Gitlab
...
@@ -33,6 +39,14 @@ module Gitlab
self
.
class
.
trace_bytes
.
increment
({},
size
.
to_i
)
self
.
class
.
trace_bytes
.
increment
({},
size
.
to_i
)
end
end
def
increment_error_counter
(
type: :unknown
)
unless
TRACE_ERROR_TYPES
.
include?
(
type
)
raise
ArgumentError
,
"unknown error type:
#{
type
}
"
end
self
.
class
.
trace_errors_counter
.
increment
(
type:
type
)
end
def
observe_migration_duration
(
seconds
)
def
observe_migration_duration
(
seconds
)
self
.
class
.
finalize_histogram
.
observe
({},
seconds
.
to_f
)
self
.
class
.
finalize_histogram
.
observe
({},
seconds
.
to_f
)
end
end
...
@@ -65,6 +79,15 @@ module Gitlab
...
@@ -65,6 +79,15 @@ module Gitlab
::
Gitlab
::
Metrics
.
histogram
(
name
,
comment
,
labels
,
buckets
)
::
Gitlab
::
Metrics
.
histogram
(
name
,
comment
,
labels
,
buckets
)
end
end
end
end
def
self
.
trace_errors_counter
strong_memoize
(
:trace_errors_counter
)
do
name
=
:gitlab_ci_build_trace_errors_total
comment
=
'Total amount of different error types on a build trace'
Gitlab
::
Metrics
.
counter
(
name
,
comment
)
end
end
end
end
end
end
end
end
...
...
spec/lib/gitlab/ci/trace/metrics_spec.rb
View file @
bdc707ff
...
@@ -15,4 +15,27 @@ RSpec.describe Gitlab::Ci::Trace::Metrics, :prometheus do
...
@@ -15,4 +15,27 @@ RSpec.describe Gitlab::Ci::Trace::Metrics, :prometheus do
end
end
end
end
end
end
describe
'#increment_error_counter'
do
context
'when the operation type is known'
do
it
'increments the counter'
do
subject
.
increment_error_counter
(
type: :chunks_invalid_size
)
subject
.
increment_error_counter
(
type: :chunks_invalid_checksum
)
subject
.
increment_error_counter
(
type: :archive_invalid_checksum
)
expect
(
described_class
.
trace_errors_counter
.
get
(
type: :chunks_invalid_size
)).
to
eq
1
expect
(
described_class
.
trace_errors_counter
.
get
(
type: :chunks_invalid_checksum
)).
to
eq
1
expect
(
described_class
.
trace_errors_counter
.
get
(
type: :archive_invalid_checksum
)).
to
eq
1
expect
(
described_class
.
trace_errors_counter
.
values
.
count
).
to
eq
3
end
end
context
'when the operation type is known'
do
it
'raises an exception'
do
expect
{
subject
.
increment_error_counter
(
type: :invalid_type
)
}
.
to
raise_error
(
ArgumentError
)
end
end
end
end
end
spec/services/ci/update_build_state_service_spec.rb
View file @
bdc707ff
...
@@ -112,6 +112,14 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -112,6 +112,14 @@ RSpec.describe Ci::UpdateBuildStateService do
.
not_to
have_received
(
:increment_trace_operation
)
.
not_to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :invalid
)
.
with
(
operation: :invalid
)
end
end
it
'does not increment chunks_invalid_checksum trace metric'
do
execute_with_stubbed_metrics!
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
end
end
end
context
'when build trace has been migrated'
do
context
'when build trace has been migrated'
do
...
@@ -174,6 +182,14 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -174,6 +182,14 @@ RSpec.describe Ci::UpdateBuildStateService do
.
to
have_received
(
:increment_trace_operation
)
.
to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :invalid
)
.
with
(
operation: :invalid
)
end
end
it
'increments chunks_invalid_checksum trace metric'
do
execute_with_stubbed_metrics!
expect
(
metrics
)
.
to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
end
end
end
context
'when trace checksum is valid'
do
context
'when trace checksum is valid'
do
...
@@ -191,6 +207,14 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -191,6 +207,14 @@ RSpec.describe Ci::UpdateBuildStateService do
expect
(
metrics
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_trace_operation
)
.
not_to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :corrupted
)
.
with
(
operation: :corrupted
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_size
)
end
end
context
'when using deprecated parameters'
do
context
'when using deprecated parameters'
do
...
@@ -208,6 +232,14 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -208,6 +232,14 @@ RSpec.describe Ci::UpdateBuildStateService do
expect
(
metrics
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_trace_operation
)
.
not_to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :corrupted
)
.
with
(
operation: :corrupted
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_size
)
end
end
end
end
end
end
...
@@ -227,6 +259,14 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -227,6 +259,14 @@ RSpec.describe Ci::UpdateBuildStateService do
expect
(
metrics
)
expect
(
metrics
)
.
to
have_received
(
:increment_trace_operation
)
.
to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :corrupted
)
.
with
(
operation: :corrupted
)
expect
(
metrics
)
.
to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
expect
(
metrics
)
.
to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_size
)
end
end
end
end
...
@@ -242,9 +282,17 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -242,9 +282,17 @@ RSpec.describe Ci::UpdateBuildStateService do
.
to
have_received
(
:increment_trace_operation
)
.
to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :invalid
)
.
with
(
operation: :invalid
)
expect
(
metrics
)
.
to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
expect
(
metrics
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_trace_operation
)
.
not_to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :corrupted
)
.
with
(
operation: :corrupted
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_size
)
end
end
end
end
...
@@ -325,6 +373,10 @@ RSpec.describe Ci::UpdateBuildStateService do
...
@@ -325,6 +373,10 @@ RSpec.describe Ci::UpdateBuildStateService do
expect
(
metrics
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_trace_operation
)
.
not_to
have_received
(
:increment_trace_operation
)
.
with
(
operation: :invalid
)
.
with
(
operation: :invalid
)
expect
(
metrics
)
.
not_to
have_received
(
:increment_error_counter
)
.
with
(
type: :chunks_invalid_checksum
)
end
end
context
'when build pending state is outdated'
do
context
'when build pending state is outdated'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment