Make ArchiveTraceService inherit from BaseServicemake-archivetraceservice-inherit-from-baseservice-in-order-to-use-structured-logging

fix

add changelog

fix

6 files changed, 13 insertions, 6 deletions

diff --git a/app/services/ci/archive_trace_service.rb b/app/services/ci/archive_trace_service.rb
index a1dd00721b5..2bbbfd3cb0d 100644
--- a/app/services/ci/archive_trace_service.rb
+++ b/app/services/ci/archive_trace_service.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ci
-  class ArchiveTraceService
+  class ArchiveTraceService < BaseService
     def execute(job)
       job.trace.archive!
     rescue ::Gitlab::Ci::Trace::AlreadyArchivedError
@@ -24,7 +24,7 @@ module Ci
 
     def archive_error(error, job)
       failed_archive_counter.increment
-      Rails.logger.error "Failed to archive trace. id: #{job.id} message: #{error.message}"
+      log_error("Failed to archive trace. id: #{job.id} message: #{error.message}")
 
       Gitlab::Sentry
         .track_exception(error,
diff --git a/app/workers/archive_trace_worker.rb b/app/workers/archive_trace_worker.rb
index 4a9becf0ca7..39b8535c42a 100644
--- a/app/workers/archive_trace_worker.rb
+++ b/app/workers/archive_trace_worker.rb
@@ -7,7 +7,7 @@ class ArchiveTraceWorker
   # rubocop: disable CodeReuse/ActiveRecord
   def perform(job_id)
     Ci::Build.without_archived_trace.find_by(id: job_id).try do |job|
-      Ci::ArchiveTraceService.new.execute(job)
+      Ci::ArchiveTraceService.new(job.project, job.user).execute(job)
     end
   end
   # rubocop: enable CodeReuse/ActiveRecord
diff --git a/app/workers/ci/archive_traces_cron_worker.rb b/app/workers/ci/archive_traces_cron_worker.rb
index f65ff239866..72325718a1a 100644
--- a/app/workers/ci/archive_traces_cron_worker.rb
+++ b/app/workers/ci/archive_traces_cron_worker.rb
@@ -11,7 +11,7 @@ module Ci
       # This could happen when ArchiveTraceWorker sidekiq jobs were lost by receiving SIGKILL
       # More details in https://gitlab.com/gitlab-org/gitlab-ce/issues/36791
       Ci::Build.finished.with_live_trace.find_each(batch_size: 100) do |build|
-        Ci::ArchiveTraceService.new.execute(build)
+        Ci::ArchiveTraceService.new(build.project, build.user).execute(build)
       end
     end
     # rubocop: enable CodeReuse/ActiveRecord
diff --git a/changelogs/unreleased/make-archivetraceservice-inherit-from-baseservice-in-order-to-use-structured-logging.yml b/changelogs/unreleased/make-archivetraceservice-inherit-from-baseservice-in-order-to-use-structured-logging.yml
new file mode 100644
index 00000000000..cfb7bd86b1e
--- /dev/null
+++ b/changelogs/unreleased/make-archivetraceservice-inherit-from-baseservice-in-order-to-use-structured-logging.yml
@@ -0,0 +1,6 @@
+---
+title: Make ArchiveTraceService inherit from BaseService in order to use structured
+  logging
+merge_request: 24222
+author:
+type: other
diff --git a/spec/services/ci/archive_trace_service_spec.rb b/spec/services/ci/archive_trace_service_spec.rb
index 8e9cb65f3bc..d030268d2b7 100644
--- a/spec/services/ci/archive_trace_service_spec.rb
+++ b/spec/services/ci/archive_trace_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Ci::ArchiveTraceService, '#execute' do
-  subject { described_class.new.execute(job) }
+  subject { described_class.new(job.project, job.user).execute(job) }
 
   context 'when job is finished' do
     let(:job) { create(:ci_build, :success, :trace_live) }
diff --git a/spec/workers/ci/archive_traces_cron_worker_spec.rb b/spec/workers/ci/archive_traces_cron_worker_spec.rb
index 478fb7d2c0f..cd2f8c8da8f 100644
--- a/spec/workers/ci/archive_traces_cron_worker_spec.rb
+++ b/spec/workers/ci/archive_traces_cron_worker_spec.rb
@@ -58,7 +58,8 @@ describe Ci::ArchiveTracesCronWorker do
       end
 
       it 'puts a log' do
-        expect(Rails.logger).to receive(:error).with("Failed to archive trace. id: #{build.id} message: Unexpected error")
+        expect(Gitlab::AppLogger)
+          .to receive(:error).with("Failed to archive trace. id: #{build.id} message: Unexpected error")
 
         subject
       end