diff --git a/packages/orchestrator/pkg/server/sandboxes.go b/packages/orchestrator/pkg/server/sandboxes.go index b679177ca6..573989d7f0 100644 --- a/packages/orchestrator/pkg/server/sandboxes.go +++ b/packages/orchestrator/pkg/server/sandboxes.go @@ -549,9 +549,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) @@ -654,9 +652,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 b9f26ea293..35f0889d40 100644 --- a/packages/shared/pkg/featureflags/flags.go +++ b/packages/shared/pkg/featureflags/flags.go @@ -171,7 +171,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)