1 files changed, 2 insertions, 13 deletions
diff --git a/lib/gitlab/tracking/standard_context.rb b/lib/gitlab/tracking/standard_context.rb
index df62e8bbbe6..837390b91fb 100644
--- a/lib/gitlab/tracking/standard_context.rb
+++ b/lib/gitlab/tracking/standard_context.rb
@@ -43,15 +43,8 @@ module Gitlab
           environment: environment,
           source: source,
           plan: plan,
-          extra: extra
-        }.merge(project_and_namespace)
-         .merge(user_data)
-      end
-
-      def project_and_namespace
-        return {} unless ::Feature.enabled?(:add_namespace_and_project_to_snowplow_tracking, default_enabled: :yaml)
-
-        {
+          extra: extra,
+          user_id: user&.id,
           namespace_id: namespace&.id,
           project_id: project_id
         }
@@ -60,10 +53,6 @@ module Gitlab
       def project_id
         project.is_a?(Integer) ? project : project&.id
       end
-
-      def user_data
-        ::Feature.enabled?(:add_actor_based_user_to_snowplow_tracking, user) ? { user_id: user&.id } : {}
-      end
     end
   end
 end