Skip to content
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
62 changes: 13 additions & 49 deletions bin/run.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env -S node --no-deprecation
/* eslint-disable n/no-process-exit */

/* eslint-disable n/no-unpublished-bin */

import {execute, settings} from '@oclif/core'

// Enable performance tracking when DEBUG=oclif:perf or DEBUG=* is set
if (process.env.DEBUG?.includes('oclif:perf') || process.env.DEBUG === '*') {
// Enable performance tracking when oclif:perf is specified in DEBUG
if (process.env.DEBUG?.includes('oclif:perf') || process.env.DEBUG === 'oclif:*' || process.env.DEBUG === '*') {
settings.performanceEnabled = true
}

Expand All @@ -16,54 +16,18 @@ const cliStartTime = now.getTime()

// Skip telemetry entirely on Windows for performance (unless explicitly enabled)
const enableTelemetry = process.platform !== 'win32' || process.env.ENABLE_WINDOWS_TELEMETRY === 'true'
let globalTelemetry

if (enableTelemetry) {
// Dynamically import telemetry only when needed
globalTelemetry = await import('../dist/global_telemetry.js')
}

process.once('beforeExit', async code => {
if (!enableTelemetry) return

// capture as successful exit
if (global.cliTelemetry) {
if (global.cliTelemetry.isVersionOrHelp) {
const cmdStartTime = global.cliTelemetry.commandRunDuration
global.cliTelemetry.commandRunDuration = globalTelemetry.computeDuration(cmdStartTime)
}

global.cliTelemetry.exitCode = code
global.cliTelemetry.cliRunDuration = globalTelemetry.computeDuration(cliStartTime)
const telemetryData = global.cliTelemetry
await globalTelemetry.sendTelemetry(telemetryData)
}
})

process.on('SIGINT', () => {
if (enableTelemetry) {
// Fire-and-forget: attempt to send telemetry but don't block exit
const error = new Error('Received SIGINT')
error.cliRunDuration = globalTelemetry.computeDuration(cliStartTime)
globalTelemetry.sendTelemetry(error).catch(() => {})
}

process.exit(1)
})

process.on('SIGTERM', () => {
if (enableTelemetry) {
// Fire-and-forget: attempt to send telemetry but don't block exit
const error = new Error('Received SIGTERM')
error.cliRunDuration = globalTelemetry.computeDuration(cliStartTime)
globalTelemetry.sendTelemetry(error).catch(() => {})
}

process.exit(1)
})

if (enableTelemetry) {
globalTelemetry.initializeInstrumentation()
// Dynamically import telemetry modules
const {setupTelemetryHandlers} = await import('../dist/lib/analytics-telemetry/worker-client.js')
const {computeDuration} = await import('../dist/lib/analytics-telemetry/telemetry-utils.js')

// Setup all telemetry handlers (beforeExit, SIGINT, SIGTERM)
setupTelemetryHandlers({
cliStartTime,
computeDuration,
enableTelemetry,
})
}

await execute({dir: import.meta.url})
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@
"command_not_found": [
"./dist/hooks/command_not_found/performance_analytics"
],
"finally": [
"./dist/hooks/finally/sentry"
],
"init": [
"./dist/hooks/init/version",
"./dist/hooks/init/terms-of-service",
Expand Down
275 changes: 0 additions & 275 deletions src/global_telemetry.ts

This file was deleted.

10 changes: 6 additions & 4 deletions src/hooks/command_not_found/performance_analytics.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import {Hook} from '@oclif/core/hooks'

const performance_analytics: Hook<'command_not_found'> = async function () {
// Skip telemetry on Windows for performance (unless explicitly enabled)
if (process.platform === 'win32' && process.env.ENABLE_WINDOWS_TELEMETRY !== 'true') {
const {isTelemetryEnabled} = await import('../../lib/analytics-telemetry/telemetry-utils.js')
const {reportCmdNotFound} = await import('../../lib/analytics-telemetry/global-telemetry.js')

// Use the consolidated telemetry check
if (!isTelemetryEnabled()) {
return
}

const telemetry = await import('../../global_telemetry.js');
(global as any).cliTelemetry = telemetry.reportCmdNotFound(this.config)
(global as any).cliTelemetry = reportCmdNotFound(this.config)
}

export default performance_analytics
Loading
Loading