Add latest changes from gitlab-org/gitlab@master

3 files changed, 56 insertions, 2 deletions

diff --git a/app/services/clusters/agent_tokens/create_service.rb b/app/services/clusters/agent_tokens/create_service.rb
index 5b8a0e46a6c..2539ffdc5ba 100644
--- a/app/services/clusters/agent_tokens/create_service.rb
+++ b/app/services/clusters/agent_tokens/create_service.rb
@@ -30,13 +30,14 @@ module Clusters
       end
 
       def log_activity_event!(token)
-        token.agent.activity_events.create!(
+        Clusters::Agents::CreateActivityEventService.new(
+          token.agent,
           kind: :token_created,
           level: :info,
           recorded_at: token.created_at,
           user: current_user,
           agent_token: token
-        )
+        ).execute
       end
     end
   end
diff --git a/app/services/clusters/agents/create_activity_event_service.rb b/app/services/clusters/agents/create_activity_event_service.rb
new file mode 100644
index 00000000000..886dddf1a52
--- /dev/null
+++ b/app/services/clusters/agents/create_activity_event_service.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Clusters
+  module Agents
+    class CreateActivityEventService
+      def initialize(agent, **params)
+        @agent = agent
+        @params = params
+      end
+
+      def execute
+        agent.activity_events.create!(params)
+
+        DeleteExpiredEventsWorker.perform_at(schedule_cleanup_at, agent.id)
+
+        ServiceResponse.success
+      end
+
+      private
+
+      attr_reader :agent, :params
+
+      def schedule_cleanup_at
+        1.hour.from_now.change(min: agent.id % 60)
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/agents/delete_expired_events_service.rb b/app/services/clusters/agents/delete_expired_events_service.rb
new file mode 100644
index 00000000000..a0c0291c1fb
--- /dev/null
+++ b/app/services/clusters/agents/delete_expired_events_service.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Clusters
+  module Agents
+    class DeleteExpiredEventsService
+      def initialize(agent)
+        @agent = agent
+      end
+
+      def execute
+        agent.activity_events
+          .recorded_before(remove_events_before)
+          .each_batch { |batch| batch.delete_all }
+      end
+
+      private
+
+      attr_reader :agent
+
+      def remove_events_before
+        agent.activity_event_deletion_cutoff
+      end
+    end
+  end
+end