1 files changed, 14 insertions, 6 deletions
diff --git a/lib/gitlab/ci/config/entry/root.rb b/lib/gitlab/ci/config/entry/root.rb
index a30e6a0d9c3..a3d57ab6ac6 100644
--- a/lib/gitlab/ci/config/entry/root.rb
+++ b/lib/gitlab/ci/config/entry/root.rb
@@ -50,7 +50,7 @@ module Gitlab
 
           entry :variables, Entry::Variables,
             description: 'Environment variables that will be used.',
-            metadata: { allowed_value_data: %i[value description expand], allow_array_value: true },
+            metadata: { allowed_value_data: %i[value description expand options] },
             reserved: true
 
           entry :stages, Entry::Stages,
@@ -103,12 +103,16 @@ module Gitlab
 
           # rubocop: disable CodeReuse/ActiveRecord
           def compose_jobs!
-            factory = ::Gitlab::Config::Entry::Factory.new(Entry::Jobs)
-              .value(jobs_config)
-              .with(key: :jobs, parent: self,
-                    description: 'Jobs definition for this pipeline')
+            factory = logger.instrument(:config_root_compose_jobs_factory, once: true) do
+              ::Gitlab::Config::Entry::Factory.new(Entry::Jobs)
+                .value(jobs_config)
+                .with(key: :jobs, parent: self,
+                      description: 'Jobs definition for this pipeline')
+            end
 
-            @entries[:jobs] = factory.create!
+            @entries[:jobs] = logger.instrument(:config_root_compose_jobs_create, once: true) do
+              factory.create!
+            end
           end
           # rubocop: enable CodeReuse/ActiveRecord
 
@@ -123,6 +127,10 @@ module Gitlab
 
             @config = @config.except(*@jobs_config.keys)
           end
+
+          def logger
+            metadata[:logger]
+          end
         end
       end
     end