From d426fa2fe74208662ca3d8c0a3c93e24f9501743 Mon Sep 17 00:00:00 2001
From: Pavel Shutsin <pshutsin@gitlab.com>
Date: Mon, 24 Jun 2024 17:04:57 +0200
Subject: [PATCH] Remove track_ai_metrics_in_usage_data feature flag
Changelog: removed
---
.../beta/track_ai_metrics_in_usage_data.yml | 9 ---------
ee/spec/requests/api/usage_data_spec.rb | 4 ----
lib/api/usage_data.rb | 4 +---
3 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 config/feature_flags/beta/track_ai_metrics_in_usage_data.yml
diff --git a/config/feature_flags/beta/track_ai_metrics_in_usage_data.yml b/config/feature_flags/beta/track_ai_metrics_in_usage_data.yml
deleted file mode 100644
index 4141953baf2eb..0000000000000
--- a/config/feature_flags/beta/track_ai_metrics_in_usage_data.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: track_ai_metrics_in_usage_data
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/457504
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155973
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/466664
-milestone: '17.1'
-group: group::optimize
-type: beta
-default_enabled: false
diff --git a/ee/spec/requests/api/usage_data_spec.rb b/ee/spec/requests/api/usage_data_spec.rb
index 7d3a5d6d256d9..94fc0c538ce43 100644
--- a/ee/spec/requests/api/usage_data_spec.rb
+++ b/ee/spec/requests/api/usage_data_spec.rb
@@ -23,10 +23,6 @@
let(:event_name) { 'code_suggestion_shown_in_ide' }
- before do
- stub_feature_flags(track_ai_metrics_in_usage_data: true)
- end
-
it 'triggers AI tracking' do
expect(Gitlab::Tracking::AiTracking).to receive(:track_event)
.with(
diff --git a/lib/api/usage_data.rb b/lib/api/usage_data.rb
index a96969cb1d8b5..8f174806eed76 100644
--- a/lib/api/usage_data.rb
+++ b/lib/api/usage_data.rb
@@ -108,9 +108,7 @@ class UsageData < ::API::Base
.fetch(:additional_properties, Gitlab::InternalEvents::DEFAULT_ADDITIONAL_PROPERTIES)
.symbolize_keys
- if Feature.enabled?(:track_ai_metrics_in_usage_data) && # rubocop:disable Gitlab/FeatureFlagWithoutActor -- beta
- !Gitlab::Tracking::AiTracking.track_via_code_suggestions?(event_name, current_user)
-
+ unless Gitlab::Tracking::AiTracking.track_via_code_suggestions?(event_name, current_user)
Gitlab::Tracking::AiTracking.track_event(event_name, additional_properties.merge(user: current_user))
end
--
GitLab