From b10369d87cac636024b63c35cd0316e35c1d8d4e Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Fri, 9 Aug 2024 21:49:57 +0100 Subject: [PATCH] fix(allure-js-commons): add support for workers in default thread label (via #1110) --- .../allure-js-commons/src/sdk/reporter/utils/labels.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/allure-js-commons/src/sdk/reporter/utils/labels.ts b/packages/allure-js-commons/src/sdk/reporter/utils/labels.ts index 8e669841b..eb02fd5e3 100644 --- a/packages/allure-js-commons/src/sdk/reporter/utils/labels.ts +++ b/packages/allure-js-commons/src/sdk/reporter/utils/labels.ts @@ -1,5 +1,6 @@ import { hostname } from "node:os"; import { env, pid } from "node:process"; +import { isMainThread, threadId } from "node:worker_threads"; import type { Label } from "../../../model.js"; import { LabelName } from "../../../model.js"; @@ -31,9 +32,12 @@ export const getHostLabel = (): Label => { }; }; -export const getThreadLabel = (threadId?: string): Label => { +export const getThreadLabel = (userProvidedThreadId?: string): Label => { return { name: LabelName.THREAD, - value: env.ALLURE_THREAD_NAME ?? threadId ?? pid.toString(), + value: + env.ALLURE_THREAD_NAME ?? + userProvidedThreadId ?? + `pid-${pid.toString()}-worker-${isMainThread ? "main" : threadId}`, }; };