@eclipse-che/che-e2e 7.73.0 → 7.74.0-dev-41d1364

package/utils/KubernetesCommandLineToolsExecutor.ts

@@ -1,182 +1,206 @@
+/** *******************************************************************
+ * copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
 import { echo, exec, ShellString } from 'shelljs';
 import { Logger } from './Logger';
 import { ShellExecutor } from './ShellExecutor';
 import * as path from 'path';
-import { APITestConstants, KubernetesCommandLineTool } from '../constants/APITestConstants';
-import { BaseTestConstants } from '../constants/BaseTestConstants';
-import { OAuthConstants } from '../constants/OAuthConstants';
+import { API_TEST_CONSTANTS, KubernetesCommandLineTool } from '../constants/API_TEST_CONSTANTS';
+import { BASE_TEST_CONSTANTS } from '../constants/BASE_TEST_CONSTANTS';
+import { OAUTH_CONSTANTS } from '../constants/OAUTH_CONSTANTS';
 
 export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
-    private static container: string;
-    private static pod: string;
-    private readonly namespace: string;
-    private readonly workspaceName: string | undefined;
-    private readonly KUBERNETES_COMMAND_LINE_TOOL: string = APITestConstants.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
-
-    constructor(_workspaceName?: string, _namespace?: string) {
-        super();
-        this.workspaceName = _workspaceName;
-        this.namespace = this.setNamespace(_namespace);
-    }
-
-    get getWorkspaceName(): string {
-        return <string>this.workspaceName;
-    }
-
-    get getNamespace(): string {
-        return this.namespace;
-    }
-
-    // login to Openshift cluster with username and password
-    loginToOcp(): void {
-        if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.OC) {
-            Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login to the "OC" client.`);
-            const url: string = this.getServerUrl();
-            if (this.isUserLoggedIn()) {
-                Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
-            } else {
-                Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${OAuthConstants.TS_SELENIUM_OCP_USERNAME}`);
-                exec(`oc login --server=${url} -u=${OAuthConstants.TS_SELENIUM_OCP_USERNAME} -p=${OAuthConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
-            }
-        } else {
-            Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: doesn't support login command`);
-        }
-    }
-
-    getContainerName(): string {
-        Logger.debug(`${this.getLoggingName(this.getContainerName.name)}: Get container name.`);
-        const output: ShellString = ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get ${(KubernetesCommandLineToolsExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
-        echo('\n');
-        return output.stderr ? output.stderr : output.stdout;
-    }
-
-    getWorkspacePodName(): string {
-        Logger.debug(`${this.getLoggingName(this.getWorkspacePodName.name)}: Get workspace pod name.`);
-        const output: ShellString = ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
-        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
-    }
-
-    deleteDevWorkspace(): void {
-        Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
-        ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
-        ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
-        ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${BaseTestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
-    }
-
-    applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
-        if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.KUBECTL) {
-            this.createNamespace();
-        }
-        this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
-        return this.waitDevWorkspace();
-    }
-
-    executeCommand(commandToExecute: string, container: string = KubernetesCommandLineToolsExecutor.container): ShellString {
-        Logger.debug(`${this.getLoggingName(this.executeCommand.name)}:`);
-        return ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${container} -- sh -c '${commandToExecute}'`);
-    }
-
-    applyYamlConfigurationAsStringOutput(yamlConfiguration: string): ShellString {
-        Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsStringOutput.name)}:`);
-        return ShellExecutor.execWithLog(`cat <<EOF | ${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f - \n` +
-            yamlConfiguration + '\n' +
-            'EOF');
-    }
-
-    applyYamlConfigurationAsFile(pathToFile: string): void {
-        Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsFile.name)}:`);
-        ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f "${path.resolve(pathToFile)}"`);
-    }
-
-    getDevWorkspaceYamlConfiguration(): ShellString {
-        Logger.debug(`${this.getLoggingName(this.getDevWorkspaceYamlConfiguration.name)}:`);
-        return ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} get dw ${this.workspaceName} -n ${this.namespace} -o yaml`);
-    }
-
-    waitDevWorkspace(timeout: number = 360): ShellString {
-        Logger.debug(`${this.getLoggingName(this.waitDevWorkspace.name)}: Wait till workspace ready.`);
-        const output: ShellString = ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
-        this.getPodAndContainerNames();
-        return output;
-    }
-
-    createNamespace(): void {
-        Logger.debug(`${this.getLoggingName(this.createNamespace.name)}: Create namespace "${this.namespace}".`);
-        ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} create namespace ${this.namespace}`);
-    }
-
-    createProject(projectName: string): void {
-        Logger.debug(`${this.getLoggingName(this.createProject.name)}: Create new project "${projectName}".`);
-        ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} new-project ${projectName} -n ${this.namespace}`);
-    }
-
-    deleteProject(projectName: string): void {
-        Logger.debug(`${this.getLoggingName(this.deleteProject.name)}: Delete "${projectName}".`);
-        ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} delete project ${projectName} -n ${this.namespace}`);
-    }
-
-    private getPodAndContainerNames(): void {
-        KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
-        KubernetesCommandLineToolsExecutor.container = this.getContainerName();
-    }
-
-    private isUserLoggedIn(): boolean {
-        const whoamiCommandOutput: ShellString = ShellExecutor.execWithLog('oc whoami && oc whoami --show-server=true');
-
-        return whoamiCommandOutput.stdout.includes(OAuthConstants.TS_SELENIUM_OCP_USERNAME) && whoamiCommandOutput.stdout.includes(this.getServerUrl());
-    }
-
-    private getLoggingName(methodName: string): string {
-        return `${this.constructor.name}.${methodName} - ${(this.KUBERNETES_COMMAND_LINE_TOOL)}`;
-    }
-
-    private setNamespace(_namespace: string | undefined): string {
-        _namespace = _namespace !== undefined ? _namespace
-            : BaseTestConstants.TS_SELENIUM_BASE_URL.includes('devspaces') ? OAuthConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces'
-                : BaseTestConstants.TS_SELENIUM_BASE_URL.includes('che') ? OAuthConstants.TS_SELENIUM_OCP_USERNAME + '-che'
-                    : 'default';
-        return _namespace;
-    }
-
-    private getServerUrl(): string {
-        Logger.debug(`${this.getLoggingName(this.getServerUrl.name)}: Get server api url.`);
-        return BaseTestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
-    }
+	private static container: string;
+	private static pod: string;
+	private readonly namespace: string;
+	private readonly workspaceName: string | undefined;
+	private readonly KUBERNETES_COMMAND_LINE_TOOL: string = API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
+
+	constructor(_workspaceName?: string, _namespace?: string) {
+		super();
+		this.workspaceName = _workspaceName;
+		this.namespace = this.setNamespace(_namespace);
+	}
+
+	get getWorkspaceName(): string {
+		return <string>this.workspaceName;
+	}
+
+	get getNamespace(): string {
+		return this.namespace;
+	}
+
+	// login to Openshift cluster with username and password
+	loginToOcp(): void {
+		if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.OC) {
+			Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - login to the "OC" client.`);
+			const url: string = this.getServerUrl();
+			if (this.isUserLoggedIn()) {
+				Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - user already logged`);
+			} else {
+				Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - login ${url}, ${OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME}`);
+				exec(
+					`oc login --server=${url} -u=${OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME} -p=${OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`
+				);
+			}
+		} else {
+			Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - doesn't support login command`);
+		}
+	}
+
+	getContainerName(): string {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - get container name.`);
+		const output: ShellString = ShellExecutor.execWithLog(
+			`${this.KUBERNETES_COMMAND_LINE_TOOL} get ${KubernetesCommandLineToolsExecutor.pod} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`
+		);
+		echo('\n');
+		return output.stderr ? output.stderr : output.stdout;
+	}
+
+	getWorkspacePodName(): string {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - get workspace pod name.`);
+		const output: ShellString = ShellExecutor.execWithLog(
+			`${this.KUBERNETES_COMMAND_LINE_TOOL} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`
+		);
+		return output.stderr ? output.stderr : output.stdout.replace('\n', '');
+	}
+
+	deleteDevWorkspace(): void {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - delete '${this.workspaceName}' workspace`);
+		ShellExecutor.execWithLog(
+			`${this.KUBERNETES_COMMAND_LINE_TOOL} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`
+		);
+		ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
+		ShellExecutor.execWithLog(
+			`${this.KUBERNETES_COMMAND_LINE_TOOL} delete dwt ${BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`
+		);
+	}
+
+	applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
+		if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.KUBECTL) {
+			this.createNamespace();
+		}
+		this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
+		return this.waitDevWorkspace();
+	}
+
+	executeCommand(commandToExecute: string, container: string = KubernetesCommandLineToolsExecutor.container): ShellString {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL}`);
+		return ShellExecutor.execWithLog(
+			`${this.KUBERNETES_COMMAND_LINE_TOOL} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${container} -- sh -c '${commandToExecute}'`
+		);
+	}
+
+	applyYamlConfigurationAsStringOutput(yamlConfiguration: string): ShellString {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL}`);
+		return ShellExecutor.execWithLog(
+			`cat <<EOF | ${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f - \n` + yamlConfiguration + '\n' + 'EOF'
+		);
+	}
+
+	applyYamlConfigurationAsFile(pathToFile: string): void {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL}`);
+		ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f "${path.resolve(pathToFile)}"`);
+	}
+
+	getDevWorkspaceYamlConfiguration(): ShellString {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL}`);
+		return ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} get dw ${this.workspaceName} -n ${this.namespace} -o yaml`);
+	}
+
+	waitDevWorkspace(timeout: number = 360): ShellString {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - wait till workspace ready.`);
+		const output: ShellString = ShellExecutor.execWithLog(
+			`${this.KUBERNETES_COMMAND_LINE_TOOL} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`
+		);
+		this.getPodAndContainerNames();
+		return output;
+	}
+
+	createNamespace(): void {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - create namespace "${this.namespace}".`);
+		ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} create namespace ${this.namespace}`);
+	}
+
+	createProject(projectName: string): void {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - create new project "${projectName}".`);
+		ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} new-project ${projectName} -n ${this.namespace}`);
+	}
+
+	deleteProject(projectName: string): void {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - delete "${projectName}".`);
+		ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} delete project ${projectName} -n ${this.namespace}`);
+	}
+
+	private getPodAndContainerNames(): void {
+		KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
+		KubernetesCommandLineToolsExecutor.container = this.getContainerName();
+	}
+
+	private isUserLoggedIn(): boolean {
+		const whoamiCommandOutput: ShellString = ShellExecutor.execWithLog('oc whoami && oc whoami --show-server=true');
+
+		return (
+			whoamiCommandOutput.stdout.includes(OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME) &&
+			whoamiCommandOutput.stdout.includes(this.getServerUrl())
+		);
+	}
+
+	private setNamespace(_namespace: string | undefined): string {
+		_namespace =
+			_namespace !== undefined
+				? _namespace
+				: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('devspaces')
+				? OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-devspaces'
+				: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('che')
+				? OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-che'
+				: 'default';
+		return _namespace;
+	}
+
+	private getServerUrl(): string {
+		Logger.debug(`${this.KUBERNETES_COMMAND_LINE_TOOL} - get server api url.`);
+		return BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
+	}
 }
 
+// eslint-disable-next-line no-redeclare
 export namespace KubernetesCommandLineToolsExecutor {
-    export class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
-        constructor(cluster: KubernetesCommandLineToolsExecutor) {
-            super(cluster.getWorkspaceName, cluster.getNamespace);
-        }
-
-        ls(path: string = ''): ShellString {
-            return this.executeCommand('ls ' + path);
-        }
-
-        pwd(): ShellString {
-            return this.executeCommand('pwd');
-        }
-
-        cd(path: string): ShellString {
-            return this.executeCommand('cd ' + path);
-        }
-
-        gitClone(repository: string): ShellString {
-            return this.executeCommand('git clone ' + repository);
-        }
-
-        removeFolder(path: string): ShellString {
-            return this.executeCommand('rm -rf ' + path);
-        }
-
-        getEnvValue(envName: string): string {
-            envName = envName.replace(/[${}]/g, '');
-            const output: ShellString = this.executeCommand(`env | grep ${envName}`);
-            return output.stderr ? output.stderr :
-                output.stdout
-                    .substring(output.stdout.lastIndexOf('=') + 1)
-                    .replace('\n', '');
-        }
-    }
+	export class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
+		constructor(cluster: KubernetesCommandLineToolsExecutor) {
+			super(cluster.getWorkspaceName, cluster.getNamespace);
+		}
+
+		ls(path: string = ''): ShellString {
+			return this.executeCommand('ls ' + path);
+		}
+
+		pwd(): ShellString {
+			return this.executeCommand('pwd');
+		}
+
+		cd(path: string): ShellString {
+			return this.executeCommand('cd ' + path);
+		}
+
+		gitClone(repository: string): ShellString {
+			return this.executeCommand('git clone ' + repository);
+		}
+
+		removeFolder(path: string): ShellString {
+			return this.executeCommand('rm -rf ' + path);
+		}
+
+		getEnvValue(envName: string): string {
+			envName = envName.replace(/[${}]/g, '');
+			const output: ShellString = this.executeCommand(`env | grep ${envName}`);
+			return output.stderr ? output.stderr : output.stdout.substring(output.stdout.lastIndexOf('=') + 1).replace('\n', '');
+		}
+	}
 }

package/utils/Logger.ts

@@ -1,5 +1,5 @@
-/*********************************************************************
- * Copyright (c) 2019-2023 Red Hat, Inc.
+/** *******************************************************************
+ * copyright (c) 2019-2023 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -7,85 +7,114 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { ReporterConstants } from '../constants/ReporterConstants';
+import { REPORTER_CONSTANTS } from '../constants/REPORTER_CONSTANTS';
 
 export abstract class Logger {
+	/**
+	 * uses for logging of fatal errors.
+	 * @param text log text
+	 * @param indentLevel log level
+	 */
+	static error(text: string = '', indentLevel: number = 1): void {
+		const callerInfo: string = this.getCallerInfo();
+		const logLevelSymbol: string = '[ERROR] ';
+		this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
+	}
 
