[ACTP] make executor idle timeout authoritative

Author: embeaken

comp/privateactionrunner/impl/privateactionrunner.go

@@ -323,7 +323,7 @@ func (p *PrivateActionRunner) startExecutor(ctx context.Context) error {
 	}
 	serveOpts := executor.ServeOptions{
 		DrainTimeout: drainTimeout,
-		IdleTimeout:  executorIdleTimeout(p.coreConfig),
+		IdleTimeout:  executorIdleTimeout(p.coreConfig.GetInt(privateactionrunner.PARIdleTimeoutSeconds)),
 		OnIdleTimeout: func() {
 			p.logger.Info("Private action runner executor idle timeout elapsed; shutting down")
 			if err := p.shutdowner.Shutdown(); err != nil {
@@ -345,15 +345,11 @@ func (p *PrivateActionRunner) startExecutor(ctx context.Context) error {
 	return nil
 }
 
-// Keep self-termination behind the control plane's normal idle stop.
-const executorIdleTimeoutFactor = 3
-
-func executorIdleTimeout(cfg model.Reader) time.Duration {
-	idle := cfg.GetInt(privateactionrunner.PARIdleTimeoutSeconds)
-	if idle <= 0 {
+func executorIdleTimeout(idleSeconds int) time.Duration {
+	if idleSeconds <= 0 {
 		return 0
 	}
-	return time.Duration(idle) * executorIdleTimeoutFactor * time.Second
+	return time.Duration(idleSeconds) * time.Second
 }
 
 // StopExecutor gracefully stops the executor gRPC server and releases resources.

comp/privateactionrunner/impl/privateactionrunner_test.go

@@ -9,12 +9,29 @@ import (
 	"context"
 	"errors"
 	"testing"
+	"time"
 
 	"github.com/DataDog/datadog-go/v5/statsd"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func TestExecutorIdleTimeout(t *testing.T) {
+	for _, tt := range []struct {
+		name        string
+		idleSeconds int
+		want        time.Duration
+	}{
+		{name: "disabled", idleSeconds: 0, want: 0},
+		{name: "negative is disabled", idleSeconds: -1, want: 0},
+		{name: "uses configured duration", idleSeconds: 60, want: time.Minute},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.want, executorIdleTimeout(tt.idleSeconds))
+		})
+	}
+}
+
 func TestStopCleansUpMetricsClient(t *testing.T) {
 	tests := []struct {
 		name           string