Merge branch '425913-add-gl-analytics-ff' into 'master'

Adding new feature flag gl_analytics_tracking

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132534



Merged-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Approved-by: Mireya Andres <mandres@gitlab.com>
Approved-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Approved-by: Dominic Couture <dcouture@gitlab.com>
Reviewed-by: Mireya Andres <mandres@gitlab.com>
Reviewed-by: Ankit Panchal <apanchal@gitlab.com>
Co-authored-by: Ankit Panchal <apanchal@gitlab.com>

app/views/layouts/_snowplow.html.haml

@@ -2,7 +2,7 @@
 
 - namespace = @group || @project&.namespace || @namespace
 = webpack_bundle_tag 'tracker'
-- if Gitlab.com? && Feature.enabled?(:browsersdk_tracking)
+- if Gitlab.com? && Feature.enabled?(:browsersdk_tracking) && Feature.enabled?(:gl_analytics_tracking, Feature.current_request)
   = webpack_bundle_tag 'analytics'
 = javascript_tag do
   :plain

config/feature_flags/development/gl_analytics_tracking.yml

+---
+name: gl_analytics_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132534
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426106
+milestone: '16.5'
+type: development
+group: group::analytics instrumentation
+default_enabled: false

lib/gitlab/content_security_policy/config_loader.rb

@@ -86,7 +86,7 @@ def allow_snowplow_micro(directives)
 
         def add_browsersdk_tracking(directives)
           return if directives.blank?
-          return unless Gitlab.com? && Feature.enabled?(:browsersdk_tracking) && ENV['GITLAB_ANALYTICS_URL'].present?
+          return unless Gitlab.com? && ENV['GITLAB_ANALYTICS_URL'].present?
 
           default_connect_src = directives['connect-src'] || directives['default-src']
           connect_src_values = Array.wrap(default_connect_src) | [ENV['GITLAB_ANALYTICS_URL']]

lib/gitlab/gon_helper.rb

@@ -120,7 +120,9 @@ def default_avatar_url
     end
 
     def add_browsersdk_tracking
-      return unless Gitlab.com? && Feature.enabled?(:browsersdk_tracking)
+      return unless Gitlab.com? && Feature.enabled?(:browsersdk_tracking) && Feature.enabled?(:gl_analytics_tracking,
+Feature.current_request)
+
       return if ENV['GITLAB_ANALYTICS_URL'].blank? || ENV['GITLAB_ANALYTICS_ID'].blank?
 
       gon.analytics_url = ENV['GITLAB_ANALYTICS_URL']

spec/lib/gitlab/content_security_policy/config_loader_spec.rb

@@ -577,17 +577,6 @@
         end
       end
 
-      context 'when browsersdk_tracking is disabled' do
-        before do
-          stub_feature_flags(browsersdk_tracking: false)
-          stub_env('GITLAB_ANALYTICS_URL', analytics_url)
-        end
-
-        it 'does not add GITLAB_ANALYTICS_URL to connect-src' do
-          expect(connect_src).not_to include(analytics_url)
-        end
-      end
-
       context 'when GITLAB_ANALYTICS_URL is not set' do
         before do
           stub_env('GITLAB_ANALYTICS_URL', nil)

spec/lib/gitlab/gon_helper_spec.rb

@@ -206,6 +206,7 @@
       context 'when feature flag is false' do
         before do
           stub_feature_flags(browsersdk_tracking: false)
+          stub_feature_flags(gl_analytics_tracking: false)
         end
 
         it "doesn't set the analytics_url and analytics_id" do