-    /**
-     * Uses for logging of fatal errors.
-     * @param text log text
-     * @param indentLevel log level
-     */
-    static error(text: string, indentLevel: number = 1): void {
-        this.logText(indentLevel, `[ERROR] ${text}`);
-    }
+	/**
+	 * uses for logging of recoverable errors and general warnings.
+	 * @param text log text
+	 * @param indentLevel log level
+	 */
+	static warn(text: string = '', indentLevel: number = 1): void {
+		if (REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR') {
+			return;
+		}
+		const callerInfo: string = this.getCallerInfo();
+		const logLevelSymbol: string = '[WARN] ';
+		this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
+	}
 
-    /**
-     * Uses for logging of recoverable errors and general warnings.
-     * @param text log text
-     * @param indentLevel log level
-     */
-    static warn(text: string, indentLevel: number = 1): void {
-        if (ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR') {
-            return;
-        }
-        this.logText(indentLevel, `[WARN] ${text}`);
-    }
+	/**
+	 * uses for logging of the public methods of the pageobjects.
+	 * @param text log text
+	 * @param indentLevel log level
+	 */
+	static info(text: string = '', indentLevel: number = 3): void {
+		if (REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' || REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN') {
+			return;
+		}
+		const callerInfo: string = this.getCallerInfo();
+		const logLevelSymbol: string = '• ';
+		this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
+	}
 
