Merge new metrics implemented with Instrumentation classes to Usage Ping [RUN ALL RSPEC] [RUN AS-IF-FOSS]
requested to merge 326426-merge-new-metrics-implemented-with-instrumentation-classes-to-usage-ping into master
What does this MR do?
Proposal to use instrumentation classes
Merge Instrumented metrics to usage ping
- Add feature flag usage_data_instrumentation
- Merge metrics generated using instrumentation
classes to usage ping generated using
usage_data.rb
Using a feature flag to first have the chance that this works correct and doesn't break the usage ping in the current state.
A couple of metrics values are overriten by values generated using Gitlab::UsageDataMetrics.uncached_data
When we remove the feature flag we could remove the implementation from usage_data.rb and only use the one from instrumentation classes.
Metrics overitten now are
{
:usage_activity_by_stage=>
{
:plan=>{:issues=>172944}
},
:counts=>
{
:boards=>261010,
:issues=>6343079
},
:redis_hll_counters=>
{
:quickactions=>
{
:i_quickactions_approve_weekly=>0,
:i_quickactions_approve_monthly=>0
}
},
:uuid=>"ea8bf810-1d6f-4a6a-b4fd-93e8cbd8b7f",
:hostname=>"staging.gitlab.com",
:usage_activity_by_stage_monthly=>
{
:plan=>
{
:issues=>12
}
}
}
Screenshots (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
-
I have included a changelog entry, or it's not needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Related to #326426 (closed)
Edited by Alina Mihaila