Chore: PreProd Merge Conflict Resolution

Author: KrishnaSuravarapu

bin/accessibility-automation/helper.js

@@ -8,6 +8,7 @@ const os = require('os');
 const glob = require('glob');
 const helper = require('../helpers/helper');
 const { CYPRESS_V10_AND_ABOVE_CONFIG_FILE_EXTENSIONS } = require('../helpers/constants');
+const { consoleHolder } = require("../testObservability/helper/constants");
 const supportFileContentMap = {}
 const HttpsProxyAgent = require('https-proxy-agent');
 
@@ -161,6 +162,7 @@ const nodeRequest = (type, url, data, config) => {
     }
 
     axios(options).then(response => {
+      consoleHolder.log("Resp2->", response);
       if(!(response.status == 201 || response.status == 200)) {
           logger.info("response.status in nodeRequest", response.status);
           reject(response && response.data ? response.data : `Received response from BrowserStack Server with status : ${response.status}`);
@@ -177,6 +179,7 @@ const nodeRequest = (type, url, data, config) => {
           });
       }
     }).catch(error => {
+
         logger.info("error in nodeRequest", error);
         reject(error);
     })

bin/helpers/atsHelper.js

@@ -1,5 +1,6 @@
 const path = require('path');
-const fs = require('fs')
+const fs = require('fs');
+const { consoleHolder } = require('../testObservability/helper/constants');
 
 const axios = require('axios'),
       logger = require('./logger').winstonLogger,
@@ -58,6 +59,7 @@ exports.getTurboScaleGridDetails = async (bsConfig, args, rawArgs) => {
             };
             let responseData = {};
             axios(options).then(response => {
+              consoleHolder.log("Resp1->", response);
               try {
                 responseData = response.data;
               } catch (e) {

bin/testObservability/crashReporter/index.js

@@ -165,6 +165,8 @@ class CrashReporter {
 
       axios(options)
           .then(response => {
+              consoleHolder.log("Resp3->", response);
+
               if(response.status != 200) {
                 debug(`[Crash_Report_Upload] Failed due to ${response && response.data ? response.data : `Received response from BrowserStack Server with status : ${response.status}`}`);
               } else {

bin/testObservability/helper/helper.js

@@ -122,13 +122,15 @@ const nodeRequest = (type, url, data, config) => {
         ...config,
         method: type,
         url: `${API_URL}/${url}`,
-        data: data, 
+        data: data,
         httpsAgent: this.httpsKeepAliveAgent,  
         maxAttempts: 2,
         headers: {
-          'Content-Type': 'application/json',
-          ...config.headers 
-        }
+          ...config.headers,
+          'Content-Type': 'application/json;charset=utf-8',
+          "X-Forwarded-For": "127.0.0.1"
+        },
+        clientIp: "127.0.0.1"
       };
 
       if(process.env.HTTP_PROXY){
@@ -140,15 +142,21 @@ const nodeRequest = (type, url, data, config) => {
       if(url === exports.requestQueueHandler.screenshotEventUrl) {
           options.agent = httpsScreenshotsKeepAliveAgent;
       }
+      consoleHolder.log("Vals-->", JSON.stringify(options));
+      consoleHolder.log("Vals-->", JSON.stringify(options.url));
       axios(options)
         .then(response => {
+          consoleHolder.log("Resp-->", response, typeof response.data, response.data);
+          // exports.debugOnConsole(`Resp-->: ${JSON.stringify(response)}`);
+
           if(response.status != 200) {
               reject(response && response.data ? response.data : `Received response from BrowserStack Server with status : ${response.status}`);
           } else {
             try {
               const responseBody = typeof response.data === 'object' ? response.data : JSON.parse(response.data);
               resolve({ data: responseBody });
             } catch (error) {
+              consoleHolder.log("Url-->", url, url.includes('/stop'));
               if (!url.includes('/stop')) {
                 reject('Not a JSON response from BrowserStack Server');
               } else {
@@ -158,6 +166,8 @@ const nodeRequest = (type, url, data, config) => {
           }
         })
         .catch(error => {
+          // exports.debugOnConsole(`Error-->: ${JSON.stringify(error)}`);
+          consoleHolder.log("Error-->", JSON.stringify(error));
           reject(error)
         });
     });
@@ -491,7 +501,7 @@ exports.batchAndPostEvents = async (eventUrl, kind, data) => {
       'Authorization': `Bearer ${process.env.BS_TESTOPS_JWT}`,
       'Content-Type': 'application/json',
       'X-BSTACK-TESTOPS': 'true'
-    }
+    } 
   };
 
   try {
@@ -558,7 +568,7 @@ exports.uploadEventData = async (eventData, run=0) => {
       const config = {
         headers: {
           'Authorization': `Bearer ${process.env.BS_TESTOPS_JWT}`,
-          'Content-Type': 'application/json',
+          'Content-Type': 'application/json;charset=utf-8',
           'X-BSTACK-TESTOPS': 'true'
         }
       };