Disable support for legacy traces

2 files changed, 5 insertions, 1 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 1bd517641ac..91af564c5e0 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -541,7 +541,7 @@ module Ci
     end
 
     def has_old_trace?
-      old_trace.present?
+      Feature.enabled?(:ci_enable_legacy_traces, project) && old_trace.present?
     end
 
     def trace=(data)
@@ -549,6 +549,8 @@ module Ci
     end
 
     def old_trace
+      return unless Feature.enabled?(:ci_enable_legacy_traces, project)
+
       read_attribute(:trace)
     end
 
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index bf5f2a31f0e..f64f167a991 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -228,6 +228,8 @@ module Gitlab
       end
 
       def deprecated_path
+        return unless Feature.enabled?(:ci_enable_legacy_traces, job.project)
+
         File.join(
           Settings.gitlab_ci.builds_path,
           job.created_at.utc.strftime("%Y_%m"),