Merge branch 'gitlab-tracking-meta-5' into 'master'

Add user/namespace and project in tracking calls

See merge request gitlab-org/gitlab!64493

app/graphql/mutations/concerns/mutations/package_eventable.rb

@@ -8,7 +8,7 @@ module Mutations
 
     def track_event(event, scope)
       ::Packages::CreateEventService.new(nil, current_user, event_name: event, scope: scope).execute
-      ::Gitlab::Tracking.event(event.to_s, scope.to_s)
+      ::Gitlab::Tracking.event(event.to_s, scope.to_s, user: current_user)
     end
   end
 end

lib/gitlab/database_importers/instance_administrators/create_group.rb

@@ -89,7 +89,7 @@ module Gitlab
         end
 
         def track_event(result)
-          ::Gitlab::Tracking.event("instance_administrators_group", "group_created")
+          ::Gitlab::Tracking.event("instance_administrators_group", "group_created", namespace: result[:group])
 
           success(result)
         end

lib/gitlab/database_importers/self_monitoring/project/create_service.rb

@@ -118,7 +118,8 @@ module Gitlab
           end
 
           def track_event(result)
-            ::Gitlab::Tracking.event("self_monitoring", "project_created")
+            project = result[:project]
+            ::Gitlab::Tracking.event("self_monitoring", "project_created", project: project, namespace: project.namespace)
 
             success(result)
           end

spec/lib/gitlab/database_importers/instance_administrators/create_group_spec.rb

@@ -56,10 +56,10 @@ RSpec.describe Gitlab::DatabaseImporters::InstanceAdministrators::CreateGroup do
 
       it "tracks successful install" do
         expect(::Gitlab::Tracking).to receive(:event).with(
-          'instance_administrators_group', 'group_created'
+          'instance_administrators_group', 'group_created', namespace: group
         )
 
-        result
+        subject.execute
       end
 
       it 'creates group' do

spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb

@@ -86,10 +86,10 @@ RSpec.describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService
       end
 
       it "tracks successful install" do
-        expect(::Gitlab::Tracking).to receive(:event).twice
-        expect(::Gitlab::Tracking).to receive(:event).with('self_monitoring', 'project_created')
+        expect(::Gitlab::Tracking).to receive(:event).with("instance_administrators_group", "group_created", namespace: project.namespace)
+        expect(::Gitlab::Tracking).to receive(:event).with('self_monitoring', 'project_created', project: project, namespace: project.namespace)
 
-        result
+        subject.execute
       end
 
       it 'creates group' do