updated code

Author: anish353

bin/testObservability/cypress/index.js

@@ -202,18 +202,14 @@ Cypress.on('command:end', (command) => {
 });
 
 /*
- * cy.log capture must happen at command-enqueue time AND must bypass Cypress's
- * test command queue. When a test body throws synchronously (e.g. a failing
- * chai assertion), Cypress drops every pending command in the test queue —
- * which means an execute-time wrapper on cy.log never runs, and even a
- * deferred cy.task(...) inside the SDK's afterEach is just another queued
- * command that won't survive the drop.
- *
- * Cypress.backend('task', ...) emits directly over the runner-to-Node
- * websocket (see Cypress driver), bypassing the queue entirely. Combined
- * with command:enqueued (which fires synchronously at the user's cy.log()
- * call site, before the throw), the log reaches the Node-side task handler
- * regardless of whether the test passes or fails.
+ * cy.log capture must happen at command-enqueue time, not at command-execute
+ * time. When a test body throws synchronously (e.g. a failing chai assertion),
+ * Cypress drops every pending command in the test queue — so an execute-time
+ * wrapper on cy.log never fires for queued logs preceding the throw.
+ * command:enqueued fires synchronously at the user's cy.log() call site,
+ * before the throw, so the buffer is populated regardless of pass/fail.
+ * The buffered entries are then flushed via cy.task in the SDK's afterEach,
+ * which Mocha runs even on test failure.
  */
 Cypress.on('command:enqueued', (attrs) => {
   if (!Cypress.env('BROWSERSTACK_O11Y_LOGS')) return;
@@ -226,16 +222,14 @@ Cypress.on('command:enqueued', (attrs) => {
     }
     return [result, logItem ? logItem.toString() : ''].join(' ');
   }, '');
-  Cypress.backend('task', {
+  eventsQueue.push({
     task: 'test_observability_log',
-    arg: {
+    data: {
       level: 'info',
       message,
       timestamp: new Date().toISOString()
     },
-    timeout: 60000
-  }).catch(() => {
-    /* Don't let observability failures bubble into the test */
+    options: { log: false }
   });
 });
 

bin/testObservability/reporter/index.js

@@ -628,10 +628,24 @@ class MyReporter {
 
   appendTestItemLog = async (log) => {
     try {
+      /*
+       * SDK-5709: keep the hash gate on hook side (avoids attributing logs to
+       * a stale hook pointer between hooks). Drop it on the test side. In
+       * Cypress, EVENT_TEST_FAIL fires synchronously when a test body throws —
+       * before afterEach runs. The SDK's internal afterEach flushes its
+       * cy.log buffer via cy.task during afterEach, so by the time those logs
+       * reach this listener runStatusMarkedHash[testAnalyticsId] is already
+       * set and the log was being dropped without ever attaching a
+       * test_run_uuid. Late LogCreated events with test_run_uuid are accepted
+       * by the analytics backend (uploadTestSteps takes the same path with
+       * no gate).
+       */
       if(this.current_hook && ( this.current_hook.hookAnalyticsId && !this.runStatusMarkedHash[this.current_hook.hookAnalyticsId] )) {
         log.hook_run_uuid = this.current_hook.hookAnalyticsId;
       }
-      if(!log.hook_run_uuid && this.current_test && ( this.current_test.testAnalyticsId && !this.runStatusMarkedHash[this.current_test.testAnalyticsId] )) log.test_run_uuid = this.current_test.testAnalyticsId;
+      if(!log.hook_run_uuid && this.current_test && this.current_test.testAnalyticsId) {
+        log.test_run_uuid = this.current_test.testAnalyticsId;
+      }
       if(log.hook_run_uuid || log.test_run_uuid) {
         await uploadEventData({
           event_type: 'LogCreated',