-    /**
-     * Uses for logging of the public methods of the pageobjects.
-     * @param text log text
-     * @param indentLevel log level
-     */
-    static info(text: string, indentLevel: number = 3): void {
-        if (ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
-            ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN') {
-            return;
-        }
-        this.logText(indentLevel, `• ${text}`);
-    }
+	/**
+	 * uses for logging of the public methods of the pageobjects.
+	 * @param text log text
+	 * @param indentLevel log level
+	 */
+	static debug(text: string = '', indentLevel: number = 5): void {
+		if (
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'INFO'
+		) {
+			return;
+		}
+		const callerInfo: string = this.getCallerInfo();
+		const logLevelSymbol: string = '▼ ';
+		this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
+	}
 
-    /**
-     * Uses for logging of the public methods of the pageobjects.
-     * @param text log text
-     * @param indentLevel log level
-     */
-    static debug(text: string, indentLevel: number = 5): void {
-        if (ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
-            ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
-            ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'INFO') {
-            return;
-        }
-        this.logText(indentLevel, `▼ ${text}`);
-    }
+	/**
+	 * uses for logging of the public methods of the {@link DriverHelper} or
+	 * private methods inside of pageobjects.
+	 * @param text log text
+	 * @param indentLevel log level
+	 */
+	static trace(text: string = '', indentLevel: number = 6): void {
+		if (
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'INFO' ||
+			REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'DEBUG'
+		) {
+			return;
+		}
+		const callerInfo: string = this.getCallerInfo();
+		const logLevelSymbol: string = '‣ ';
+		this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
+	}
 
