chore: event changes and minor improvements

Author: rlmestre

src/commands/scan/eol.ts

@@ -57,30 +57,27 @@ export default class ScanEol extends Command {
   public async run(): Promise<EolReport | undefined> {
     const { flags } = await this.parse(ScanEol);
 
-    if (!flags.file) {
-      track('CLI SBOM Generation Started', (context) => ({
-        command: context.command,
-        command_flags: context.command_flags,
-        scan_location: flags.dir,
-      }));
-    }
+    track('CLI EOL Scan Started', (context) => ({
+      command: context.command,
+      command_flags: context.command_flags,
+      scan_location: flags.dir,
+    }));
 
     const sbomStartTime = performance.now();
     const sbom = await this.loadSbom();
     const sbomEndTime = performance.now();
 
     if (!flags.file) {
-      track('CLI SBOM Generation Completed', (context) => ({
+      track('CLI SBOM Generated', (context) => ({
         command: context.command,
         command_flags: context.command_flags,
         scan_location: flags.dir,
-        sbom_created: true,
-        sbom_load_time: (sbomEndTime - sbomStartTime) / 1000,
+        sbom_generation_time: (sbomEndTime - sbomStartTime) / 1000,
       }));
     }
 
     if (!sbom.components?.length) {
-      track('CLI No Components Found, Report Not Generated', (context) => ({
+      track('CLI EOL Scan Ended, No Components Found', (context) => ({
         command: context.command,
         command_flags: context.command_flags,
         scan_location: flags.dir,
@@ -89,12 +86,6 @@ export default class ScanEol extends Command {
       return;
     }
 
-    track('CLI EOL Scan Started', (context) => ({
-      command: context.command,
-      command_flags: context.command_flags,
-      scan_location: flags.dir,
-    }));
-
     const scanStartTime = performance.now();
     const scan = await this.scanSbom(sbom);
     const scanEndTime = performance.now();

src/hooks/finally.ts

@@ -2,12 +2,18 @@ import type { Hook } from '@oclif/core';
 import ora from 'ora';
 import { track } from '../service/analytics.svc.ts';
 
-const hook: Hook<'finally'> = async () => {
+const hook: Hook<'finally'> = async (opts) => {
   const spinner = ora().start('Cleaning up');
-  track('CLI Session Ended', (context) => ({
+  const event = track('CLI Session Ended', (context) => ({
     cli_version: context.cli_version,
     ended_at: new Date(),
-  })).promise.then(() => spinner.stop());
+  })).promise;
+
+  if (!opts.argv.includes('--help')) {
+    await event;
+  }
+
+  spinner.stop();
 };
 
 export default hook;

src/hooks/prerun.ts

@@ -1,10 +1,14 @@
+import { parseArgs } from 'node:util';
 import type { Hook } from '@oclif/core';
 import debug from 'debug';
 import { initializeAnalytics, track } from '../service/analytics.svc.ts';
 
 const hook: Hook<'prerun'> = async (opts) => {
+  const args = parseArgs({ allowPositionals: true, strict: false });
   initializeAnalytics();
-  track('CLI Session Started', (context) => ({
+  track('CLI Command Submitted', (context) => ({
+    command: args.positionals.join(' ').trim(),
+    command_flags: Object.entries(args.values).flat().join(' '),
     app_used: context.app_used,
     ci_provider: context.ci_provider,
     cli_version: context.cli_version,