diff --git a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml new file mode 100644 index 0000000000000000000000000000000000000000..5987bde2d149c2440fa6332cda0f4b0588a48379 --- /dev/null +++ b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml @@ -0,0 +1,22 @@ +--- +key_path: usage_activity_by_stage_monthly.create.merge_request_authors_monthly +description: Number of unique merge request authors +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.6" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103334 +time_frame: 28d +data_source: database +data_category: optional +instrumentation_class: CountMergeRequestAuthorsMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/lib/gitlab/usage/metrics/instrumentations/count_merge_request_authors_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_merge_request_authors_metric.rb new file mode 100644 index 0000000000000000000000000000000000000000..a7f8bca8e08c1abcd5a6254891bc9bf9d22242e5 --- /dev/null +++ b/lib/gitlab/usage/metrics/instrumentations/count_merge_request_authors_metric.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Gitlab + module Usage + module Metrics + module Instrumentations + class CountMergeRequestAuthorsMetric < DatabaseMetric + operation :distinct_count, column: :author_id + + relation { MergeRequest } + end + end + end + end +end diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/count_merge_request_authors_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/count_merge_request_authors_metric_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..92459e92eac718680f2309518bfa45128e9621b6 --- /dev/null +++ b/spec/lib/gitlab/usage/metrics/instrumentations/count_merge_request_authors_metric_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::Usage::Metrics::Instrumentations::CountMergeRequestAuthorsMetric do + let(:expected_value) { 1 } + let(:start) { 30.days.ago.to_s(:db) } + let(:finish) { 2.days.ago.to_s(:db) } + + let(:expected_query) do + "SELECT COUNT(DISTINCT \"merge_requests\".\"author_id\") FROM \"merge_requests\"" \ + " WHERE \"merge_requests\".\"created_at\" BETWEEN '#{start}' AND '#{finish}'" + end + + before do + user = create(:user) + user2 = create(:user) + + create(:merge_request, created_at: 1.year.ago, author: user) + create(:merge_request, created_at: 1.week.ago, author: user2) + create(:merge_request, created_at: 1.week.ago, author: user2) + end + + it_behaves_like 'a correct instrumented metric value and query', { time_frame: '28d' } +end