Merge branch 'total-method-time' into 'master'
Removed tracking of total method execution times
See #17239 and 945c5b3fe6
for more details. The Grafana dashboards used to visualize performance data were updated a while ago to no longer display this data.
See merge request !4124
This commit is contained in:
commit
5298c3cc02
3 changed files with 1 additions and 8 deletions
|
@ -44,6 +44,7 @@ v 8.8.0 (unreleased)
|
||||||
- Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
|
- Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
|
||||||
- Fix adding a todo for private group members (Ahmad Sherif)
|
- Fix adding a todo for private group members (Ahmad Sherif)
|
||||||
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
|
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
|
||||||
|
- Total method execution timings are no longer tracked
|
||||||
|
|
||||||
v 8.7.5
|
v 8.7.5
|
||||||
- Fix relative links in wiki pages. !4050
|
- Fix relative links in wiki pages. !4050
|
||||||
|
|
|
@ -154,8 +154,6 @@ module Gitlab
|
||||||
duration = (Time.now - start) * 1000.0
|
duration = (Time.now - start) * 1000.0
|
||||||
|
|
||||||
if duration >= Gitlab::Metrics.method_call_threshold
|
if duration >= Gitlab::Metrics.method_call_threshold
|
||||||
trans.increment(:method_duration, duration)
|
|
||||||
|
|
||||||
trans.add_metric(Gitlab::Metrics::Instrumentation::SERIES,
|
trans.add_metric(Gitlab::Metrics::Instrumentation::SERIES,
|
||||||
{ duration: duration },
|
{ duration: duration },
|
||||||
method: #{label.inspect})
|
method: #{label.inspect})
|
||||||
|
|
|
@ -56,9 +56,6 @@ describe Gitlab::Metrics::Instrumentation do
|
||||||
allow(described_class).to receive(:transaction).
|
allow(described_class).to receive(:transaction).
|
||||||
and_return(transaction)
|
and_return(transaction)
|
||||||
|
|
||||||
expect(transaction).to receive(:increment).
|
|
||||||
with(:method_duration, a_kind_of(Numeric))
|
|
||||||
|
|
||||||
expect(transaction).to receive(:add_metric).
|
expect(transaction).to receive(:add_metric).
|
||||||
with(described_class::SERIES, an_instance_of(Hash),
|
with(described_class::SERIES, an_instance_of(Hash),
|
||||||
method: 'Dummy.foo')
|
method: 'Dummy.foo')
|
||||||
|
@ -139,9 +136,6 @@ describe Gitlab::Metrics::Instrumentation do
|
||||||
allow(described_class).to receive(:transaction).
|
allow(described_class).to receive(:transaction).
|
||||||
and_return(transaction)
|
and_return(transaction)
|
||||||
|
|
||||||
expect(transaction).to receive(:increment).
|
|
||||||
with(:method_duration, a_kind_of(Numeric))
|
|
||||||
|
|
||||||
expect(transaction).to receive(:add_metric).
|
expect(transaction).to receive(:add_metric).
|
||||||
with(described_class::SERIES, an_instance_of(Hash),
|
with(described_class::SERIES, an_instance_of(Hash),
|
||||||
method: 'Dummy#bar')
|
method: 'Dummy#bar')
|
||||||
|
|
Loading…
Reference in a new issue