Merge branch 'fa/remove-redundant-pipeline-logs' into 'master'

Remove redundant pipeline loggers See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103165 Merged-by: Marius Bobin <mbobin@gitlab.com> Approved-by: Marius Bobin <mbobin@gitlab.com> Co-authored-by: Avielle Wolfe <awolfe@gitlab.com> Co-authored-by: Furkan Ayhan <furkanayhn@gmail.com>

Merge branch 'fa/remove-redundant-pipeline-logs' into 'master'
Remove redundant pipeline loggers See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103165 Merged-by: Marius Bobin <mbobin@gitlab.com> Approved-by: Marius Bobin <mbobin@gitlab.com> Co-authored-by: Avielle Wolfe <awolfe@gitlab.com> Co-authored-by: Furkan Ayhan <furkanayhn@gmail.com>
ed0d2bd0 · Marius Bobin · 107eaa47 · 3101c871 · ed0d2bd0 · ed0d2bd0
--- a/lib/gitlab/ci/config/external/mapper.rb
+++ b/lib/gitlab/ci/config/external/mapper.rb
@@ -52,14 +52,8 @@ def process_without_instrumentation
              .each(&method(:verify!))
          end

-          def normalize_location(location)
-            logger.instrument(:config_mapper_normalize) do
-              normalize_location_without_instrumentation(location)
-            end
-          end
-
          # convert location if String to canonical form
-          def normalize_location_without_instrumentation(location)
+          def normalize_location(location)
            if location.is_a?(String)
              expanded_location = expand_variables(location)
              normalize_location_string(expanded_location)

--- a/lib/gitlab/ci/config/external/processor.rb
+++ b/lib/gitlab/ci/config/external/processor.rb
@@ -32,9 +32,7 @@ def perform

          def validate_external_files!
            @external_files.each do |file|
-              logger.instrument(:config_external_verify) do
-                raise IncludeError, file.error_message unless file.valid?
-              end
+              raise IncludeError, file.error_message unless file.valid?
            end
          end


--- a/lib/gitlab/ci/pipeline/chain/seed.rb
+++ b/lib/gitlab/ci/pipeline/chain/seed.rb
@@ -62,12 +62,10 @@ def context

          def root_variables
            strong_memoize(:root_variables) do
-              logger.instrument(:pipeline_seed_merge_variables, once: true) do
-                ::Gitlab::Ci::Variables::Helpers.merge_variables(
-                  @command.yaml_processor_result.root_variables,
-                  @command.workflow_rules_result.variables
-                )
-              end
+              ::Gitlab::Ci::Variables::Helpers.merge_variables(
+                @command.yaml_processor_result.root_variables,
+                @command.workflow_rules_result.variables
+              )
            end
          end
        end