refactor: revert pw engine and set sleep in otel

artilleryio · Jan 23, 2024 · e57a380 · e57a380
1 parent b2a6b37
commit e57a380
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/packages/artillery-engine-playwright/index.js b/packages/artillery-engine-playwright/index.js
@@ -30,6 +30,10 @@ class PlaywrightEngine {
       typeof script.config.engines.playwright.showAllPageMetrics !==
       'undefined';
 
+    this.useSeparateBrowserPerVU = 
+      typeof script.config.engines.playwright.useSeparateBrowserPerVU === 'boolean' ? 
+        script.config.engines.playwright.useSeparateBrowserPerVU : false;
+
     return this;
   }
 
@@ -64,8 +68,18 @@ class PlaywrightEngine {
 
       const contextOptions = self.contextOptions || {};
 
-      const browser = await chromium.launch(launchOptions);
-      debug('browser created');
+      let browser;
+      if (self.useSeparateBrowserPerVU) {
+        browser = await chromium.launch(launchOptions);
+        debug('new browser created');
+      } else {
+        if (!global.artillery.__browser) {
+          global.artillery.__browser = await chromium.launch(launchOptions);
+          debug('shared browser created');
+        }
+        browser = global.artillery.__browser;
+      }
+
       const context = await browser.newContext(contextOptions);
 
       context.setDefaultNavigationTimeout(self.defaultNavigationTimeout);
@@ -96,7 +110,13 @@ class PlaywrightEngine {
 
         debug('page created');
 
+        page.on('response', (response) => {
+          const status = response.status();
+          events.emit('counter', 'browser.page.codes.' + status, 1);
+        });
+
         page.on('domcontentloaded', async (page) => {
+
           if (!self.extendedMetrics) {
             return;
           }
@@ -226,7 +246,10 @@ class PlaywrightEngine {
         }
       } finally {
         await context.close();
-        await browser.close();
+
+        if (self.useSeparateBrowserPerVU) {
+          await browser.close();            // TODO: check if need to remove browser from global object/set to false
+        }
       }
     };
   }

diff --git a/packages/artillery-plugin-publish-metrics/lib/open-telemetry/tracing/base.js b/packages/artillery-plugin-publish-metrics/lib/open-telemetry/tracing/base.js
@@ -147,6 +147,7 @@ class OTelTraceBase {
       debug('Waiting for pending traces ...');
       await new Promise((resolve) => setTimeout(resolve, 500));
     }
+    await new Promise((resolve) => setTimeout(resolve, 10000));
     debug('Pending traces done');
   }
 }

diff --git a/packages/artillery/lib/platform/aws-ecs/legacy/run-cluster.js b/packages/artillery/lib/platform/aws-ecs/legacy/run-cluster.js
@@ -1118,6 +1118,10 @@ async function ensureTaskExists(context) {
             {
               name: 'DD_SITE',
               value: 'datadoghq.com'
+            },
+            {
+              name: 'DD_LOG_LEVEL',
+              value: 'WARN'
             }
           ],
           logConfiguration: {