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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-30 21:14:49 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-30 21:14:49 +0300
commit99f37f7ebdeb0e7b7493d9f6294086cc90778304 (patch)
tree410b08af1243d9b7c9305f907143ee4dc42cbcd3 /lib/gitlab/usage_data_queries.rb
parent048f666f8a2ba77e45146845ad280ea1c5460ccd (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data_queries.rb')
-rw-r--r--lib/gitlab/usage_data_queries.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/gitlab/usage_data_queries.rb b/lib/gitlab/usage_data_queries.rb
index f543b29e43f..c6490ba7374 100644
--- a/lib/gitlab/usage_data_queries.rb
+++ b/lib/gitlab/usage_data_queries.rb
@@ -5,13 +5,6 @@ module Gitlab
# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41091
class UsageDataQueries < UsageData
class << self
- def uncached_data
- # instrumentation_metrics is already included with feature flag enabled
- return super if Feature.enabled?(:usage_data_instrumentation)
-
- super.with_indifferent_access.deep_merge(instrumentation_metrics.with_indifferent_access)
- end
-
def add_metric(metric, time_frame: 'none', options: {})
metric_class = "Gitlab::Usage::Metrics::Instrumentations::#{metric}".constantize
@@ -71,12 +64,6 @@ module Gitlab
def epics_deepest_relationship_level
{ epics_deepest_relationship_level: 0 }
end
-
- private
-
- def instrumentation_metrics
- ::Gitlab::Usage::Metric.all.map(&:with_instrumentation).reduce({}, :deep_merge)
- end
end
end
end