From d30dd07e8a618051e88fd73826f3831b6bbcf7b8 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 24 Sep 2020 15:36:59 +0200
Subject: [PATCH] [7.x] [CSM] fix ingest data retry order messed up (#78163)
 (#78405)

---
 x-pack/plugins/apm/e2e/ingest-data/replay.js | 55 +++++++++++---------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/x-pack/plugins/apm/e2e/ingest-data/replay.js b/x-pack/plugins/apm/e2e/ingest-data/replay.js
index 6bab95635f558..74c86b1b09ab4 100644
--- a/x-pack/plugins/apm/e2e/ingest-data/replay.js
+++ b/x-pack/plugins/apm/e2e/ingest-data/replay.js
@@ -70,34 +70,40 @@ function incrementSpinnerCount({ success }) {
 }
 let iterIndex = 0;
 
+function setItemMetaAndHeaders(item) {
+  const headers = {
+    'content-type': 'application/x-ndjson',
+  };
+
+  if (SECRET_TOKEN) {
+    headers.Authorization = `Bearer ${SECRET_TOKEN}`;
+  }
+
+  if (item.url === '/intake/v2/rum/events') {
+    if (iterIndex === userAgents.length) {
+      // set some event agent to opbean
+      setRumAgent(item);
+      iterIndex = 0;
+    }
+    headers['User-Agent'] = userAgents[iterIndex];
+    headers['X-Forwarded-For'] = userIps[iterIndex];
+    iterIndex++;
+  }
+  return headers;
+}
+
 function setRumAgent(item) {
-  item.body = item.body.replace(
-    '"name":"client"',
-    '"name":"opbean-client-rum"'
-  );
+  if (item.body) {
+    item.body = item.body.replace(
+      '"name":"client"',
+      '"name":"opbean-client-rum"'
+    );
+  }
 }
 
-async function insertItem(item) {
+async function insertItem(item, headers) {
   try {
     const url = `${APM_SERVER_URL}${item.url}`;
-    const headers = {
-      'content-type': 'application/x-ndjson',
-    };
-
-    if (item.url === '/intake/v2/rum/events') {
-      if (iterIndex === userAgents.length) {
-        // set some event agent to opbean
-        setRumAgent(item);
-        iterIndex = 0;
-      }
-      headers['User-Agent'] = userAgents[iterIndex];
-      headers['X-Forwarded-For'] = userIps[iterIndex];
-      iterIndex++;
-    }
-
-    if (SECRET_TOKEN) {
-      headers.Authorization = `Bearer ${SECRET_TOKEN}`;
-    }
 
     await axios({
       method: item.method,
@@ -133,8 +139,9 @@ async function init() {
   await Promise.all(
     items.map(async (item) => {
       try {
+        const headers = setItemMetaAndHeaders(item);
         // retry 5 times with exponential backoff
-        await pRetry(() => limit(() => insertItem(item)), {
+        await pRetry(() => limit(() => insertItem(item, headers)), {
           retries: 5,
         });
         incrementSpinnerCount({ success: true });