@wdio/browserstack-service 9.2.8 → 9.2.12

package/build/index.js

@@ -9,7 +9,7 @@ import { v4 as uuidv4 } from "uuid";
 import fs11 from "node:fs";
 import { readFile } from "node:fs/promises";
 import path11 from "node:path";
-import { promisify as promisify2, format } from "node:util";
+import { promisify as promisify2, format as format3 } from "node:util";
 import { performance as performance2, PerformanceObserver as PerformanceObserver2 } from "node:perf_hooks";
 import os5 from "node:os";
 import { SevereServiceError } from "webdriverio";
@@ -24,7 +24,7 @@ import { performance, PerformanceObserver } from "node:perf_hooks";
 import { hostname, platform, type, version, arch } from "node:os";
 import fs3 from "node:fs";
 import zlib from "node:zlib";
-import { promisify } from "node:util";
+import { format, promisify } from "node:util";
 import path3 from "node:path";
 import util from "node:util";
 import gitRepoInfo from "git-repo-info";
@@ -78,7 +78,7 @@ var logPatcher_default = logPatcher;
 // package.json
 var package_default = {
   name: "@wdio/browserstack-service",
-  version: "9.2.6",
+  version: "9.2.11",
   description: "WebdriverIO service for better Browserstack integration",
   author: "Adam Bjerstedt <abjerstedt@gmail.com>",
   homepage: "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-browserstack-service",
@@ -174,7 +174,6 @@ var DATA_BATCH_INTERVAL = 2e3;
 var DEFAULT_WAIT_TIMEOUT_FOR_PENDING_UPLOADS = 5e3;
 var DEFAULT_WAIT_INTERVAL_FOR_PENDING_UPLOADS = 100;
 var BSTACK_SERVICE_VERSION = bstackServiceVersion;
-var ACCESSIBILITY_API_URL = "https://accessibility.browserstack.com/api";
 var NOT_ALLOWED_KEYS_IN_CAPS = ["includeTagsInTestingScope", "excludeTagsInTestingScope"];
 var LOGS_FILE = "logs/bstack-wdio-service.log";
 var UPLOAD_LOGS_ADDRESS = "https://upload-observability.browserstack.com";
@@ -203,14 +202,18 @@ var TCG_INFO = {
   tcgRegion: "use",
   tcgUrl: TCG_URL
 };
-var TESTOPS_JWT_ENV = "BS_TESTOPS_JWT";
+var BROWSERSTACK_TESTHUB_JWT = "BROWSERSTACK_TESTHUB_JWT";
 var BSTACK_TCG_AUTH_RESULT = "BSTACK_TCG_AUTH_RESULT";
 var TESTOPS_SCREENSHOT_ENV = "BS_TESTOPS_ALLOW_SCREENSHOTS";
-var TESTOPS_BUILD_ID_ENV = "BS_TESTOPS_BUILD_HASHED_ID";
+var BROWSERSTACK_TESTHUB_UUID = "BROWSERSTACK_TESTHUB_UUID";
+var TEST_ANALYTICS_ID = "TEST_ANALYTICS_ID";
 var PERF_MEASUREMENT_ENV = "BROWSERSTACK_O11Y_PERF_MEASUREMENT";
 var RERUN_TESTS_ENV = "BROWSERSTACK_RERUN_TESTS";
 var RERUN_ENV = "BROWSERSTACK_RERUN";
 var TESTOPS_BUILD_COMPLETED_ENV = "BS_TESTOPS_BUILD_COMPLETED";
+var BROWSERSTACK_PERCY = "BROWSERSTACK_PERCY";
+var BROWSERSTACK_ACCESSIBILITY = "BROWSERSTACK_ACCESSIBILITY";
+var BROWSERSTACK_OBSERVABILITY = "BROWSERSTACK_OBSERVABILITY";
 var MAX_GIT_META_DATA_SIZE_IN_BYTES = 64 * 1024;
 var GIT_META_DATA_TRUNCATED = "...[TRUNCATED]";
 
@@ -283,6 +286,62 @@ var BStackLogger = class {
   }
 };
 
