Merge branch 'cl-sidekiq-cid' into 'master'

Set Correlation ID as env when calling indexer

See merge request gitlab-org/gitlab!27184

ee/lib/gitlab/elastic/indexer.rb

@@ -84,6 +84,7 @@ module Gitlab
           'GITALY_CONNECTION_INFO'  => gitaly_connection_info,
           'FROM_SHA'                => from_sha,
           'TO_SHA'                  => to_sha,
+          'CORRELATION_ID'          => Labkit::Correlation::CorrelationId.current_id,
           'SSL_CERT_FILE'           => OpenSSL::X509::DEFAULT_CERT_FILE,
           'SSL_CERT_DIR'            => OpenSSL::X509::DEFAULT_CERT_DIR
         }

ee/spec/lib/gitlab/elastic/indexer_spec.rb

@@ -143,6 +143,7 @@ describe Gitlab::Elastic::Indexer do
           'GITALY_CONNECTION_INFO'  => gitaly_connection_data.to_json,
           'ELASTIC_CONNECTION_INFO' => elasticsearch_config.to_json,
           'RAILS_ENV'               => Rails.env,
+          'CORRELATION_ID'          => Labkit::Correlation::CorrelationId.current_id,
           'FROM_SHA'                => expected_from_sha,
           'TO_SHA'                  => to_sha
         )