From 14e0ed37e965838ef58211ae859cb35040162f1e Mon Sep 17 00:00:00 2001 From: AdaAibaby Date: Fri, 29 May 2026 11:34:42 +0800 Subject: [PATCH] feat(orchestrator): always include execution metrics in sandbox webhook events --- packages/orchestrator/pkg/server/sandboxes.go | 8 ++------ packages/shared/pkg/featureflags/flags.go | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/orchestrator/pkg/server/sandboxes.go b/packages/orchestrator/pkg/server/sandboxes.go index b1783f1381..209b332dc4 100644 --- a/packages/orchestrator/pkg/server/sandboxes.go +++ b/packages/orchestrator/pkg/server/sandboxes.go @@ -475,9 +475,7 @@ func (s *Server) Delete(ctxConn context.Context, in *orchestrator.SandboxDeleteR }() teamID, buildId, eventData := s.prepareSandboxEventData(ctx, sbx) - if s.featureFlags.BoolFlag(ctx, featureflags.ExecutionMetricsOnWebhooksFlag) { - eventData[executionEventDataKey] = s.getSandboxExecutionData(sbx) - } + eventData[executionEventDataKey] = s.getSandboxExecutionData(sbx) addKillReason(eventData, killReason) recordSandboxKill(ctx, s.sandboxKilledCounter, killReason) @@ -577,9 +575,7 @@ func (s *Server) Pause(ctx context.Context, in *orchestrator.SandboxPauseRequest s.uploadSnapshotAsync(ctx, sbx, res) teamID, buildId, eventData := s.prepareSandboxEventData(ctx, sbx) - if s.featureFlags.BoolFlag(ctx, featureflags.ExecutionMetricsOnWebhooksFlag) { - eventData[executionEventDataKey] = s.getSandboxExecutionData(sbx) - } + eventData[executionEventDataKey] = s.getSandboxExecutionData(sbx) eventType := events.SandboxPausedEventPair go s.sbxEventsService.Publish( diff --git a/packages/shared/pkg/featureflags/flags.go b/packages/shared/pkg/featureflags/flags.go index 1d5b27bacc..40d65eb862 100644 --- a/packages/shared/pkg/featureflags/flags.go +++ b/packages/shared/pkg/featureflags/flags.go @@ -155,7 +155,6 @@ var ( PeerToPeerAsyncCheckpointFlag = NewBoolFlag("peer-to-peer-async-checkpoint", false) PersistentVolumesFlag = NewBoolFlag("can-use-persistent-volumes", env.IsDevelopment()) - ExecutionMetricsOnWebhooksFlag = NewBoolFlag("execution-metrics-on-webhooks", false) // TODO: Remove NLT 20250315 SandboxLabelBasedSchedulingFlag = NewBoolFlag("sandbox-label-based-scheduling", false) OptimisticResourceAccountingFlag = NewBoolFlag("sandbox-placement-optimistic-resource-accounting", false) FreePageReportingFlag = NewBoolFlag("free-page-reporting", false)