Skip to content
This repository was archived by the owner on Jan 12, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion workspaces/local-cli/src/shared/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
getCredentials,
getUserFromCredentials,
} from './authentication-server';
import { IUser } from '@useoptic/cli-config';
import { IOpticTaskRunnerConfig, IUser } from '@useoptic/cli-config';

const token = 'RvYGmY1bZqlbMukS8pP9DPEifG6CEBEs';
const analytics = new Analytics(token, {
Expand Down Expand Up @@ -60,3 +60,25 @@ export function trackAndSpawn(event: string, properties: any = {}) {
);
});
}

export function opticTaskToProps(
task: string,
config: IOpticTaskRunnerConfig
): any {
if (config) {
return {
task,
command: config.command,
'serviceConfig.port': config.serviceConfig.port,
'serviceConfig.host': config.serviceConfig.host,
'serviceConfig.protocol': config.serviceConfig.protocol,
'serviceConfig.basePath': config.serviceConfig.basePath,
'proxyConfig.port': config.proxyConfig.port,
'proxyConfig.host': config.proxyConfig.host,
'proxyConfig.protocol': config.proxyConfig.protocol,
'proxyConfig.basePath': config.proxyConfig.basePath,
};
} else {
return { task };
}
}
8 changes: 6 additions & 2 deletions workspaces/local-cli/src/shared/local-cli-task-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
IPathMapping,
TargetPortUnavailableError,
} from '@useoptic/cli-config';
import { trackAndSpawn } from './analytics';
import { opticTaskToProps, trackAndSpawn } from './analytics';
import { lockFilePath } from './paths';
import { Client, SpecServiceClient } from '@useoptic/cli-client';
import findProcess from 'find-process';
Expand Down Expand Up @@ -51,7 +51,10 @@ export class LocalCliTaskRunner implements IOpticTaskRunner {
): Promise<void> {
////////////////////////////////////////////////////////////////////////////////

trackAndSpawn('Run Task with Local CLI', { taskConfig });
trackAndSpawn('Run Task with Local CLI', {
...opticTaskToProps('', taskConfig),
captureId: this.captureId,
});

////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -133,6 +136,7 @@ ${blockers.map((x) => `[pid ${x.pid}]: ${x.cmd}`).join('\n')}
taskConfig,
sampleCount,
hasDiff,
captureId: this.captureId,
});

if (hasDiff) {
Expand Down
10 changes: 6 additions & 4 deletions workspaces/local-cli/src/shared/verify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
CommandSession,
} from '@useoptic/cli-shared';
import waitOn from 'wait-on';
import { track, trackAndSpawn } from './analytics';
import { opticTaskToProps, track, trackAndSpawn } from './analytics';
import { fromOptic } from '@useoptic/cli-shared';
import url from 'url';

Expand Down Expand Up @@ -209,7 +209,10 @@ export function verifyTask(cli: Command, taskName: string): void {
tasks
.run()
.then(async () => {
await trackAndSpawn('API Check', { startConfig, hasError: false });
await trackAndSpawn('API Check', {
...opticTaskToProps(taskName, startConfig),
hasError: false,
});
cli.log(
'\n\n' +
fromOptic(
Expand Down Expand Up @@ -239,10 +242,9 @@ export function verifyTask(cli: Command, taskName: string): void {
);

await trackAndSpawn('API Check', {
startConfig,
...opticTaskToProps(taskName, startConfig),
hasError: true,
error: err.message,
});
process.exit(0);
});
}