Commit 8229c22a authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch '351898-change-git-version-metric-type-to-object' into 'master'

Change `git.version` metric value type to `object`

See merge request gitlab-org/gitlab!80846
parents e263bc04 1b7122a9
...@@ -6,7 +6,8 @@ product_section: enablement ...@@ -6,7 +6,8 @@ product_section: enablement
product_stage: enablement product_stage: enablement
product_group: group::distribution product_group: group::distribution
product_category: '' product_category: ''
value_type: string value_type: object
value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
status: active status: active
milestone: "<13.9" milestone: "<13.9"
time_frame: none time_frame: none
......
{
"type": "object",
"required": ["major"],
"properties": {
"major": { "type": "number", "description": "Major version number" },
"minor": { "type": "number", "description": "Minor version number" },
"patch": { "type": "number", "description": "Patch number" }
}
}
...@@ -70,7 +70,10 @@ RSpec.describe 'Every metric definition' do ...@@ -70,7 +70,10 @@ RSpec.describe 'Every metric definition' do
end end
before do before do
allow(Gitlab::UsageData).to receive_messages(count: -1, distinct_count: -1, estimate_batch_distinct_count: -1, sum: -1, alt_usage_data: -1) allow(Gitlab::UsageData).to receive_messages(count: -1, distinct_count: -1, estimate_batch_distinct_count: -1, sum: -1)
allow(Gitlab::UsageData).to receive(:alt_usage_data).and_wrap_original do |m, *args, **kwargs|
kwargs[:fallback] || Gitlab::Utils::UsageData::FALLBACK
end
allow(Gitlab::Geo).to receive(:enabled?).and_return(true) allow(Gitlab::Geo).to receive(:enabled?).and_return(true)
stub_licensed_features(requirements: true) stub_licensed_features(requirements: true)
stub_prometheus_queries stub_prometheus_queries
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment