Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 12 insertions, 27 deletions

diff --git a/app/services/ci/archive_trace_service.rb b/app/services/ci/archive_trace_service.rb
index 4b62580e670..e370f85fa96 100644
--- a/app/services/ci/archive_trace_service.rb
+++ b/app/services/ci/archive_trace_service.rb
@@ -45,29 +45,12 @@ module Ci
         return
       end
 
-      # TODO: Remove this logging once we confirmed new live trace architecture is functional.
-      # See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/4667.
-      unless job.has_live_trace?
-        Sidekiq.logger.warn(class: worker_name,
-                            message: 'The job does not have live trace but going to be archived.',
-                            job_id: job.id)
-        return
-      end
-
       job.trace.archive!
       job.remove_pending_state!
 
       if job.job_artifacts_trace.present?
         job.project.execute_integrations(Gitlab::DataBuilder::ArchiveTrace.build(job), :archive_trace_hooks)
       end
-
-      # TODO: Remove this logging once we confirmed new live trace architecture is functional.
-      # See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/4667.
-      unless job.has_archived_trace?
-        Sidekiq.logger.warn(class: worker_name,
-                            message: 'The job does not have archived trace after archiving.',
-                            job_id: job.id)
-      end
     rescue ::Gitlab::Ci::Trace::AlreadyArchivedError
       # It's already archived, thus we can safely ignore this exception.
     rescue StandardError => e
@@ -84,21 +67,23 @@ module Ci
 
     def failed_archive_counter
       @failed_archive_counter ||=
-        Gitlab::Metrics.counter(:job_trace_archive_failed_total,
-                                "Counter of failed attempts of trace archiving")
+        Gitlab::Metrics.counter(:job_trace_archive_failed_total, "Counter of failed attempts of trace archiving")
     end
 
     def archive_error(error, job, worker_name)
       failed_archive_counter.increment
 
-      Sidekiq.logger.warn(class: worker_name,
-                          message: "Failed to archive trace. message: #{error.message}.",
-                          job_id: job.id)
-
-      Gitlab::ErrorTracking
-        .track_and_raise_for_dev_exception(error,
-                          issue_url: 'https://gitlab.com/gitlab-org/gitlab-foss/issues/51502',
-                          job_id: job.id)
+      Sidekiq.logger.warn(
+        class: worker_name,
+        message: "Failed to archive trace. message: #{error.message}.",
+        job_id: job.id
+      )
+
+      Gitlab::ErrorTracking.track_and_raise_for_dev_exception(
+        error,
+        issue_url: 'https://gitlab.com/gitlab-org/gitlab-foss/issues/51502',
+        job_id: job.id
+      )
     end
   end
 end