4 files changed, 12 insertions, 4 deletions
diff --git a/lib/gitlab/ci/config/external/file/local.rb b/lib/gitlab/ci/config/external/file/local.rb
index feb2cbb19ad..36fc5c656fc 100644
--- a/lib/gitlab/ci/config/external/file/local.rb
+++ b/lib/gitlab/ci/config/external/file/local.rb
@@ -42,7 +42,9 @@ module Gitlab
             end
 
             def fetch_local_content
-              context.project.repository.blob_data_at(context.sha, location)
+              context.logger.instrument(:config_file_fetch_local_content) do
+                context.project.repository.blob_data_at(context.sha, location)
+              end
             rescue GRPC::InvalidArgument
               errors.push("Sha #{context.sha} is not valid!")
 
diff --git a/lib/gitlab/ci/config/external/file/project.rb b/lib/gitlab/ci/config/external/file/project.rb
index 09c36a1bcb6..b7fef081269 100644
--- a/lib/gitlab/ci/config/external/file/project.rb
+++ b/lib/gitlab/ci/config/external/file/project.rb
@@ -65,7 +65,9 @@ module Gitlab
               return unless can_access_local_content?
               return unless sha
 
-              project.repository.blob_data_at(sha, location)
+              context.logger.instrument(:config_file_fetch_project_content) do
+                project.repository.blob_data_at(sha, location)
+              end
             rescue GRPC::NotFound, GRPC::Internal
               nil
             end
diff --git a/lib/gitlab/ci/config/external/file/remote.rb b/lib/gitlab/ci/config/external/file/remote.rb
index 7d3a2362246..3984bf9e4f8 100644
--- a/lib/gitlab/ci/config/external/file/remote.rb
+++ b/lib/gitlab/ci/config/external/file/remote.rb
@@ -40,7 +40,9 @@ module Gitlab
 
             def fetch_remote_content
               begin
-                response = Gitlab::HTTP.get(location)
+                response = context.logger.instrument(:config_file_fetch_remote_content) do
+                  Gitlab::HTTP.get(location)
+                end
               rescue SocketError
                 errors.push("Remote file `#{masked_location}` could not be fetched because of a socket error!")
               rescue Timeout::Error
diff --git a/lib/gitlab/ci/config/external/file/template.rb b/lib/gitlab/ci/config/external/file/template.rb
index 58b81b259cb..5fcf7c71bdf 100644
--- a/lib/gitlab/ci/config/external/file/template.rb
+++ b/lib/gitlab/ci/config/external/file/template.rb
@@ -52,7 +52,9 @@ module Gitlab
             end
 
             def fetch_template_content
-              Gitlab::Template::GitlabCiYmlTemplate.find(template_name, context.project)&.content
+              context.logger.instrument(:config_file_fetch_template_content) do
+                Gitlab::Template::GitlabCiYmlTemplate.find(template_name, context.project)&.content
+              end
             end
 
             def masked_raw