@edgetesting/jmeter 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgetesting/jmeter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "CLI wrapper to upload JMeter .jtl results to EdgeTesting, evaluate SLA thresholds, and auto-create Jira bug reports on violations",
   "bin": {
     "edgetesting-jmeter": "./bin/edgetesting-jmeter.js"

package/src/index.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 'use strict';
 
-const { program } = require('commander');
-const FormData    = require('form-data');
-const fetch       = require('node-fetch');
-const fs          = require('fs');
-const path        = require('path');
+const { program }   = require('commander');
+const FormData      = require('form-data');
+const fetch         = require('node-fetch');
+const fs            = require('fs');
+const path          = require('path');
+const { spawnSync } = require('child_process');
+const os            = require('os');
 
 // ── Banner ────────────────────────────────────────────────────────────────────
 const RESET  = '\x1b[0m';
@@ -34,11 +36,15 @@ function printBanner() {
 // ── CLI definition ────────────────────────────────────────────────────────────
 program
   .name('edgetesting-jmeter')
-  .description('Upload a JMeter .jtl results file to EdgeTesting and evaluate SLA thresholds.')
-  .version('1.0.0')
-  .requiredOption(
+  .description('Run a JMeter test plan and/or upload a .jtl results file to EdgeTesting.')
+  .version('1.0.1')
+  .option(
     '-f, --file <path>',
-    'Path to the JMeter .jtl results file (CSV or XML)'
+    'Path to an existing JMeter .jtl results file (CSV or XML). Required unless --run is used.'
+  )
+  .option(
+    '-r, --run <jmx>',
+    'Path to a JMeter .jmx test plan. Runs it headlessly, then uploads the results automatically.'
   )
   .requiredOption(
     '-i, --id <automation_id>',
@@ -69,6 +75,11 @@ program
   .option(
     '--dry-run',
     'Parse the .jtl file and print metrics without uploading to EdgeTesting.'
+  )
+  .option(
+    '--jmeter-path <path>',
+    'Path to the jmeter executable. Defaults to "jmeter" (must be on PATH).',
+    'jmeter'
   );
 
 program.parse(process.argv);
@@ -78,37 +89,112 @@ const opts = program.opts();
 (async () => {
   printBanner();
 
-  // ── Resolve config from opts → env vars ─────────────────────────────────
+  // ── Validate: must provide --file or --run ────────────────────────────────
+  if (!opts.file && !opts.run) {
+    fail('You must provide either --file <path> or --run <jmx>.');
+    log('');
+    log(`  Examples:`);
+    log(`  ${DIM}# Upload an existing results file${RESET}`);
+    log(`  ${CYAN}npx edgetesting-jmeter --file results.jtl --id TC-100 --sla 500${RESET}`);
+    log('');
+    log(`  ${DIM}# Run a test plan AND upload automatically${RESET}`);
+    log(`  ${CYAN}npx edgetesting-jmeter --run my-test.jmx  --id TC-100 --sla 500${RESET}`);
+    log('');
+    process.exit(1);
+  }
+
+  // ── Resolve config from opts → env vars ──────────────────────────────────
   const apiKey = opts.apiKey || process.env.EDGETESTING_API_KEY || '';
   const apiUrl = (opts.apiUrl || process.env.EDGETESTING_API_URL || '')
     .replace(/\/api\/v1\/?$/, '')
     .replace(/\/$/, '');
 
-  const jtlPath      = path.resolve(opts.file);
   const automationId = opts.id;
-  const slaMs        = opts.sla        ?? null;
-  const slaErrPct    = opts.slaErrorPct ?? null;
-  const issueKey     = opts.issue       ?? null;
-  const isDryRun     = opts.dryRun      ?? false;
-
-  // ── Validate file ────────────────────────────────────────────────────────
-  if (!fs.existsSync(jtlPath)) {
-    fail(`File not found: ${jtlPath}`);
-    process.exit(1);
-  }
+  const slaMs        = opts.sla          ?? null;
+  const slaErrPct    = opts.slaErrorPct  ?? null;
+  const issueKey     = opts.issue        ?? null;
+  const isDryRun     = opts.dryRun       ?? false;
+  const jmeterBin    = opts.jmeterPath   || 'jmeter';
 
-  const stat    = fs.statSync(jtlPath);
-  const sizeMb  = (stat.size / 1024 / 1024).toFixed(2);
+  let jtlPath;
+  let tmpJtlPath = null; // track temp file so we can clean it up
 
-  info(`File:          ${bold(jtlPath)}`);
-  info(`Size:          ${sizeMb} MB`);
-  info(`Automation ID: ${bold(automationId)}`);
-  if (slaMs)     info(`SLA Latency:   ${bold(slaMs + 'ms')}`);
-  if (slaErrPct) info(`SLA Errors:    ${bold(slaErrPct + '%')}`);
-  if (issueKey)  info(`Jira Issue:    ${bold(issueKey)}`);
-  log('');
+  // ── --run: execute JMeter first ──────────────────────────────────────────
+  if (opts.run) {
+    const jmxPath = path.resolve(opts.run);
 
-  // ── Dry run — parse locally and exit ────────────────────────────────────
+    if (!fs.existsSync(jmxPath)) {
+      fail(`Test plan not found: ${jmxPath}`);
+      process.exit(1);
+    }
+
+    // Generate a temp file for the output
+    tmpJtlPath = path.join(os.tmpdir(), `edgetesting-${Date.now()}.jtl`);
+    jtlPath    = tmpJtlPath;
+
+    info(`Test plan:     ${bold(jmxPath)}`);
+    info(`Results file:  ${bold(tmpJtlPath)} (auto-generated)`);
+    info(`Automation ID: ${bold(automationId)}`);
+    if (slaMs)     info(`SLA Latency:   ${bold(slaMs + 'ms')}`);
+    if (slaErrPct) info(`SLA Errors:    ${bold(slaErrPct + '%')}`);
+    log('');
+
+    log(`${CYAN}▶${RESET}  Running JMeter...`);
+    log(`  ${DIM}${jmeterBin} -n -t ${jmxPath} -l ${tmpJtlPath}${RESET}`);
+    log('');
+
+    const result = spawnSync(
+      jmeterBin,
+      ['-n', '-t', jmxPath, '-l', tmpJtlPath],
+      { stdio: 'inherit', encoding: 'utf8' }
+    );
+
+    if (result.error) {
+      fail(`Could not launch JMeter: ${result.error.message}`);
+      log('');
+      log(`  Make sure JMeter is installed and on your PATH:`);
+      log(`  ${DIM}https://jmeter.apache.org/download_jmeter.cgi${RESET}`);
+      log(`  ${DIM}Or pass --jmeter-path /path/to/jmeter${RESET}`);
+      log('');
+      process.exit(1);
+    }
+
+    if (result.status !== 0) {
+      fail(`JMeter exited with code ${result.status}. Check the output above for errors.`);
+      if (tmpJtlPath && fs.existsSync(tmpJtlPath)) fs.unlinkSync(tmpJtlPath);
+      process.exit(1);
+    }
+
+    if (!fs.existsSync(jtlPath)) {
+      fail(`JMeter ran but did not produce a results file at: ${jtlPath}`);
+      process.exit(1);
+    }
+
+    ok('JMeter test completed.');
+    log('');
+
+  } else {
+    // --file mode
+    jtlPath = path.resolve(opts.file);
+
+    if (!fs.existsSync(jtlPath)) {
+      fail(`File not found: ${jtlPath}`);
+      process.exit(1);
+    }
+
+    const stat   = fs.statSync(jtlPath);
+    const sizeMb = (stat.size / 1024 / 1024).toFixed(2);
+
+    info(`File:          ${bold(jtlPath)}`);
+    info(`Size:          ${sizeMb} MB`);
+    info(`Automation ID: ${bold(automationId)}`);
+    if (slaMs)     info(`SLA Latency:   ${bold(slaMs + 'ms')}`);
+    if (slaErrPct) info(`SLA Errors:    ${bold(slaErrPct + '%')}`);
+    if (issueKey)  info(`Jira Issue:    ${bold(issueKey)}`);
+    log('');
+  }
+
+  // ── Dry run — parse locally and exit ─────────────────────────────────────
   if (isDryRun) {
     warn('Dry run mode — parsing locally, not uploading.');
     try {
@@ -116,22 +202,26 @@ const opts = program.opts();
       printMetrics(metrics, slaMs, slaErrPct);
     } catch (err) {
       fail('Parse error: ' + err.message);
+      cleanup(tmpJtlPath);
       process.exit(1);
     }
+    cleanup(tmpJtlPath);
     return;
   }
 
-  // ── Validate credentials ─────────────────────────────────────────────────
+  // ── Validate credentials ──────────────────────────────────────────────────
   if (!apiKey) {
     fail('No API key. Set EDGETESTING_API_KEY or pass --api-key.');
+    cleanup(tmpJtlPath);
     process.exit(1);
   }
   if (!apiUrl) {
     fail('No API URL. Set EDGETESTING_API_URL or pass --api-url.');
+    cleanup(tmpJtlPath);
     process.exit(1);
   }
 
-  // ── Upload ───────────────────────────────────────────────────────────────
+  // ── Upload ────────────────────────────────────────────────────────────────
   info(`Uploading to:  ${apiUrl}/api/v1/performance-executions`);
   log('');
 
@@ -154,6 +244,7 @@ const opts = program.opts();
     });
   } catch (err) {
     fail('Network error: ' + err.message);
+    cleanup(tmpJtlPath);
     process.exit(1);
   }
 
@@ -163,15 +254,20 @@ const opts = program.opts();
   } catch {
     const text = await response.text().catch(() => '');
     fail(`HTTP ${response.status} — unexpected response: ${text.slice(0, 200)}`);
+    cleanup(tmpJtlPath);
     process.exit(1);
   }
 
   if (!response.ok) {
     fail(`HTTP ${response.status}: ${body.error || body.message || JSON.stringify(body)}`);
+    cleanup(tmpJtlPath);
     process.exit(1);
   }
 
-  // ── Results ──────────────────────────────────────────────────────────────
+  // Clean up temp file after successful upload
+  cleanup(tmpJtlPath);
+
+  // ── Results ───────────────────────────────────────────────────────────────
   printMetrics(body.metrics, slaMs, slaErrPct);
 
   log('');
@@ -200,6 +296,14 @@ const opts = program.opts();
   if (body.sla_violated) process.exit(1);
 })();
 
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+function cleanup(tmpPath) {
+  if (tmpPath && fs.existsSync(tmpPath)) {
+    try { fs.unlinkSync(tmpPath); } catch (_) {}
+  }
+}
+
 // ── Local parser (dry-run only) ───────────────────────────────────────────────
 async function parseLocally(filePath) {
   const content = fs.readFileSync(filePath, 'utf8').trim();