+// src/testHub/utils.ts
+var getProductMap = (config) => {
+  return {
+    "observability": config.testObservability.enabled,
+    "accessibility": config.accessibility,
+    "percy": config.percy,
+    "automate": config.automate,
+    "app_automate": config.appAutomate
+  };
+};
+var shouldProcessEventForTesthub = (eventType) => {
+  if (isTrue(process.env[BROWSERSTACK_OBSERVABILITY])) {
+    return true;
+  }
+  if (isTrue(process.env[BROWSERSTACK_ACCESSIBILITY])) {
+    return !["HookRunStarted", "HookRunFinished", "LogCreated"].includes(eventType);
+  }
+  if (isTrue(process.env[BROWSERSTACK_PERCY]) && eventType) {
+    return false;
+  }
+  return Boolean(process.env[BROWSERSTACK_ACCESSIBILITY] || process.env[BROWSERSTACK_OBSERVABILITY] || process.env[BROWSERSTACK_PERCY]);
+};
+var handleErrorForObservability = (error) => {
+  process.env[BROWSERSTACK_OBSERVABILITY] = "false";
+  logBuildError(error, "observability");
+};
+var handleErrorForAccessibility = (error) => {
+  process.env[BROWSERSTACK_ACCESSIBILITY] = "false";
+  logBuildError(error, "accessibility");
+};
+var logBuildError = (error, product = "") => {
+  if (!error || !error.errors) {
+    BStackLogger.error(`${product.toUpperCase()} Build creation failed ${error}`);
+    return;
+  }
+  for (const errorJson of error.errors) {
+    const errorType = errorJson.key;
+    const errorMessage = errorJson.message;
+    if (errorMessage) {
+      switch (errorType) {
+        case "ERROR_INVALID_CREDENTIALS":
+          BStackLogger.error(errorMessage);
+          break;
+        case "ERROR_ACCESS_DENIED":
+          BStackLogger.info(errorMessage);
+          break;
+        case "ERROR_SDK_DEPRECATED":
+          BStackLogger.error(errorMessage);
+          break;
+        default:
+          BStackLogger.error(errorMessage);
+      }
+    }
+  }
+};
+
 // src/crash-reporter.ts
 var CrashReporter = class {
   /* User test config for build run minus PII */
@@ -332,7 +391,7 @@ var CrashReporter = class {
       this.userConfigForReporting = {};
     }
     const data = {
-      hashed_id: process.env[TESTOPS_BUILD_ID_ENV],
+      hashed_id: process.env[BROWSERSTACK_TESTHUB_UUID],
       observability_version: {
         frameworkName: "WebdriverIO-" + (this.userConfigForReporting.framework || "null"),
         sdkVersion: BSTACK_SERVICE_VERSION
@@ -859,20 +918,6 @@ function o11yErrorHandler(fn) {
     }
   };
 }
-function errorHandler(fn) {
-  return function(...args) {
-    try {
-      const functionToHandle = fn;
-      const result = functionToHandle(...args);
-      if (result instanceof Promise) {
-        return result.catch((error) => BStackLogger.error(`Error in executing ${fn.name} with args ${args}: ${error}`));
-      }
-      return result;
-    } catch (error) {
-      BStackLogger.error(`Error in executing ${fn.name} with args ${args}: ${error}`);
-    }
-  };
-}
 async function nodeRequest(requestType, apiEndpoint, options, apiUrl, timeout = 12e4) {
   try {
     const controller = new AbortController();
@@ -885,6 +930,7 @@ async function nodeRequest(requestType, apiEndpoint, options, apiUrl, timeout =
     clearTimeout(timeoutId);
     return await response.json();
   } catch (error) {
+    BStackLogger.debug(`Error in firing request ${apiUrl}/${apiEndpoint}: ${format(error)}`);
     const isLogUpload = apiEndpoint === UPLOAD_LOGS_ENDPOINT;
     if (error && error.response) {
       const errorMessageJson = error.response.body ? JSON.parse(error.response.body.toString()) : null;
@@ -934,7 +980,65 @@ function o11yClassErrorHandler(errorClass) {
   });
   return errorClass;
 }
-var launchTestSession = o11yErrorHandler(async function launchTestSession2(options, config, bsConfig) {
+var processTestObservabilityResponse = (response) => {
+  if (!response.observability) {
+    handleErrorForObservability(null);
+    return;
+  }
+  if (!response.observability.success) {
+    handleErrorForObservability(response.observability);
+    return;
+  }
+  process.env[BROWSERSTACK_OBSERVABILITY] = "true";
+  if (response.observability.options.allow_screenshots) {
+    process.env[TESTOPS_SCREENSHOT_ENV] = response.observability.options.allow_screenshots.toString();
+  }
+};
+var jsonifyAccessibilityArray = (dataArray, keyName, valueName) => {
+  const result = {};
+  dataArray.forEach((element) => {
+    result[element[keyName]] = element[valueName];
+  });
+  return result;
+};
+var processAccessibilityResponse = (response) => {
+  if (!response.accessibility) {
+    handleErrorForAccessibility(null);
+    return;
+  }
+  if (!response.accessibility.success) {
+    handleErrorForAccessibility(response.accessibility);
+    return;
+  }
+  if (response.accessibility.options) {
+    const { accessibilityToken, scannerVersion } = jsonifyAccessibilityArray(response.accessibility.options.capabilities, "name", "value");
+    const scriptsJson = {
+      "scripts": jsonifyAccessibilityArray(response.accessibility.options.scripts, "name", "command"),
+      "commands": response.accessibility.options.commandsToWrap.commands
+    };
+    if (scannerVersion) {
+      process.env.BSTACK_A11Y_SCANNER_VERSION = scannerVersion;
+    }
+    BStackLogger.debug(`Accessibility scannerVersion ${scannerVersion}`);
+    if (accessibilityToken) {
+      process.env.BSTACK_A11Y_JWT = accessibilityToken;
+      process.env[BROWSERSTACK_ACCESSIBILITY] = "true";
+    }
+    if (scriptsJson) {
+      accessibility_scripts_default.update(scriptsJson);
+      accessibility_scripts_default.store();
+    }
+  }
+};
+var processLaunchBuildResponse = (response, options) => {
+  if (options.testObservability) {
+    processTestObservabilityResponse(response);
+  }
+  if (options.accessibility) {
+    processAccessibilityResponse(response);
+  }
+};
+var launchTestSession = o11yErrorHandler(async function launchTestSession2(options, config, bsConfig, bStackConfig) {
   const launchBuildUsage = usageStats_default.getInstance().launchBuildUsage;
   launchBuildUsage.triggered();
   const data = {
@@ -942,7 +1046,7 @@ var launchTestSession = o11yErrorHandler(async function launchTestSession2(optio
     project_name: getObservabilityProject(options, bsConfig.projectName),
     name: getObservabilityBuild(options, bsConfig.buildName),
     build_identifier: bsConfig.buildIdentifier,
-    start_time: (/* @__PURE__ */ new Date()).toISOString(),
+    started_at: (/* @__PURE__ */ new Date()).toISOString(),
     tags: getObservabilityBuildTags(options, bsConfig.buildTag),
     host_info: {
       hostname: hostname(),
@@ -955,10 +1059,21 @@ var launchTestSession = o11yErrorHandler(async function launchTestSession2(optio
     build_run_identifier: process.env.BROWSERSTACK_BUILD_RUN_IDENTIFIER,
     failed_tests_rerun: process.env[RERUN_ENV] || false,
     version_control: await getGitMetaData(),
-    observability_version: {
+    accessibility: {
+      settings: options.accessibilityOptions
+    },
+    browserstackAutomation: shouldAddServiceVersion(config, options.testObservability),
+    framework_details: {
       frameworkName: "WebdriverIO-" + config.framework,
-      sdkVersion: bsConfig.bstackServiceVersion
+      frameworkVersion: bsConfig.bstackServiceVersion,
+      sdkVersion: bsConfig.bstackServiceVersion,
+      language: "ECMAScript",
+      testFramework: {
+        name: "WebdriverIO",
+        version: bsConfig.bstackServiceVersion
+      }
     },
+    product_map: getProductMap(bStackConfig),
     config: {}
   };
   try {
@@ -970,7 +1085,7 @@ var launchTestSession = o11yErrorHandler(async function launchTestSession2(optio
   }
   data.config = CrashReporter.userConfigForReporting;
   try {
-    const url3 = `${DATA_ENDPOINT}/api/v1/builds`;
+    const url3 = `${DATA_ENDPOINT}/api/v2/builds`;
     const encodedAuth = Buffer.from(`${getObservabilityUser(options, config)}:${getObservabilityKey(options, config)}`, "utf8").toString("base64");
     const headers = {
       ...DEFAULT_REQUEST_CONFIG.headers,
@@ -985,36 +1100,20 @@ var launchTestSession = o11yErrorHandler(async function launchTestSession2(optio
     BStackLogger.debug(`[Start_Build] Success response: ${JSON.stringify(jsonResponse)}`);
     process.env[TESTOPS_BUILD_COMPLETED_ENV] = "true";
     if (jsonResponse.jwt) {
-      process.env[TESTOPS_JWT_ENV] = jsonResponse.jwt;
-      launchBuildUsage.success();
+      process.env[BROWSERSTACK_TESTHUB_JWT] = jsonResponse.jwt;
     }
     if (jsonResponse.build_hashed_id) {
-      process.env[TESTOPS_BUILD_ID_ENV] = jsonResponse.build_hashed_id;
+      process.env[BROWSERSTACK_TESTHUB_UUID] = jsonResponse.build_hashed_id;
       testOpsConfig_default.getInstance().buildHashedId = jsonResponse.build_hashed_id;
     }
-    if (jsonResponse.allow_screenshots) {
-      process.env[TESTOPS_SCREENSHOT_ENV] = jsonResponse.allow_screenshots.toString();
-    }
+    processLaunchBuildResponse(jsonResponse, options);
+    launchBuildUsage.success();
   } catch (error) {
-    launchBuildUsage.failed(error);
-    if (error && error.response) {
-      const errorMessageJson = error.response.body ? JSON.parse(error.response.body.toString()) : null;
-      const errorMessage = errorMessageJson ? errorMessageJson.message : null, errorType = errorMessageJson ? errorMessageJson.errorType : null;
-      switch (errorType) {
-        case "ERROR_INVALID_CREDENTIALS":
-          BStackLogger.error(errorMessage);
-          break;
-        case "ERROR_ACCESS_DENIED":
-          BStackLogger.info(errorMessage);
-          break;
-        case "ERROR_SDK_DEPRECATED":
-          BStackLogger.error(errorMessage);
-          break;
-        default:
-          BStackLogger.error(errorMessage);
-      }
-    } else {
-      BStackLogger.error(`Data upload to BrowserStack Test Observability failed due to ${error}. Cause : ${error.cause}`);
+    BStackLogger.debug(`TestHub build start failed: ${format(error)}`);
+    if (!error.success) {
+      launchBuildUsage.failed(error);
+      logBuildError(error);
+      return;
     }
   }
 });
@@ -1072,90 +1171,6 @@ var isAccessibilityAutomationSession = (accessibilityFlag) => {
   }
   return false;
 };
-var createAccessibilityTestRun = errorHandler(async function createAccessibilityTestRun2(options, config, bsConfig) {
-  const userName = getBrowserStackUser(config);
-  const accessKey = getBrowserStackKey(config);
-  if (isUndefined(userName) || isUndefined(accessKey)) {
-    BStackLogger.error("Exception while creating test run for BrowserStack Accessibility Automation: Missing BrowserStack credentials");
-    return null;
-  }
-  const data = {
-    "projectName": bsConfig.projectName,
-    "buildName": bsConfig.buildName || path3.basename(path3.resolve(process.cwd())),
-    "startTime": (/* @__PURE__ */ new Date()).toISOString(),
-    "description": "",
-    "source": {
-      frameworkName: "WebdriverIO-" + config.framework,
-      frameworkVersion: bsConfig.bstackServiceVersion,
-      sdkVersion: bsConfig.bstackServiceVersion,
-      language: "ECMAScript",
-      testFramework: "webdriverIO",
-      testFrameworkVersion: bsConfig.bstackServiceVersion
-    },
-    "settings": bsConfig.accessibilityOptions || {},
-    "versionControl": await getGitMetaData(),
-    "ciInfo": getCiInfo(),
-    "hostInfo": {
-      hostname: hostname(),
-      platform: platform(),
-      type: type(),
-      version: version(),
-      arch: arch()
-    },
-    "browserstackAutomation": true
-  };
-  const encodedAuth = Buffer.from(`${getBrowserStackUser(config)}:${getBrowserStackKey(config)}`, "utf8").toString("base64");
-  const headers = {
-    "Content-Type": "application/json; charset=utf-8",
-    Authorization: `Basic ${encodedAuth}`
-  };
-  const requestOptions = {
-    body: JSON.stringify(data),
-    headers
-  };
-  try {
-    const response = await nodeRequest(
-      "POST",
-      "v2/test_runs",
-      requestOptions,
-      ACCESSIBILITY_API_URL
-    );
-    BStackLogger.debug(`[Create Accessibility Test Run] Success response: ${JSON.stringify(response)}`);
-    if (response.data.accessibilityToken) {
-      process.env.BSTACK_A11Y_JWT = response.data.accessibilityToken;
-    }
-    if (response.data.id) {
-      process.env.BS_A11Y_TEST_RUN_ID = response.data.id;
-    }
-    BStackLogger.debug(`BrowserStack Accessibility Automation Test Run ID: ${response.data.id}`);
-    if (response.data) {
-      accessibility_scripts_default.update(response.data);
-      accessibility_scripts_default.store();
-    }
-    return response.data.scannerVersion;
-  } catch (error) {
-    if (error.response) {
-      BStackLogger.error(
-        `Exception while creating test run for BrowserStack Accessibility Automation: ${error.response.status} ${error.response.statusText} ${JSON.stringify(error.response.data)}`
-      );
-    } else {
-      const errorMessage = error.message;
-      if (errorMessage === "Invalid configuration passed.") {
-        BStackLogger.error(
-          `Exception while creating test run for BrowserStack Accessibility Automation: ${errorMessage || error.stack}`
-        );
-        for (const errorkey of error.errors) {
-          BStackLogger.error(errorkey.message);
-        }
-      } else {
-        BStackLogger.error(
-          `Exception while creating test run for BrowserStack Accessibility Automation: ${errorMessage || error.stack}`
-        );
-      }
-    }
-    return null;
-  }
-});
 var performA11yScan = async (browser, isBrowserStackSession, isAccessibility, commandName) => {
   if (!isBrowserStackSession) {
     BStackLogger.warn("Not a BrowserStack Automate session, cannot perform Accessibility scan.");
@@ -1211,50 +1226,6 @@ var getA11yResultsSummary = async (browser, isBrowserStackSession, isAccessibili
     return {};
   }
 };
-var stopAccessibilityTestRun = errorHandler(async function stopAccessibilityTestRun2() {
-  const hasA11yJwtToken = typeof process.env.BSTACK_A11Y_JWT === "string" && process.env.BSTACK_A11Y_JWT.length > 0 && process.env.BSTACK_A11Y_JWT !== "null" && process.env.BSTACK_A11Y_JWT !== "undefined";
-  if (!hasA11yJwtToken) {
-    return {
-      status: "error",
-      message: "Build creation had failed."
-    };
-  }
-  const data = {
-    "endTime": (/* @__PURE__ */ new Date()).toISOString()
-  };
-  const requestOptions = { ...{
-    json: data,
-    headers: {
-      "Authorization": `Bearer ${process.env.BSTACK_A11Y_JWT}`
-    }
-  } };
-  try {
-    const response = await nodeRequest(
-      "PUT",
-      "test_runs/stop",
-      requestOptions,
-      ACCESSIBILITY_API_URL
-    );
-    if (response.data && response.data.error) {
-      throw new Error("Invalid request: " + response.data.error);
-    } else if (response.error) {
-      throw new Error("Invalid request: " + response.error);
-    } else {
-      BStackLogger.info(`BrowserStack Accessibility Automation Test Run marked as completed at ${(/* @__PURE__ */ new Date()).toISOString()}`);
-      return { status: "success", message: "" };
-    }
-  } catch (error) {
-    if (error.response && error.response.status && error.response.statusText && error.response.data) {
-      BStackLogger.error(`Exception while marking completion of BrowserStack Accessibility Automation Test Run: ${error.response.status} ${error.response.statusText} ${JSON.stringify(error.response.data)}`);
-    } else {
-      BStackLogger.error(`Exception while marking completion of BrowserStack Accessibility Automation Test Run: ${error.message || util.format(error)}`);
-    }
-    return {
-      status: "error",
-      message: error.message || (error.response ? `${error.response.status}:${error.response.statusText}` : error)
-    };
-  }
-});
 var stopBuildUpstream = o11yErrorHandler(async function stopBuildUpstream2() {
   const stopBuildUsage = usageStats_default.getInstance().stopBuildUsage;
   stopBuildUsage.triggered();
@@ -1265,7 +1236,7 @@ var stopBuildUpstream = o11yErrorHandler(async function stopBuildUpstream2() {
       message: "Build is not completed yet"
     };
   }
-  if (!process.env[TESTOPS_JWT_ENV]) {
+  if (!process.env[BROWSERSTACK_TESTHUB_JWT]) {
     stopBuildUsage.failed("Token/buildID is undefined, build creation might have failed");
     BStackLogger.debug("[STOP_BUILD] Missing Authentication Token/ Build ID");
     return {
@@ -1277,12 +1248,12 @@ var stopBuildUpstream = o11yErrorHandler(async function stopBuildUpstream2() {
     "stop_time": (/* @__PURE__ */ new Date()).toISOString()
   };
   try {
-    const url3 = `${DATA_ENDPOINT}/api/v1/builds/${process.env[TESTOPS_BUILD_ID_ENV]}/stop`;
+    const url3 = `${DATA_ENDPOINT}/api/v1/builds/${process.env[BROWSERSTACK_TESTHUB_UUID]}/stop`;
     const response = await fetch(url3, {
       method: "PUT",
       headers: {
         ...DEFAULT_REQUEST_CONFIG.headers,
-        "Authorization": `Bearer ${process.env[TESTOPS_JWT_ENV]}`
+        "Authorization": `Bearer ${process.env[BROWSERSTACK_TESTHUB_JWT]}`
       },
       body: JSON.stringify(data)
     });
@@ -1669,7 +1640,7 @@ async function batchAndPostEvents(eventUrl, kind, data) {
   if (!process.env[TESTOPS_BUILD_COMPLETED_ENV]) {
     throw new Error("Build not completed yet");
   }
-  const jwtToken = process.env[TESTOPS_JWT_ENV];
+  const jwtToken = process.env[BROWSERSTACK_TESTHUB_JWT];
   if (!jwtToken) {
     throw new Error("Missing authentication Token");
   }
@@ -1750,7 +1721,11 @@ function getBrowserStackKey(config) {
   return config.key;
 }
 function isUndefined(value) {
-  return value === void 0 || value === null;
+  let res = value === void 0 || value === null;
+  if (typeof value === "string") {
+    res = res || value === "";
+  }
+  return res;
 }
 function isTrue(value) {
   return (value + "").toLowerCase() === "true";
@@ -2271,7 +2246,7 @@ var Percy = class {
     this.#proc = spawn2(
       binaryPath,
       commandArgs,
-      { env: { ...process.env, PERCY_TOKEN: token } }
+      { env: { ...process.env, PERCY_TOKEN: token, TH_BUILD_UUID: process.env[BROWSERSTACK_TESTHUB_UUID] } }
     );
     this.#proc.stdout.pipe(logStream);
     this.#proc.stderr.pipe(logStream);
@@ -2480,7 +2455,7 @@ import path9 from "node:path";
 
 // src/instrumentation/funnelInstrumentation.ts
 import os4 from "node:os";
-import util2 from "node:util";
+import util2, { format as format2 } from "node:util";
 import path8 from "node:path";
 import fs9 from "node:fs";
 
@@ -2552,7 +2527,7 @@ async function fireFunnelTestEvent(eventType, config) {
     BStackLogger.debug("Funnel event success");
     config.sentFunnelData();
   } catch (error) {
-    BStackLogger.debug("Exception in sending funnel data: " + error);
+    BStackLogger.debug(`Exception in sending funnel data: ${format2(error)}`);
   }
 }
 async function sendStart(config) {
@@ -2568,9 +2543,22 @@ function saveFunnelData(eventType, config) {
   fs9.writeFileSync(filePath, JSON.stringify(data));
   return filePath;
 }
+function redactCredentialsFromFunnelData(data) {
+  if (data) {
+    if (data.userName) {
+      data.userName = "[REDACTED]";
+    }
+    if (data.accessKey) {
+      data.accessKey = "[REDACTED]";
+    }
+  }
+  return data;
+}
 async function fireFunnelRequest(data) {
+  const { userName, accessKey } = data;
+  redactCredentialsFromFunnelData(data);
   BStackLogger.debug("Sending SDK event with data " + util2.inspect(data, { depth: 6 }));
-  const encodedAuth = Buffer.from(`${data.userName}:${data.accessKey}`, "utf8").toString("base64");
+  const encodedAuth = Buffer.from(`${userName}:${accessKey}`, "utf8").toString("base64");
   const response = await fetchWrap(FUNNEL_INSTRUMENTATION_URL, {
     method: "POST",
     headers: {
@@ -2600,15 +2588,6 @@ function getProductList(config) {
   }
   return products;
 }
-function getProductMap(config) {
-  return {
-    "observability": config.testObservability.enabled,
-    "accessibility": config.accessibility,
-    "percy": config.percy,
-    "automate": config.automate,
-    "app_automate": config.appAutomate
-  };
-}
 function buildEventData(eventType, config) {
   const eventProperties = {
     // Framework Details
@@ -2746,7 +2725,7 @@ function setupExitHandlers() {
 }
 function shouldCallCleanup(config) {
   const args = [];
-  if (!!process.env[TESTOPS_JWT_ENV] && !config.testObservability.buildStopped) {
+  if (!!process.env[BROWSERSTACK_TESTHUB_JWT] && !config.testObservability.buildStopped) {
     args.push("--observability");
   }
   if (config.userName && config.accessKey && !config.funnelDataSent) {
@@ -3086,21 +3065,18 @@ var BrowserstackLauncherService = class {
     }
     this._handleBuildIdentifier(capabilities);
     this._updateObjectTypeCaps(capabilities, "accessibilityOptions");
-    if (this._accessibilityAutomation) {
-      const scannerVersion = await createAccessibilityTestRun(this._options, this._config, {
+    const shouldSetupPercy = this._options.percy || isUndefined(this._options.percy) && this._options.app;
+    if (this._options.testObservability || this._accessibilityAutomation || shouldSetupPercy) {
+      BStackLogger.debug("Sending launch start event");
+      await launchTestSession(this._options, this._config, {
         projectName: this._projectName,
         buildName: this._buildName,
         buildTag: this._buildTag,
         bstackServiceVersion: BSTACK_SERVICE_VERSION,
-        buildIdentifier: this._buildIdentifier,
-        accessibilityOptions: this._options.accessibilityOptions
-      });
-      if (scannerVersion) {
-        process.env.BSTACK_A11Y_SCANNER_VERSION = scannerVersion;
-      }
-      BStackLogger.debug(`Accessibility scannerVersion ${scannerVersion}`);
+        buildIdentifier: this._buildIdentifier
+      }, this.browserStackConfig);
     }
-    if (this._options.accessibilityOptions) {
+    if (this._accessibilityAutomation && this._options.accessibilityOptions) {
       const filteredOpts = Object.keys(this._options.accessibilityOptions).filter((key) => !NOT_ALLOWED_KEYS_IN_CAPS.includes(key)).reduce((opts2, key) => {
         return {
           ...opts2,
@@ -3111,21 +3087,11 @@ var BrowserstackLauncherService = class {
     } else if (isAccessibilityAutomationSession(this._accessibilityAutomation)) {
       this._updateObjectTypeCaps(capabilities, "accessibilityOptions", {});
     }
-    if (this._options.testObservability) {
-      BStackLogger.debug("Sending launch start event");
-      await launchTestSession(this._options, this._config, {
-        projectName: this._projectName,
-        buildName: this._buildName,
-        buildTag: this._buildTag,
-        bstackServiceVersion: BSTACK_SERVICE_VERSION,
-        buildIdentifier: this._buildIdentifier
-      });
-    }
-    const shouldSetupPercy = this._options.percy || isUndefined(this._options.percy) && this._options.app;
     if (shouldSetupPercy) {
       try {
         const bestPlatformPercyCaps = getBestPlatformForPercySnapshot(capabilities);
         this._percyBestPlatformCaps = bestPlatformPercyCaps;
+        process.env[BROWSERSTACK_PERCY] = "false";
         await this.setupPercy(this._options, this._config, {
           projectName: this._projectName
         });
@@ -3174,29 +3140,22 @@ var BrowserstackLauncherService = class {
   }
   async onComplete() {
     BStackLogger.debug("Inside OnComplete hook..");
-    if (isAccessibilityAutomationSession(this._accessibilityAutomation)) {
-      await stopAccessibilityTestRun().catch((error) => {
-        BStackLogger.error(`Exception in stop accessibility test run: ${error}`);
-      });
-    }
-    if (this._options.testObservability) {
-      BStackLogger.debug("Sending stop launch event");
-      await stopBuildUpstream();
-      if (process.env[TESTOPS_BUILD_ID_ENV]) {
-        console.log(`
-Visit https://observability.browserstack.com/builds/${process.env[TESTOPS_BUILD_ID_ENV]} to view build report, insights, and many more debugging information all at one place!
+    BStackLogger.debug("Sending stop launch event");
+    await stopBuildUpstream();
+    if (process.env[BROWSERSTACK_OBSERVABILITY] && process.env[BROWSERSTACK_TESTHUB_UUID]) {
+      console.log(`
+Visit https://observability.browserstack.com/builds/${process.env[BROWSERSTACK_TESTHUB_UUID]} to view build report, insights, and many more debugging information all at one place!
 `);
+    }
+    this.browserStackConfig.testObservability.buildStopped = true;
+    if (process.env[PERF_MEASUREMENT_ENV]) {
+      await PerformanceTester.stopAndGenerate("performance-launcher.html");
+      PerformanceTester.calculateTimes(["launchTestSession", "stopBuildUpstream"]);
+      if (!process.env.START_TIME) {
+        return;
       }
-      this.browserStackConfig.testObservability.buildStopped = true;
-      if (process.env[PERF_MEASUREMENT_ENV]) {
-        await PerformanceTester.stopAndGenerate("performance-launcher.html");
-        PerformanceTester.calculateTimes(["launchTestSession", "stopBuildUpstream"]);
-        if (!process.env.START_TIME) {
-          return;
-        }
-        const duration = (/* @__PURE__ */ new Date()).getTime() - new Date(process.env.START_TIME).getTime();
-        BStackLogger.info(`Total duration is ${duration / 1e3} s`);
-      }
+      const duration = (/* @__PURE__ */ new Date()).getTime() - new Date(process.env.START_TIME).getTime();
+      BStackLogger.info(`Total duration is ${duration / 1e3} s`);
     }
     await sendFinish(this.browserStackConfig);
     try {
@@ -3243,6 +3202,7 @@ Visit https://observability.browserstack.com/builds/${process.env[TESTOPS_BUILD_
   }
   async setupPercy(options, config, bsConfig) {
     if (this._percy?.isRunning()) {
+      process.env[BROWSERSTACK_PERCY] = "true";
       return;
     }
     try {
@@ -3251,6 +3211,7 @@ Visit https://observability.browserstack.com/builds/${process.env[TESTOPS_BUILD_
         throw new Error("Could not start percy, check percy logs for info.");
       }
       PercyLogger.info("Percy started successfully");
+      process.env[BROWSERSTACK_PERCY] = "true";
       let signal = 0;
       const handler = async () => {
         signal++;
@@ -3260,7 +3221,8 @@ Visit https://observability.browserstack.com/builds/${process.env[TESTOPS_BUILD_
       process.on("SIGINT", handler);
       process.on("SIGTERM", handler);
     } catch (err) {
-      PercyLogger.debug(`Error in percy setup ${err}`);
+      PercyLogger.debug(`Error in percy setup ${format3(err)}`);
+      process.env[BROWSERSTACK_PERCY] = "false";
     }
   }
   async stopPercy() {
@@ -3325,7 +3287,7 @@ Visit https://observability.browserstack.com/builds/${process.env[TESTOPS_BUILD_
   async _uploadServiceLogs() {
     const clientBuildUuid = this._getClientBuildUuid();
     const response = await uploadLogs(getBrowserStackUser(this._config), getBrowserStackKey(this._config), clientBuildUuid);
-    BStackLogger.logToFile(`Response - ${format(response)}`, "debug");
+    BStackLogger.logToFile(`Response - ${format3(response)}`, "debug");
   }
   _updateObjectTypeCaps(capabilities, capType, value) {
     try {
@@ -3581,8 +3543,8 @@ Visit https://observability.browserstack.com/builds/${process.env[TESTOPS_BUILD_
     fs11.writeFileSync(filePath, JSON.stringify(jsonContent));
   }
   _getClientBuildUuid() {
-    if (process.env[TESTOPS_BUILD_ID_ENV]) {
-      return process.env[TESTOPS_BUILD_ID_ENV];
+    if (process.env[BROWSERSTACK_TESTHUB_UUID]) {
+      return process.env[BROWSERSTACK_TESTHUB_UUID];
     }
     const uuid = uuidv4();
     BStackLogger.logToFile(`If facing any issues, please contact BrowserStack support with the Build Run Id - ${uuid}`, "info");
@@ -3675,6 +3637,7 @@ var RequestQueueHandler = class _RequestQueueHandler {
 };
 
 // src/testOps/requestUtils.ts
+import { format as format4 } from "node:util";
 async function uploadEventData(eventData, eventUrl = DATA_EVENT_ENDPOINT) {
   let logTag = "BATCH_UPLOAD";
   if (!Array.isArray(eventData)) {
@@ -3686,7 +3649,7 @@ async function uploadEventData(eventData, eventUrl = DATA_EVENT_ENDPOINT) {
   if (!process.env[TESTOPS_BUILD_COMPLETED_ENV]) {
     throw new Error("Build start not completed yet");
   }
-  if (!process.env[TESTOPS_JWT_ENV]) {
+  if (!process.env[BROWSERSTACK_TESTHUB_JWT]) {
     BStackLogger.debug(`[${logTag}] Missing Authentication Token/ Build ID`);
     throw new Error("Token/buildID is undefined, build creation might have failed");
   }
@@ -3696,13 +3659,13 @@ async function uploadEventData(eventData, eventUrl = DATA_EVENT_ENDPOINT) {
       method: "POST",
       headers: {
         ...DEFAULT_REQUEST_CONFIG.headers,
-        "Authorization": `Bearer ${process.env[TESTOPS_JWT_ENV]}`
+        "Authorization": `Bearer ${process.env[BROWSERSTACK_TESTHUB_JWT]}`
       },
       body: JSON.stringify(eventData)
     });
     BStackLogger.debug(`[${logTag}] Success response: ${JSON.stringify(await data.json())}`);
   } catch (error) {
-    BStackLogger.debug(`[${logTag}] Failed. Error: ${error}`);
+    BStackLogger.debug(`[${logTag}] Failed. Error: ${format4(error)}`);
     throw error;
   }
 }
@@ -3722,6 +3685,8 @@ var Listener = class _Listener {
   logEvents = this.usageStats.logStats;
   requestBatcher;
   pendingUploads = 0;
+  static _accessibilityOptions;
+  static _testRunAccessibilityVar = false;
   // Making the constructor private to use singleton pattern
   constructor() {
   }
@@ -3731,6 +3696,12 @@ var Listener = class _Listener {
     }
     return _Listener.instance;
   }
+  static setAccessibilityOptions(options) {
+    _Listener._accessibilityOptions = options;
+  }
+  static setTestRunAccessibilityVar(accessibility) {
+    _Listener._testRunAccessibilityVar = accessibility;
+  }
   async onWorkerEnd() {
     try {
       await this.uploadPending();
@@ -3754,6 +3725,9 @@ var Listener = class _Listener {
   }
   hookStarted(hookData) {
     try {
+      if (!shouldProcessEventForTesthub("HookRunStarted")) {
+        return;
+      }
       this.hookStartedStats.triggered();
       this.sendBatchEvents(this.getEventForHook("HookRunStarted", hookData));
     } catch (e) {
@@ -3763,6 +3737,9 @@ var Listener = class _Listener {
   }
   hookFinished(hookData) {
     try {
+      if (!shouldProcessEventForTesthub("HookRunFinished")) {
+        return;
+      }
       this.hookFinishedStats.triggered(hookData.result);
       this.sendBatchEvents(this.getEventForHook("HookRunFinished", hookData));
     } catch (e) {
@@ -3772,7 +3749,14 @@ var Listener = class _Listener {
   }
   testStarted(testData) {
     try {
+      if (!shouldProcessEventForTesthub("TestRunStarted")) {
+        return;
+      }
+      process.env[TEST_ANALYTICS_ID] = testData.uuid;
       this.testStartedStats.triggered();
+      testData.product_map = {
+        accessibility: _Listener._testRunAccessibilityVar
+      };
       this.sendBatchEvents(this.getEventForHook("TestRunStarted", testData));
     } catch (e) {
       this.testStartedStats.failed();
@@ -3781,6 +3765,12 @@ var Listener = class _Listener {
   }
   testFinished(testData) {
     try {
+      if (!shouldProcessEventForTesthub("TestRunFinished")) {
+        return;
+      }
+      testData.product_map = {
+        accessibility: _Listener._testRunAccessibilityVar
+      };
       this.testFinishedStats.triggered(testData.result);
       this.sendBatchEvents(this.getEventForHook("TestRunFinished", testData));
     } catch (e) {
@@ -3790,6 +3780,9 @@ var Listener = class _Listener {
   }
   logCreated(logs) {
     try {
+      if (!shouldProcessEventForTesthub("LogCreated")) {
+        return;
+      }
       this.markLogs("triggered", logs);
       this.sendBatchEvents({
         event_type: "LogCreated",
@@ -3805,6 +3798,9 @@ var Listener = class _Listener {
       return;
     }
     try {
+      if (!shouldProcessEventForTesthub("LogCreated")) {
+        return;
+      }
       this.markLogs("triggered", jsonArray);
       this.pendingUploads += 1;
       await sendScreenshots([{
@@ -3821,6 +3817,9 @@ var Listener = class _Listener {
   }
   cbtSessionCreated(data) {
     try {
+      if (!shouldProcessEventForTesthub("CBTSessionCreated")) {
+        return;
+      }
       this.cbtSessionStats.triggered();
       this.sendBatchEvents({ event_type: "CBTSessionCreated", test_run: data });
     } catch (e) {
@@ -3930,7 +3929,7 @@ var _TestReporter = class __TestReporter extends WDIOReporter {
   _gitConfigPath;
   _gitConfigured = false;
   _currentHook = {};
-  _currentTest = {};
+  static currentTest = {};
   _userCaps = {};
   listener = listener_default.getInstance();
   async onRunnerStart(runnerStats) {
@@ -3957,8 +3956,8 @@ var _TestReporter = class __TestReporter extends WDIOReporter {
   async appendTestItemLog(stdLog) {
     if (this._currentHook.uuid && !this._currentHook.finished) {
       stdLog.hook_run_uuid = this._currentHook.uuid;
-    } else if (this._currentTest.uuid) {
-      stdLog.test_run_uuid = this._currentTest.uuid;
+    } else if (__TestReporter.currentTest.uuid) {
+      stdLog.test_run_uuid = __TestReporter.currentTest.uuid;
     }
     if (stdLog.hook_run_uuid || stdLog.test_run_uuid) {
       this.listener.logCreated([stdLog]);
@@ -4042,7 +4041,7 @@ var _TestReporter = class __TestReporter extends WDIOReporter {
       return;
     }
     const uuid = uuidv42();
-    this._currentTest.uuid = uuid;
+    __TestReporter.currentTest.uuid = uuid;
     __TestReporter._tests[testStats.fullTitle] = {
       uuid
     };
@@ -4097,6 +4096,9 @@ var _TestReporter = class __TestReporter extends WDIOReporter {
     const testMetaData = __TestReporter._tests[identifier];
     const scope = testStats.type === "test" ? testStats.fullTitle : `${this._suites[0].title} - ${testStats.title}`;
     const suiteFileName = this._suiteName || (this.specs?.length > 0 ? this.specs[this.specs.length - 1]?.replace("file:", "") : void 0);
+    if (eventType === "TestRunStarted") {
+      __TestReporter.currentTest.name = testStats.title;
+    }
     await this.configureGit();
     const testData = {
       uuid: testMetaData ? testMetaData.uuid : uuidv42(),
@@ -4139,7 +4141,7 @@ var _TestReporter = class __TestReporter extends WDIOReporter {
       if (failed) {
         testData.result = error && error.message && error.message.includes("sync skip; aborting execution") ? "ignore" : "failed";
         if (error && testData.result !== "skipped") {
-          testData.failure = [{ backtrace: [removeAnsiColors(error.message)] }];
+          testData.failure = [{ backtrace: [removeAnsiColors(error.message), removeAnsiColors(error.stack || "")] }];
           testData.failure_reason = removeAnsiColors(error.message);
           testData.failure_type = error.message === null ? null : error.message.toString().match(/AssertionError/) ? "AssertionError" : "UnhandledError";
         }
@@ -4181,7 +4183,7 @@ var _InsightsHandler = class {
   _commands = {};
   _gitConfigPath;
   _suiteFile;
-  _currentTest = {};
+  static currentTest = {};
   _currentHook = {};
   _cucumberData = {
     stepsStarted: false,
@@ -4190,8 +4192,8 @@ var _InsightsHandler = class {
   };
   _userCaps = {};
   listener = listener_default.getInstance();
-  _currentTestId;
-  _cbtQueue = [];
+  currentTestId;
+  cbtQueue = [];
   _isAppAutomate() {
     const browserDesiredCapabilities = this._browser?.capabilities ?? {};
     const desiredCapabilities = this._userCaps ?? {};
@@ -4311,7 +4313,7 @@ var _InsightsHandler = class {
       const hookMetaData = {
         uuid: hookUUID,
         startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        testRunId: this._currentTest.uuid,
+        testRunId: InsightsHandler.currentTest.uuid,
         hookType
       };
       this._tests[hookId] = hookMetaData;
@@ -4443,7 +4445,7 @@ var _InsightsHandler = class {
   }
   async beforeTest(test) {
     const uuid = uuidv43();
-    this._currentTest = {
+    InsightsHandler.currentTest = {
       test,
       uuid
     };
@@ -4479,7 +4481,7 @@ var _InsightsHandler = class {
   }
   async beforeScenario(world) {
     const uuid = uuidv43();
-    this._currentTest = {
+    InsightsHandler.currentTest = {
       uuid
     };
     this._cucumberData.scenario = world.pickle;
@@ -4560,8 +4562,8 @@ var _InsightsHandler = class {
     try {
       if (this._currentHook.uuid && !this._currentHook.finished && (this._framework === "mocha" || this._framework === "cucumber")) {
         stdLog.hook_run_uuid = this._currentHook.uuid;
-      } else if (this._currentTest.uuid && (this._framework === "mocha" || this._framework === "cucumber")) {
-        stdLog.test_run_uuid = this._currentTest.uuid;
+      } else if (InsightsHandler.currentTest.uuid && (this._framework === "mocha" || this._framework === "cucumber")) {
+        stdLog.test_run_uuid = InsightsHandler.currentTest.uuid;
       }
       if (stdLog.hook_run_uuid || stdLog.test_run_uuid) {
         this.listener.logCreated([stdLog]);
@@ -4668,7 +4670,10 @@ var _InsightsHandler = class {
     const fullTitle = getUniqueIdentifier(test, this._framework);
     const testMetaData = this._tests[fullTitle];
     const filename = test.file || this._suiteFile;
-    this._currentTestId = testMetaData.uuid;
+    this.currentTestId = testMetaData.uuid;
+    if (eventType === "TestRunStarted") {
+      InsightsHandler.currentTest.name = test.title || test.description;
+    }
     const testData = {
       uuid: testMetaData.uuid,
       type: test.type || "test",
@@ -4693,7 +4698,7 @@ var _InsightsHandler = class {
       if (!passed) {
         testData.result = error && error.message && error.message.includes("sync skip; aborting execution") ? "ignore" : "failed";
         if (error && testData.result !== "skipped") {
-          testData.failure = [{ backtrace: [removeAnsiColors(error.message)] }];
+          testData.failure = [{ backtrace: [removeAnsiColors(error.message), removeAnsiColors(error.stack || "")] }];
           testData.failure_reason = removeAnsiColors(error.message);
           testData.failure_type = isUndefined(error.message) ? null : error.message.toString().match(/AssertionError/) ? "AssertionError" : "UnhandledError";
         }
@@ -4765,7 +4770,10 @@ var _InsightsHandler = class {
     } else {
       fullNameWithExamples = scenario?.name || "";
     }
-    this._currentTestId = uuid;
+    this.currentTestId = uuid;
+    if (eventType === "TestRunStarted") {
+      InsightsHandler.currentTest.name = fullNameWithExamples;
+    }
     const testData = {
       uuid,
       started_at: startedAt,
@@ -4827,14 +4835,14 @@ var _InsightsHandler = class {
     return testData;
   }
   async flushCBTDataQueue() {
-    if (isUndefined(this._currentTestId)) {
+    if (isUndefined(this.currentTestId)) {
       return;
     }
-    this._cbtQueue.forEach((cbtData) => {
-      cbtData.uuid = this._currentTestId;
+    this.cbtQueue.forEach((cbtData) => {
+      cbtData.uuid = this.currentTestId;
       this.listener.cbtSessionCreated(cbtData);
     });
-    this._currentTestId = void 0;
+    this.currentTestId = void 0;
   }
   async sendCBTInfo() {
     const integrationsData = {};
@@ -4846,11 +4854,11 @@ var _InsightsHandler = class {
       uuid: "",
       integrations: integrationsData
     };
-    if (this._currentTestId !== void 0) {
-      cbtData.uuid = this._currentTestId;
+    if (this.currentTestId !== void 0) {
+      cbtData.uuid = this.currentTestId;
       this.listener.cbtSessionCreated(cbtData);
     } else {
-      this._cbtQueue.push(cbtData);
+      this.cbtQueue.push(cbtData);
     }
   }
   getIntegrationsObject() {
@@ -4905,6 +4913,7 @@ var _AccessibilityHandler = class {
   _testMetadata = {};
   static _a11yScanSessionMap = {};
   _sessionId = null;
+  listener = listener_default.getInstance();
   setSuiteFile(filename) {
     this._suiteFile = filename;
   }
@@ -4967,6 +4976,7 @@ var _AccessibilityHandler = class {
   async beforeTest(suiteTitle, test) {
     try {
       if (this._framework !== "mocha" || !this.shouldRunTestHooks(this._browser, this._accessibility)) {
+        listener_default.setTestRunAccessibilityVar(false);
         return;
       }
       const shouldScanTest = shouldScanTestForAccessibility(suiteTitle, test.title, this._accessibilityOptions);
@@ -4975,6 +4985,7 @@ var _AccessibilityHandler = class {
       if (this._sessionId) {
         AccessibilityHandler._a11yScanSessionMap[this._sessionId] = shouldScanTest;
       }
+      listener_default.setTestRunAccessibilityVar(this._accessibility && shouldScanTest);
       if (!isPageOpened) {
         return;
       }
@@ -5000,19 +5011,12 @@ var _AccessibilityHandler = class {
       }
       if (shouldScanTestForAccessibility2) {
         BStackLogger.info("Automate test case execution has ended. Processing for accessibility testing is underway. ");
-      }
-      const dataForExtension = {
-        saveResults: shouldScanTestForAccessibility2,
-        testDetails: {
-          "name": test.title,
-          "testRunId": process.env.BS_A11Y_TEST_RUN_ID,
-          "filePath": this._suiteFile,
-          "scopeList": [suiteTitle, test.title]
-        },
-        platform: this._platformA11yMeta
-      };
-      await this.sendTestStopEvent(this._browser, dataForExtension);
-      if (shouldScanTestForAccessibility2) {
+        const dataForExtension = {
+          "thTestRunUuid": process.env.TEST_ANALYTICS_ID,
+          "thBuildUuid": process.env.BROWSERSTACK_TESTHUB_UUID,
+          "thJwtToken": process.env.BROWSERSTACK_TESTHUB_JWT
+        };
+        await this.sendTestStopEvent(this._browser, dataForExtension);
         BStackLogger.info("Accessibility testing for this test case has ended.");
       }
     } catch (error) {
@@ -5028,6 +5032,7 @@ var _AccessibilityHandler = class {
     const featureData = gherkinDocument.feature;
     const uniqueId = getUniqueIdentifierForCucumber(world);
     if (!this.shouldRunTestHooks(this._browser, this._accessibility)) {
+      listener_default.setTestRunAccessibilityVar(false);
       return;
     }
     try {
@@ -5036,6 +5041,7 @@ var _AccessibilityHandler = class {
       if (this._sessionId) {
         AccessibilityHandler._a11yScanSessionMap[this._sessionId] = shouldScanScenario;
       }
+      listener_default.setTestRunAccessibilityVar(this._accessibility && shouldScanScenario);
       if (!isPageOpened) {
         return;
       }
@@ -5054,8 +5060,6 @@ var _AccessibilityHandler = class {
     }
     const pickleData = world.pickle;
     try {
-      const gherkinDocument = world.gherkinDocument;
-      const featureData = gherkinDocument.feature;
       const uniqueId = getUniqueIdentifierForCucumber(world);
       const accessibilityScanStarted = this._testMetadata[uniqueId]?.accessibilityScanStarted;
       const shouldScanTestForAccessibility2 = this._testMetadata[uniqueId]?.scanTestForAccessibility;
@@ -5064,19 +5068,12 @@ var _AccessibilityHandler = class {
       }
       if (shouldScanTestForAccessibility2) {
         BStackLogger.info("Automate test case execution has ended. Processing for accessibility testing is underway. ");
-      }
-      const dataForExtension = {
-        saveResults: shouldScanTestForAccessibility2,
-        testDetails: {
-          "name": pickleData.name,
-          "testRunId": process.env.BS_A11Y_TEST_RUN_ID,
-          "filePath": gherkinDocument.uri,
-          "scopeList": [featureData?.name, pickleData.name]
-        },
-        platform: this._platformA11yMeta
-      };
-      await this.sendTestStopEvent(this._browser, dataForExtension);
-      if (shouldScanTestForAccessibility2) {
+        const dataForExtension = {
+          "thTestRunUuid": process.env.TEST_ANALYTICS_ID,
+          "thBuildUuid": process.env.BROWSERSTACK_TESTHUB_UUID,
+          "thJwtToken": process.env.BROWSERSTACK_TESTHUB_JWT
+        };
+        await this.sendTestStopEvent(this._browser, dataForExtension);
         BStackLogger.info("Accessibility testing for this test case has ended.");
       }
     } catch (error) {
@@ -5189,25 +5186,66 @@ var snapshotHandler = (...args) => {
   PercyLogger.error("Unsupported driver for percy");
 };
 if (percySnapshot) {
-  snapshotHandler = (browser, name) => {
+  snapshotHandler = (browser, snapshotName, options) => {
     if (process.env.PERCY_SNAPSHOT === "true") {
-      return percySnapshot(browser, name);
+      let { name, uuid } = insights_handler_default.currentTest;
+      if (isUndefined(name)) {
+        ({ name, uuid } = reporter_default.currentTest);
+      }
+      options ||= {};
+      options = {
+        ...options,
+        testCase: name || "",
+        thTestCaseExecutionId: uuid || ""
+      };
+      return percySnapshot(browser, snapshotName, options);
     }
   };
 }
 var snapshot = snapshotHandler;
+var screenshotHelper = (type2, driverOrName, nameOrOptions, options) => {
+  let { name, uuid } = insights_handler_default.currentTest;
+  if (isUndefined(name)) {
+    ({ name, uuid } = reporter_default.currentTest);
+  }
+  if (!driverOrName || typeof driverOrName === "string") {
+    nameOrOptions ||= {};
+    if (typeof nameOrOptions === "object") {
+      nameOrOptions = {
+        ...nameOrOptions,
+        testCase: name || "",
+        thTestCaseExecutionId: uuid || ""
+      };
+    }
+  } else {
+    options ||= {};
+    options = {
+      ...options,
+      testCase: name || "",
+      thTestCaseExecutionId: uuid || ""
+    };
+  }
+  if (type2 === "app") {
+    return percyAppScreenshot(driverOrName, nameOrOptions, options);
+  }
+  return percySnapshot.percyScreenshot(driverOrName, nameOrOptions, options);
+};
 var screenshotHandler = async (...args) => {
   PercyLogger.error("Unsupported driver for percy");
 };
 if (percySnapshot && percySnapshot.percyScreenshot) {
-  screenshotHandler = percySnapshot.percyScreenshot;
+  screenshotHandler = (browser, screenshotName, options) => {
+    return screenshotHelper("web", browser, screenshotName, options);
+  };
 }
 var screenshot = screenshotHandler;
 var screenshotAppHandler = async (...args) => {
   PercyLogger.error("Unsupported driver for percy");
 };
 if (percyAppScreenshot) {
-  screenshotAppHandler = percyAppScreenshot;
+  screenshotAppHandler = (driverOrName, nameOrOptions, options) => {
+    return screenshotHelper("app", driverOrName, nameOrOptions, options);
+  };
 }
 var screenshotApp = screenshotAppHandler;
 
@@ -5346,10 +5384,10 @@ var BrowserstackService = class {
     this._config || (this._config = this._options);
     this._observability = this._options.testObservability;
     this._accessibility = this._options.accessibility;
-    this._percy = process.env.BROWSERSTACK_PERCY === "true";
+    this._percy = isTrue(process.env.BROWSERSTACK_PERCY);
     this._percyCaptureMode = process.env.BROWSERSTACK_PERCY_CAPTURE_MODE;
     this._turboScale = this._options.turboScale;
-    if (this._observability) {
+    if (shouldProcessEventForTesthub("")) {
       this._config.reporters?.push(reporter_default);
       if (process.env[PERF_MEASUREMENT_ENV]) {
         PerformanceTester.startMonitoring("performance-report-service.csv");
@@ -5423,28 +5461,8 @@ var BrowserstackService = class {
     }
     this._scenariosThatRan = [];
     if (this._browser) {
-      if (this._percy) {
-        this._percyHandler = new Percy_Handler_default(
-          this._percyCaptureMode,
-          this._browser,
-          this._caps,
-          this._isAppAutomate(),
-          this._config.framework
-        );
-        this._percyHandler.before();
-      }
       try {
         const sessionId = this._browser.sessionId;
-        if (this._observability) {
-          patchConsoleLogs();
-          this._insightsHandler = new insights_handler_default(
-            this._browser,
-            this._config.framework,
-            this._caps,
-            this._options
-          );
-          await this._insightsHandler.before();
-        }
         if (isBrowserstackSession(this._browser)) {
           try {
             this._accessibilityHandler = new accessibility_handler_default(
@@ -5456,12 +5474,23 @@ var BrowserstackService = class {
               this._options.accessibilityOptions
             );
             await this._accessibilityHandler.before(sessionId);
+            listener_default.setAccessibilityOptions(this._options.accessibilityOptions);
           } catch (err) {
             BStackLogger.error(`[Accessibility Test Run] Error in service class before function: ${err}`);
           }
         }
+        if (shouldProcessEventForTesthub("")) {
+          patchConsoleLogs();
+          this._insightsHandler = new insights_handler_default(
+            this._browser,
+            this._config.framework,
+            this._caps,
+            this._options
+          );
+          await this._insightsHandler.before();
+        }
         this._browser.on("command", async (command) => {
-          if (this._observability) {
+          if (shouldProcessEventForTesthub("")) {
             this._insightsHandler?.browserCommand(
               "client:beforeCommand",
               Object.assign(command, { sessionId }),
@@ -5473,7 +5502,7 @@ var BrowserstackService = class {
           );
         });
         this._browser.on("result", (result) => {
-          if (this._observability) {
+          if (shouldProcessEventForTesthub("")) {
             this._insightsHandler?.browserCommand(
               "client:afterCommand",
               Object.assign(result, { sessionId }),
@@ -5486,10 +5515,20 @@ var BrowserstackService = class {
         });
       } catch (err) {
         BStackLogger.error(`Error in service class before function: ${err}`);
-        if (this._observability) {
+        if (shouldProcessEventForTesthub("")) {
           CrashReporter.uploadCrashReport(`Error in service class before function: ${err}`, err && err.stack);
         }
       }
+      if (this._percy) {
+        this._percyHandler = new Percy_Handler_default(
+          this._percyCaptureMode,
+          this._browser,
+          this._caps,
+          this._isAppAutomate(),
+          this._config.framework
+        );
+        this._percyHandler.before();
+      }
     }
     return await this._printSessionURL();
   }
@@ -5530,8 +5569,8 @@ var BrowserstackService = class {
     }
     await this._setSessionName(suiteTitle, test);
     await this._setAnnotation(`Test: ${test.fullName ?? test.title}`);
-    await this._insightsHandler?.beforeTest(test);
     await this._accessibilityHandler?.beforeTest(suiteTitle, test);
+    await this._insightsHandler?.beforeTest(test);
   }
   async afterTest(test, context, results) {
     this._specsRan = true;
@@ -5539,9 +5578,9 @@ var BrowserstackService = class {
     if (!passed) {
       this._failReasons.push(error && error.message || "Unknown Error");
     }
+    await this._accessibilityHandler?.afterTest(this._suiteTitle, test);
     await this._insightsHandler?.afterTest(test, results);
     await this._percyHandler?.afterTest();
-    await this._accessibilityHandler?.afterTest(this._suiteTitle, test);
   }
   async after(result) {
     const { preferScenarioName, setSessionName, setSessionStatus } = this._options;
@@ -5594,8 +5633,8 @@ var BrowserstackService = class {
    */
   async beforeScenario(world) {
     this._currentTest = world;
-    await this._insightsHandler?.beforeScenario(world);
     await this._accessibilityHandler?.beforeScenario(world);
+    await this._insightsHandler?.beforeScenario(world);
     const scenarioName = world.pickle.name || "unknown scenario";
     await this._setAnnotation(`Scenario: ${scenarioName}`);
   }
@@ -5609,9 +5648,9 @@ var BrowserstackService = class {
       const exception = world.result && world.result.message || (status === "pending" ? `Some steps/hooks are pending for scenario "${world.pickle.name}"` : "Unknown Error");
       this._failReasons.push(exception);
     }
+    await this._accessibilityHandler?.afterScenario(world);
     await this._insightsHandler?.afterScenario(world);
     await this._percyHandler?.afterScenario();
-    await this._accessibilityHandler?.afterScenario(world);
   }
   async beforeStep(step, scenario) {
     await this._insightsHandler?.beforeStep(step, scenario);