Skip to content

Commit bbeb056

Browse files
committed
Fixed metrics, reusing a process counts as a warm start
1 parent f3a4000 commit bbeb056

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

packages/cli-v3/src/entryPoints/dev-run-worker.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,10 @@ const zodIpc = new ZodIpcConnection({
273273
emitSchema: ExecutorToWorkerMessageCatalog,
274274
process,
275275
handlers: {
276-
EXECUTE_TASK_RUN: async ({ execution, traceContext, metadata, metrics, env }, sender) => {
276+
EXECUTE_TASK_RUN: async (
277+
{ execution, traceContext, metadata, metrics, env, isWarmStart },
278+
sender
279+
) => {
277280
if (env) {
278281
populateEnv(env, {
279282
override: true,
@@ -294,7 +297,7 @@ const zodIpc = new ZodIpcConnection({
294297

295298
resetExecutionEnvironment();
296299

297-
standardRunTimelineMetricsManager.registerMetricsFromExecution(metrics);
300+
standardRunTimelineMetricsManager.registerMetricsFromExecution(metrics, isWarmStart);
298301

299302
if (_isRunning) {
300303
logError("Worker is already running a task");
@@ -437,6 +440,7 @@ const zodIpc = new ZodIpcConnection({
437440
tracingSDK,
438441
consoleInterceptor,
439442
retries: config.retries,
443+
isWarmStart,
440444
});
441445

442446
try {

packages/cli-v3/src/entryPoints/managed-run-worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ const zodIpc = new ZodIpcConnection({
259259
triggerJWT: getEnvVar("TRIGGER_JWT"),
260260
});
261261

262-
standardRunTimelineMetricsManager.registerMetricsFromExecution(metrics);
262+
standardRunTimelineMetricsManager.registerMetricsFromExecution(metrics, isWarmStart);
263263

264264
console.log(`[${new Date().toISOString()}] Received EXECUTE_TASK_RUN`, execution);
265265

packages/core/src/v3/otel/tracingSDK.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ class AsyncResourceDetector implements DetectorSync {
7474
return;
7575
}
7676

77-
console.log("resolving async resource detector", attributes);
78-
7977
this._resolved = true;
8078
this._resolver(attributes);
8179
}

packages/core/src/v3/runTimelineMetrics/runTimelineMetricsManager.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ export class StandardRunTimelineMetricsManager implements RunTimelineMetricsMana
1313
return this._metrics;
1414
}
1515

16-
registerMetricsFromExecution(metrics?: TaskRunExecutionMetrics): void {
17-
this.#seedMetricsFromEnvironment();
16+
registerMetricsFromExecution(
17+
metrics?: TaskRunExecutionMetrics,
18+
isWarmStartOverride?: boolean
19+
): void {
20+
this.#seedMetricsFromEnvironment(isWarmStartOverride);
1821

1922
if (metrics) {
2023
metrics.forEach((metric) => {
@@ -35,10 +38,11 @@ export class StandardRunTimelineMetricsManager implements RunTimelineMetricsMana
3538
}
3639

3740
// TODO: handle this when processKeepAlive is enabled
38-
#seedMetricsFromEnvironment() {
41+
#seedMetricsFromEnvironment(isWarmStartOverride?: boolean) {
3942
const forkStartTime = getEnvVar("TRIGGER_PROCESS_FORK_START_TIME");
4043
const warmStart = getEnvVar("TRIGGER_WARM_START");
41-
const isWarmStart = warmStart === "true";
44+
const isWarmStart =
45+
typeof isWarmStartOverride === "boolean" ? isWarmStartOverride : warmStart === "true";
4246

4347
if (typeof forkStartTime === "string" && !isWarmStart) {
4448
const forkStartTimeMs = parseInt(forkStartTime, 10);

0 commit comments

Comments
 (0)