-    /**
-     * Uses for logging of the public methods of the {@link DriverHelper} or
-     * private methods inside of pageobjects.
-     * @param text log text
-     * @param indentLevel log level
-     */
-    static trace(text: string, indentLevel: number = 6): void {
-        if (ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
-            ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
-            ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'INFO' ||
-            ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'DEBUG') {
-            return;
-        }
-        this.logText(indentLevel, `‣ ${text}`);
-    }
+	private static getFullMessage(callerInfo: string, text: string): string {
+		return `${callerInfo}${this.separator(text, callerInfo)}${text}`;
+	}
 
-    private static logText(messageIndentationLevel: number, text: string): void {
-        // start group for every level
-        for (let i: number = 0; i < messageIndentationLevel; i++) {
-            console.group();
-        }
-        // print the trimmed text
-        // if multiline, the message should be properly padded
-        console.log(text);
-        // end group for every level
-        for (let i: number = 0; i < messageIndentationLevel; i++) {
-            console.groupEnd();
-        }
-    }
+	private static logText(messageIndentationLevel: number, logLevelSymbol: string, text: string): void {
+		if (text) {
+			// start group for every level
+			for (let i: number = 0; i < messageIndentationLevel; i++) {
+				console.group();
+			}
+			// print the trimmed text
+			// if multiline, the message should be properly padded
+			console.log(logLevelSymbol + text);
+			// end group for every level
+			for (let i: number = 0; i < messageIndentationLevel; i++) {
+				console.groupEnd();
+			}
+		}
+	}
+
+	private static getCallerInfo(): string {
+		const e: Error = new Error();
+		const stack: string[] = e.stack ? e.stack.split('\n') : [];
+		// " at functionName ( ..." => "functionName"
+		return stack[3].includes('.<anonymous') ? '' : stack[3].replace(/^\s+at\s+(.+?)\s.+/g, '$1');
+	}
+
+	private static separator(text: string, caller: string): string {
+		return text ? (caller ? ' - ' : '') : '';
+	}
 }