diff --git a/packages/orchestrator/pkg/server/sandboxes.go b/packages/orchestrator/pkg/server/sandboxes.go index cfd4a507f8..ed04dbb8f2 100644 --- a/packages/orchestrator/pkg/server/sandboxes.go +++ b/packages/orchestrator/pkg/server/sandboxes.go @@ -465,11 +465,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) - } - addKillReason(eventData, killReason) - recordSandboxKill(ctx, s.sandboxKilledCounter, killReason) + eventData[executionEventDataKey] = s.getSandboxExecutionData(sbx) eventType := events.SandboxKilledEventPair go s.sbxEventsService.Publish( @@ -567,9 +563,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 068308e811..98ba9a78c9 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)