detox 20.0.3-breaking.new-global-lifecycle.0 → 20.0.6-breaking.new-global-lifecycle.0

package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js

@@ -7,6 +7,8 @@ const { getFullTestName, hasTimedOut } = require('../utils');
 
 const RETRY_TIMES = Symbol.for('RETRY_TIMES');
 
+const log = detoxInternals.log.child({ cat: 'lifecycle,jest-environment' });
+
 class DetoxCoreListener {
   constructor({ env }) {
     this._startedTests = new WeakSet();
@@ -15,11 +17,6 @@ class DetoxCoreListener {
     this._testRunTimes = 1;
   }
 
-  _getTestInvocations(test) {
-    const { testSessionIndex } = detoxInternals.session;
-    return testSessionIndex * this._testRunTimes + test.invocations;
-  }
-
   async setup() {
     // Workaround to override Jest's expect
     if (detoxInternals.config.behavior.init.exposeGlobals) {
@@ -27,15 +24,19 @@ class DetoxCoreListener {
     }
   }
 
-  async run_describe_start({ describeBlock: { name, children } }) {
-    if (children.length) {
-      await detoxInternals.onRunDescribeStart({ name });
+  async run_describe_start({ describeBlock }) {
+    if (describeBlock.children.length) {
+      log.trace.begin(describeBlock.parent ? describeBlock.name : 'run the tests');
+      await detoxInternals.onRunDescribeStart({
+        name: describeBlock.name,
+      });
     }
   }
 
-  async run_describe_finish({ describeBlock: { name, children } }) {
-    if (children.length) {
-      await detoxInternals.onRunDescribeFinish({ name });
+  async run_describe_finish({ describeBlock }) {
+    if (describeBlock.children.length) {
+      await detoxInternals.onRunDescribeFinish({ name: describeBlock.name });
+      log.trace.end();
     }
   }
 
@@ -48,61 +49,87 @@ class DetoxCoreListener {
     this._testRunTimes = isNaN(circusRetryTimes) ? 1 : 1 + circusRetryTimes;
   }
 
-  async hook_start(_event, state) {
+  async hook_start(event, state) {
     await this._onBeforeActualTestStart(state.currentlyRunningTest);
+    log.trace.begin({ functionCode: event.hook.fn.toString() }, event.hook.type);
+  }
+
+  async hook_success() {
+    log.trace.end({ success: true });
   }
 
-  async hook_failure({ error, hook }) {
-    await detoxInternals.onHookFailure({
-      error,
-      hook: hook.type,
-    });
+  async hook_failure({ error }) {
+    log.trace.end({ success: false, error });
   }
 
   async test_fn_start({ test }) {
     await this._onBeforeActualTestStart(test);
+    log.trace.begin({ functionCode: test.fn.toString() }, 'test_fn');
   }
 
-  async test_fn_failure({ error }) {
-    await detoxInternals.onTestFnFailure({ error });
+  async test_fn_success() {
+    log.trace.end({ success: true });
   }
 
-  async _onBeforeActualTestStart(test) {
-    if (!test || test.status === 'skip' || this._startedTests.has(test) || this._testsFailedBeforeStart.has(test)) {
-      return;
-    }
-
-    this._startedTests.add(test);
-
-    await detoxInternals.onTestStart({
-      title: test.name,
-      fullName: getFullTestName(test),
-      status: 'running',
-      invocations: this._getTestInvocations(test),
-    });
+  async test_fn_failure({ error }) {
+    await detoxInternals.onTestFnFailure({ error });
+    log.trace.end({ success: false, error });
   }
 
   async test_done({ test }) {
     if (this._startedTests.has(test)) {
-      await detoxInternals.onTestDone({
-        title: test.name,
-        fullName: getFullTestName(test),
-        status: test.errors.length ? 'failed' : 'passed',
-        invocations: this._getTestInvocations(test),
-        timedOut: hasTimedOut(test)
-      });
-
+      const failed = test.errors.length > 0;
+      const metadata = {
+        ...this._getTestMetadata(test),
+        status: failed ? 'failed' : 'passed',
+        timedOut: failed ? hasTimedOut(test) : undefined,
+      };
+
+      await detoxInternals.onTestDone(metadata);
       this._startedTests.delete(test);
+      log.trace.end({
+        status: metadata.status,
+        timedOut: metadata.timedOut,
+      });
     }
   }
 
   async run_finish(_event, state) {
-    if (this._hasFailedTests(state.rootDescribeBlock)) {
+    const hasFailedTests = this._hasFailedTests(state.rootDescribeBlock);
+    if (hasFailedTests) {
       const handledByJestCircus = this._testRunTimes > 1 && !detoxInternals.config.testRunner.jest.retryAfterCircusRetries;
       await detoxInternals.reportFailedTests([this._env.testPath], handledByJestCircus);
     }
   }
 
+  async _onBeforeActualTestStart(test) {
+    if (!test || test.status === 'skip' || this._startedTests.has(test) || this._testsFailedBeforeStart.has(test)) {
+      return false;
+    }
+
+    const metadata = {
+      ...this._getTestMetadata(test),
+      status: 'running',
+    };
+
+    this._startedTests.add(test);
+
+    log.trace.begin({
+      context: 'test',
+      status: metadata.status,
+      fullName: metadata.fullName,
+      invocations: metadata.invocations,
+    }, metadata.title);
+
+    await detoxInternals.onTestStart(metadata);
+    return true;
+  }
+
+  _getTestInvocations(test) {
+    const { testSessionIndex } = detoxInternals.session;
+    return testSessionIndex * this._testRunTimes + test.invocations;
+  }
+
   _hasFailedTests(block) {
     if (block.children) {
       for (const child of block.children) {
@@ -114,6 +141,14 @@ class DetoxCoreListener {
 
     return block.errors ? block.errors.length > 0 : false;
   }
+
+  _getTestMetadata(test) {
+    return {
+      title: test.name,
+      fullName: getFullTestName(test),
+      invocations: this._getTestInvocations(test),
+    };
+  }
 }
 
 module.exports = DetoxCoreListener;

package/runners/jest/testEnvironment/listeners/SpecReporter.js

@@ -118,7 +118,7 @@ class SpecReporter {
     const retriesDescription = (invocations > 1) ? chalk.gray(` [Retry #${invocations - 1}]`) : '';
     const status = chalk.gray(_status ? ` [${_status}]` : '');
     const desc = this._suitesDesc + testDescription + retriesDescription + status;
-    log.info({ event: 'SPEC_STATE_CHANGE' }, desc);
+    log.info({ cat: 'lifecycle' }, desc);
   }
 }
 

package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js

@@ -13,7 +13,7 @@ class WorkerAssignReporter {
 
   run_start() {
     if (config.testRunner.jest.reportWorkerAssign) {
-      log.info({ event: 'WORKER_ASSIGN' }, `${this._formatTestName()} is assigned to ${this._formatDeviceName()}`);
+      log.info({ cat: 'lifecycle' }, `${this._formatTestName()} is assigned to ${this._formatDeviceName()}`);
     }
   }
 

package/src/DetoxWorker.js

@@ -32,6 +32,8 @@ class DetoxWorker {
       onError: this._onEmitError.bind(this),
     });
 
+    /** @type {string} */
+    this.id = 'worker';
     /** @type {Detox.Device} */
     this.device = null;
     /** @type {Detox.ElementFacade} */
@@ -63,14 +65,15 @@ class DetoxWorker {
       device: deviceConfig,
       session: sessionConfig
     } = this._config;
+
     this._appsConfig = appsConfig;
     this._artifactsConfig = artifactsConfig;
     this._behaviorConfig = behaviorConfig;
     this._deviceConfig = deviceConfig;
     this._sessionConfig = sessionConfig;
+    this._sessionConfig.sessionId = sessionConfig.sessionId || uuid.UUID();
     this._runtimeErrorComposer.appsConfig = this._appsConfig;
 
-    sessionConfig.sessionId = sessionConfig.sessionId || uuid.UUID();
     this._client = new Client(sessionConfig);
     this._client.terminateApp = async () => {
       // @ts-ignore

package/src/artifacts/ArtifactsManager.js

@@ -1,14 +1,13 @@
 const EventEmitter = require('events');
 const path = require('path');
-const util = require('util');
 
 const fs = require('fs-extra');
 const _ = require('lodash');
 
 const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
-const log = require('../utils/logger').child({ __filename });
+const log = require('../utils/logger').child({ cat: 'artifacts-manager,artifact' });
 const resolveModuleFromPath = require('../utils/resolveModuleFromPath');
-const { traceMethods } = require('../utils/trace');
+const traceMethods = require('../utils/traceMethods');
 
 const FileArtifact = require('./templates/artifact/FileArtifact');
 const ArtifactPathBuilder = require('./utils/ArtifactPathBuilder');
@@ -23,7 +22,7 @@ class ArtifactsManager extends EventEmitter {
     this._artifactPlugins = {};
     this._pathBuilder = this._resolveArtifactsPathBuilder(pathBuilder, rootDir);
 
-    traceMethods(this, 'artifacts-manager,artifacts', [
+    traceMethods(log, this, [
       'onAppReady',
       'onBeforeCleanup',
       'onBeforeLaunchApp',
@@ -228,27 +227,21 @@ class ArtifactsManager extends EventEmitter {
   }
 
   async _callSinglePlugin(pluginId, methodName, ...args) {
-    const callSignature = this._composeCallSignature('artifactsManager', methodName, args);
-    log.trace(Object.assign({ event: 'ARTIFACTS_LIFECYCLE', fn: methodName }, ...args), callSignature);
-
     const plugin = this._artifactPlugins[pluginId];
     try {
       await plugin[methodName](...args);
     } catch (e) {
-      this._unhandledPluginExceptionHandler(e, { plugin, methodName, args });
+      this._unhandledPluginExceptionHandler(e, { plugin, methodName });
     }
   }
 
   async _callPlugins(strategy, methodName, ...args) {
-    const callSignature = this._composeCallSignature('artifactsManager', methodName, args);
-    log.trace(Object.assign({ event: 'ARTIFACTS_LIFECYCLE', fn: methodName }, ...args), callSignature);
-
     for (const pluginGroup of this._groupPlugins(strategy)) {
       await Promise.all(pluginGroup.map(async (plugin) => {
         try {
           await plugin[methodName](...args);
         } catch (e) {
-          this._unhandledPluginExceptionHandler(e, { plugin, methodName, args });
+          this._unhandledPluginExceptionHandler(e, { plugin, methodName });
         }
       }));
     }
@@ -278,28 +271,20 @@ class ArtifactsManager extends EventEmitter {
     }
   }
 
-  _composeCallSignature(object, methodName, args) {
-    const argsString = args.map(arg => util.inspect(arg)).join(', ');
-    return `${object}.${methodName}(${argsString})`;
-  }
-
-  _unhandledPluginExceptionHandler(err, { plugin, methodName, args }) {
+  _unhandledPluginExceptionHandler(err, { plugin, methodName }) {
     const logObject = {
-      event: 'ERROR',
       plugin: plugin.name,
-      err,
       methodName,
+      err,
     };
 
-    const callSignature = this._composeCallSignature(plugin.name, methodName, args);
-    log.warn(logObject, `Suppressed error inside function call: ${callSignature}`);
+    log.warn(logObject, `Suppressed error inside function call.`);
   }
 
   _idleCallbackErrorHandle(err, caller) {
     this._unhandledPluginExceptionHandler(err, {
       plugin: caller,
       methodName: 'onIdleCallback',
-      args: []
     });
   }
 }

package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js

@@ -2,7 +2,7 @@
 const fs = require('fs-extra');
 const _ = require('lodash');
 
-const log = require('../../../utils/logger').child({ __filename });
+const log = require('../../../utils/logger').child({ cat: 'artifact' });
 const FileArtifact = require('../../templates/artifact/FileArtifact');
 const InstrumentsArtifactRecording = require('../InstrumentsArtifactRecording');
 
@@ -37,9 +37,9 @@ class SimulatorInstrumentsRecording extends InstrumentsArtifactRecording {
 SimulatorInstrumentsRecording.hintAboutDetoxInstruments = _.once(() => {
   log.warn(`Make sure either:
 1. You have installed Detox Instruments:
-   https://github.com/wix/DetoxInstruments#installation 
+   https://github.com/wix/DetoxInstruments#installation
 2. You have integrated Detox Instruments in your app:
-   https://github.com/wix/DetoxInstruments/blob/master/Documentation/XcodeIntegrationGuide.md 
+   https://github.com/wix/DetoxInstruments/blob/master/Documentation/XcodeIntegrationGuide.md
 3. You have set the environment variable with your custom Detox Instruments location:
    export DETOX_INSTRUMENTS_PATH="/path/to/Detox Instruments.app"`);
 });

package/src/artifacts/log/ios/SimulatorLogRecording.js

@@ -2,7 +2,7 @@
 const fs = require('fs-extra');
 
 const childProcess = require('../../../utils/childProcess');
-const log = require('../../../utils/logger').child({ __filename });
+const log = require('../../../utils/logger').child({ cat: 'artifact' });
 const sleep = require('../../../utils/sleep');
 const Artifact = require('../../templates/artifact/Artifact');
 const FileArtifact = require('../../templates/artifact/FileArtifact');

package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js

@@ -1,7 +1,7 @@
 const path = require('path');
 
 const fs = require('../../utils/fsext');
-const log = require('../../utils/logger').child({ __filename });
+const log = require('../../utils/logger').child({ cat: 'artifacts-plugin,artifacts' });
 const FileArtifact = require('../templates/artifact/FileArtifact');
 const temporaryPath = require('../utils/temporaryPath');
 

package/src/artifacts/templates/artifact/Artifact.js

@@ -1,5 +1,5 @@
 // @ts-nocheck
-const log = require('../../../utils/logger').child({ __filename });
+const log = require('../../../utils/logger').child({ cat: 'artifact' });
 
 class Artifact {
   constructor(template) {

package/src/artifacts/templates/plugin/ArtifactPlugin.js

@@ -3,7 +3,7 @@
 
 const _ = require('lodash');
 
-const log = require('../../../utils/logger').child({ __filename });
+const log = require('../../../utils/logger').child({ cat: 'artifacts-plugin,artifacts' });
 
 /***
  * Almost non-opinionated building block for any artifact type

package/src/artifacts/utils/temporaryPath.js

@@ -2,15 +2,26 @@ const path = require('path');
 
 const tempfile = require('tempfile');
 
+function createTempFileBuilderFn(fileExtension) {
+  /**
+   * @param {string} [basename]
+   */
+  return (basename) => {
+    return basename
+      ? path.join(path.dirname(tempfile()), `${basename}.detox.${fileExtension}`)
+      : tempfile(`.detox.${fileExtension}`);
+  };
+}
+
 module.exports = {
   for: {
-    json: () => tempfile('.detox.json'),
-    jsonl: () => tempfile('.detox.jsonl'),
-    png: () => tempfile('.detox.png'),
-    log: () => tempfile('.detox.log'),
-    mp4: () => tempfile('.detox.mp4'),
-    dtxrec: () => tempfile('.detox.dtxrec'),
-    viewhierarchy: () => tempfile('.detox.viewhierarchy'),
+    json: createTempFileBuilderFn('json'),
+    jsonl: createTempFileBuilderFn('jsonl'),
+    png: createTempFileBuilderFn('png'),
+    log: createTempFileBuilderFn('log'),
+    mp4: createTempFileBuilderFn('mp4'),
+    dtxrec: createTempFileBuilderFn('dtxrec'),
+    viewhierarchy: createTempFileBuilderFn('viewhierarchy'),
   },
   mask: () => path.join(tempfile(), '..') + path.sep + '*.detox.*',
 };

package/src/artifacts/video/SimulatorRecordVideoPlugin.js

@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
 
 const { interruptProcess } = require('../../utils/childProcess');
-const log = require('../../utils/logger').child({ __filename });
+const log = require('../../utils/logger').child({ cat: 'artifacts-plugin,artifact' });
 const Artifact = require('../templates/artifact/Artifact');
 const FileArtifact = require('../templates/artifact/FileArtifact');
 const temporaryPath = require('../utils/temporaryPath');

package/src/client/AsyncWebSocket.js

@@ -5,25 +5,16 @@ const WebSocket = require('ws');
 const DetoxInternalError = require('../errors/DetoxInternalError');
 const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
 const Deferred = require('../utils/Deferred');
-const log = require('../utils/logger').child({ __filename, cat: 'ws-client,ws' });
+const log = require('../utils/logger').child({ cat: 'ws-client,ws' });
 
 const InflightRequest = require('./InflightRequest');
 
-const EVENTS = {
-  OPEN: Object.freeze({ event: 'WS_OPEN' }),
-  ERROR: Object.freeze({ event: 'WS_ERROR' }),
-  MESSAGE: Object.freeze({ event: 'WS_MESSAGE' }),
-  SEND: Object.freeze({ event: 'WS_SEND' }),
-  LATE_RESPONSE: Object.freeze({ event: 'WS_LATE_RESPONSE' }),
-};
-
 const DEFAULT_SEND_OPTIONS = {
   timeout: 0,
 };
 
 class AsyncWebSocket {
   constructor(url) {
-    this._log = log.child({ url });
     this._url = url;
     this._ws = null;
     this._eventCallbacks = {};
@@ -99,9 +90,9 @@ class AsyncWebSocket {
 
     this.handleMultipleNonAtomicPendingActions();
 
-    const messageAsString = JSON.stringify(message);
-    this._log.trace(EVENTS.SEND, messageAsString);
-    this._ws.send(messageAsString);
+    const payload = JSON.stringify(message);
+    log.trace({ data: payload }, 'send message');
+    this._ws.send(payload);
 
     return inFlight.promise;
   }
@@ -157,7 +148,7 @@ class AsyncWebSocket {
     }
 
     if (!hasPendingActions) {
-      log.error(EVENTS.ERROR, DetoxRuntimeError.format(error));
+      log.error({ error });
     }
   }
 
@@ -186,7 +177,7 @@ class AsyncWebSocket {
    * @private
    */
   _onOpen(event) { // eslint-disable-line no-unused-vars
-    this._log.trace(EVENTS.OPEN, `opened web socket to: ${this._url}`);
+    log.trace(`opened web socket to: ${this._url}`);
     this._opening.resolve();
     this._opening = null;
   }
@@ -234,7 +225,7 @@ class AsyncWebSocket {
     const data = event && event.data || null;
 
     try {
-      this._log.trace(EVENTS.MESSAGE, data);
+      log.trace({ data }, 'get message');
 
       const json = JSON.parse(data);
       if (!json || !json.type) {
@@ -259,7 +250,7 @@ class AsyncWebSocket {
 
       if (!handled) {
         if (this._abortedMessageIds.has(json.messageId)) {
-          log.debug(EVENTS.LATE_RESPONSE, `Received late response for messageId=${json.messageId}`);
+          log.debug({ messageId: json.messageId }, `late response`);
         } else {
           throw new DetoxRuntimeError('Unexpected message received over the web socket: ' + json.type);
         }

package/src/client/Client.js

@@ -9,7 +9,7 @@ const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
 const failedToReachTheApp = require('../errors/longreads/failedToReachTheApp');
 const Deferred = require('../utils/Deferred');
 const { asError, createErrorWithUserStack, replaceErrorStack } = require('../utils/errorUtils');
-const log = require('../utils/logger').child({ __filename });
+const log = require('../utils/logger').child({ cat: 'ws-client,ws' });
 
 const AsyncWebSocket = require('./AsyncWebSocket');
 const actions = require('./actions/actions');

package/src/configuration/collectCliConfig.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 
 const argparse = require('../utils/argparse');
-const log = require('../utils/logger').child({ __filename });
+const log = require('../utils/logger').child({ cat: 'config' });
 
 const { DEVICE_LAUNCH_ARGS_GENERIC_DEPRECATION } = require('./utils/warnings');
 

package/src/configuration/composeDeviceConfig.js

@@ -2,7 +2,7 @@
 const _ = require('lodash');
 
 const environmentFactory = require('../environmentFactory');
-const log = require('../utils/logger').child({ __filename });
+const log = require('../utils/logger').child({ cat: 'config' });
 
 /**
  * @param {DetoxConfigErrorComposer} opts.errorComposer

package/src/configuration/composeLoggerConfig.js

@@ -7,25 +7,34 @@ const { castLevel, defaultOptions } = require('../logger/DetoxLogger');
  * @param {Detox.DetoxConfig} opts.globalConfig
  * @param {Detox.DetoxConfiguration} opts.localConfig
  * @param {*} opts.cliConfig
- * @returns {Detox.DetoxLoggerConfig}
  */
 function composeLoggerConfig(opts) {
   const { globalConfig, localConfig, cliConfig } = opts;
 
-  return _.merge(
+  const items = [
     {
       level: 'info',
       overrideConsole: 'sandbox',
-      options: {
-        ...defaultOptions,
-        prefixers: {
-          ...defaultOptions.prefixers,
-        },
-      },
+      options: defaultOptions,
     },
     globalConfig.logger,
     localConfig.logger,
     adaptCLI(cliConfig),
+  ];
+
+  return items.reduce(
+    /**
+     * @param {Partial<Detox.DetoxLoggerConfig>} acc
+     * @param config
+     */
+    (acc, config) => {
+      if (!config) return acc;
+      const { options } = config;
+      return _.merge(acc, {
+        options: typeof options === 'function' ? options(acc) : options
+      });
+    },
+    items.reduce((a, b) => _.merge(a, _.omit(b, 'options')))
   );
 }
 

package/src/configuration/composeRunnerConfig.js

@@ -8,7 +8,7 @@ const log = require('../utils/logger');
  * @param {object} opts
  * @param {Detox.DetoxConfig} opts.globalConfig
  * @param {Detox.DetoxConfiguration} opts.localConfig
- * @param {DetoxInternals.DetoxCLIConfig} opts.cliConfig
+ * @param {DetoxInternals.CLIConfig} opts.cliConfig
  * @param {Record<string, any>} opts.testRunnerArgv
  * @param {import('../errors/DetoxConfigErrorComposer')} opts.errorComposer
  * @returns {Detox.DetoxTestRunnerConfig} opts.testRunnerArgv

package/src/configuration/index.js

@@ -106,7 +106,6 @@ async function composeDetoxConfig({
 
   const result = {
     configurationName,
-    errorComposer,
 
     apps: appsConfig,
     artifacts: artifactsConfig,
@@ -118,6 +117,11 @@ async function composeDetoxConfig({
     session: sessionConfig,
   };
 
+  Object.defineProperty(result, 'errorComposer', {
+    enumerable: false,
+    value: errorComposer,
+  });
+
   return result;
 }
 

package/src/configuration/loadExternalConfig.js

@@ -6,7 +6,7 @@ const fs = require('fs-extra');
 const _ = require('lodash');
 const resolveFrom = require('resolve-from');
 
-const log = require('../utils/logger').child({ __filename });
+const log = require('../utils/logger').child({ cat: 'config' });
 
 async function locateExternalConfig(cwd) {
   return findUp([

package/src/devices/allocation/DeviceAllocator.js

@@ -1,5 +1,6 @@
 // @ts-nocheck
-const { traceMethods } = require('../../utils/trace');
+const log = require('../../utils/logger').child({ cat: 'device' });
+const traceMethods = require('../../utils/traceMethods');
 
 class DeviceAllocator {
   /**
@@ -7,7 +8,7 @@ class DeviceAllocator {
    */
   constructor(allocationDriver) {
     this._driver = allocationDriver;
-    traceMethods(this, 'device', ['allocate', 'free']);
+    traceMethods(log, this, ['allocate', 'free']);
   }
 
   /**

package/src/devices/allocation/drivers/android/emulator/AVDValidator.js

@@ -2,7 +2,7 @@ const _ = require('lodash');
 
 const DetoxRuntimeError = require('../../../../../errors/DetoxRuntimeError');
 const environment = require('../../../../../utils/environment');
-const logger = require('../../../../../utils/logger').child({ __filename });
+const logger = require('../../../../../utils/logger').child({ cat: 'device' });
 
 const REQUIRED_EMULATOR_MAJOR = 29;
 

package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js

@@ -1,7 +1,8 @@
 // @ts-nocheck
 const _ = require('lodash');
 
-const { traceMethods } = require('../../../../../utils/trace');
+const log = require('../../../../../utils/logger').child({ cat: 'device' });
+const traceMethods = require('../../../../../utils/traceMethods');
 const AndroidEmulatorCookie = require('../../../../cookies/AndroidEmulatorCookie');
 const AllocationDriverBase = require('../../AllocationDriverBase');
 
@@ -23,7 +24,7 @@ class EmulatorAllocDriver extends AllocationDriverBase {
     this._emulatorLauncher = emulatorLauncher;
     this._allocationHelper = allocationHelper;
 
-    traceMethods(this, 'device', ['_launchEmulator']);
+    traceMethods(log, this, ['_launchEmulator']);
   }
 
   /**

package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js

@@ -1,4 +1,4 @@
-const logger = require('../../../../../utils/logger').child({ __filename });
+const logger = require('../../../../../utils/logger').child({ cat: 'device' });
 const DeviceAllocationHelper  = require('../../../../common/drivers/DeviceAllocationHelper');
 
 const DetoxEmulatorsPortRange = {