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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
83ae1721
Commit
83ae1721
authored
Jan 19, 2018
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup rspec
parent
f5383578
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
24 deletions
+26
-24
lib/gitlab/metrics/concern.rb
lib/gitlab/metrics/concern.rb
+6
-10
spec/lib/gitlab/metrics/concern_spec.rb
spec/lib/gitlab/metrics/concern_spec.rb
+20
-14
No files found.
lib/gitlab/metrics/concern.rb
View file @
83ae1721
...
...
@@ -13,23 +13,19 @@ module Gitlab
def
define_metric
(
type
,
name
,
opts
=
{},
&
block
)
if
respond_to?
(
name
)
raise
ArgumentError
,
"met
rics met
hod
#{
name
}
already exists"
raise
ArgumentError
,
"method
#{
name
}
already exists"
end
define_singleton_method
(
name
)
do
# avoid unnecessary method call to speed up metric access
metric
=
@_metrics_provider_cache
&
.
[
](
name
)
return
metric
if
metric
fetch_metric
(
type
,
name
,
opts
,
&
block
)
@_metrics_provider_cache
&
.
[
](
name
)
||
init_metric
(
type
,
name
,
opts
,
&
block
)
end
end
def
fetch_metric
(
type
,
name
,
opts
=
{},
&
block
)
# avoid synchronization to speed up metrics access
metric
=
@_metrics_provider_cache
&
.
[
](
name
)
return
metric
if
metric
@_metrics_provider_cache
&
.
[
](
name
)
||
init_metric
(
type
,
name
,
opts
,
&
block
)
end
def
init_metric
(
type
,
name
,
opts
=
{},
&
block
)
options
=
MetricOptions
.
new
(
opts
)
options
.
evaluate
(
&
block
)
...
...
@@ -73,7 +69,7 @@ module Gitlab
fetch_metric
(
:counter
,
name
,
opts
,
&
block
)
end
#
D
Fetch and/or initialize gauge metric
# Fetch and/or initialize gauge metric
# @param [Symbol] name
# @param [Hash] opts
def
fetch_gauge
(
name
,
opts
=
{},
&
block
)
...
...
spec/lib/gitlab/metrics/concern_spec.rb
View file @
83ae1721
...
...
@@ -8,13 +8,17 @@ describe Gitlab::Metrics::Concern do
let
(
:metric_name
)
{
:sample_metric
}
describe
"#define_
#{
metric_type
}
"
do
let
(
:define_method
)
{
"define_
#{
metric_type
}
"
.
to_sym
}
let
(
:_metric_type
)
{
metric_type
}
def
define_metric_method
(
**
args
)
subject
.
send
(
"define_
#{
_metric_type
}
"
,
metric_name
,
**
args
)
end
context
'metrics access method not defined'
do
it
"defines metrics accessing method"
do
expect
(
subject
).
not_to
respond_to
(
metric_name
)
subject
.
send
(
define_method
,
metric_name
,
docstring:
docstring
)
define_metric_method
(
docstring:
docstring
)
expect
(
subject
).
to
respond_to
(
metric_name
)
end
...
...
@@ -22,16 +26,16 @@ describe Gitlab::Metrics::Concern do
context
'metrics access method defined'
do
before
do
subject
.
send
(
define_method
,
metric_name
,
docstring:
docstring
)
define_metric_method
(
docstring:
docstring
)
end
it
'raises error when trying to redefine method'
do
expect
{
subject
.
send
(
define_method
,
metric_name
,
docstring:
docstring
)
}.
to
raise_error
(
ArgumentError
)
expect
{
define_metric_method
(
docstring:
docstring
)
}.
to
raise_error
(
ArgumentError
)
end
context
'metric is not cached'
do
it
'calls fetch_metric'
do
expect
(
subject
).
to
receive
(
:
fetch
_metric
).
with
(
metric_type
,
metric_name
,
docstring:
docstring
)
expect
(
subject
).
to
receive
(
:
init
_metric
).
with
(
metric_type
,
metric_name
,
docstring:
docstring
)
subject
.
send
(
metric_name
)
end
...
...
@@ -43,7 +47,7 @@ describe Gitlab::Metrics::Concern do
end
it
'returns cached metric'
do
expect
(
subject
).
not_to
receive
(
:
fetch
_metric
)
expect
(
subject
).
not_to
receive
(
:
init
_metric
)
subject
.
send
(
metric_name
)
end
...
...
@@ -52,16 +56,18 @@ describe Gitlab::Metrics::Concern do
end
describe
"#fetch_
#{
metric_type
}
"
do
let
(
:fetch_method
)
{
"fetch_
#{
metric_type
}
"
.
to_sym
}
let
(
:_metric_type
)
{
metric_type
}
let
(
:null_metric
)
{
Gitlab
::
Metrics
::
NullMetric
.
instance
}
def
fetch_metric_method
(
**
args
)
subject
.
send
(
"fetch_
#{
_metric_type
}
"
,
metric_name
,
**
args
)
end
context
"when
#{
metric_type
}
is not cached"
do
it
'initializes counter metric'
do
allow
(
Gitlab
::
Metrics
).
to
receive
(
metric_type
).
and_return
(
null_metric
)
subject
.
send
(
fetch_method
,
metric_name
,
docstring:
docstring
)
fetch_metric_method
(
docstring:
docstring
)
expect
(
Gitlab
::
Metrics
).
to
have_received
(
metric_type
).
with
(
metric_name
,
docstring
,
*
args
)
end
...
...
@@ -69,13 +75,13 @@ describe Gitlab::Metrics::Concern do
context
"when
#{
metric_type
}
is cached"
do
before
do
subject
.
send
(
fetch_method
,
metric_name
,
docstring:
docstring
)
fetch_metric_method
(
docstring:
docstring
)
end
it
'uses class metric cache'
do
expect
(
Gitlab
::
Metrics
).
not_to
receive
(
metric_type
)
subject
.
send
(
fetch_method
,
metric_name
,
docstring:
docstring
)
fetch_metric_method
(
docstring:
docstring
)
end
context
'when metric is reloaded'
do
...
...
@@ -86,7 +92,7 @@ describe Gitlab::Metrics::Concern do
it
"initializes
#{
metric_type
}
metric"
do
allow
(
Gitlab
::
Metrics
).
to
receive
(
metric_type
).
and_return
(
null_metric
)
subject
.
send
(
fetch_method
,
metric_name
,
docstring:
docstring
)
fetch_metric_method
(
docstring:
docstring
)
expect
(
Gitlab
::
Metrics
).
to
have_received
(
metric_type
).
with
(
metric_name
,
docstring
,
*
args
)
end
...
...
@@ -95,7 +101,7 @@ describe Gitlab::Metrics::Concern do
context
'when metric is configured with feature'
do
let
(
:feature_name
)
{
:some_metric_feature
}
let
(
:metric
)
{
subject
.
send
(
fetch_method
,
metric_name
,
docstring:
docstring
,
with_feature:
feature_name
)
}
let
(
:metric
)
{
fetch_metric_method
(
docstring:
docstring
,
with_feature:
feature_name
)
}
context
'when feature is enabled'
do
before
do
...
...
@@ -117,7 +123,7 @@ describe Gitlab::Metrics::Concern do
end
it
"returns NullMetric"
do
allow
(
Gitlab
::
Metrics
).
to
receive
(
metric_type
)
.
and_return
(
null_metric
)
allow
(
Gitlab
::
Metrics
).
to
receive
(
metric_type
)
expect
(
metric
).
to
be_instance_of
(
Gitlab
::
Metrics
::
NullMetric
)
...
...
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