From 48f63ca7bb6e95c7d5fd275dc4f6639b4105544c Mon Sep 17 00:00:00 2001 From: Raymond Wang Date: Tue, 9 Jan 2024 16:49:34 +1100 Subject: [PATCH] Refactor empty func to NoopHook --- internal/awslambda/extension/manager_test.go | 4 ++-- internal/awslambda/extension/telemetry/server.go | 4 ++++ internal/awslambda/extension/telemetry/server_test.go | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/awslambda/extension/manager_test.go b/internal/awslambda/extension/manager_test.go index 64c460b0..511555df 100644 --- a/internal/awslambda/extension/manager_test.go +++ b/internal/awslambda/extension/manager_test.go @@ -335,7 +335,7 @@ func TestManagerDo(t *testing.T) { domain: u.Hostname() + ":" + u.Port(), name: t.Name(), registeredID: t.Name(), - telemetryServer: telemetry.NewServer(log, func() {}, telemetry.WithCustomAddr(availableAddr())), + telemetryServer: telemetry.NewServer(log, telemetry.NoopHook(), telemetry.WithCustomAddr(availableAddr())), } start := make(chan struct{}, 1) @@ -404,7 +404,7 @@ func TestManagerTelemetrySubscription(t *testing.T) { domain: u.Hostname() + ":" + u.Port(), name: t.Name(), registeredID: t.Name(), - telemetryServer: telemetry.NewServer(log, func() {}, telemetry.WithCustomAddr(availableAddr())), + telemetryServer: telemetry.NewServer(log, telemetry.NoopHook(), telemetry.WithCustomAddr(availableAddr())), } assert.ErrorIs(t, tc.expectedError, m.subscribeToTelemetry(context.Background())) diff --git a/internal/awslambda/extension/telemetry/server.go b/internal/awslambda/extension/telemetry/server.go index 97f4b529..b2e44e7c 100644 --- a/internal/awslambda/extension/telemetry/server.go +++ b/internal/awslambda/extension/telemetry/server.go @@ -15,6 +15,10 @@ import ( type RuntimeDoneHook func() +func NoopHook() RuntimeDoneHook { + return func() {} +} + type Server struct { addr string log logrus.FieldLogger diff --git a/internal/awslambda/extension/telemetry/server_test.go b/internal/awslambda/extension/telemetry/server_test.go index cfde0bf1..342a1155 100644 --- a/internal/awslambda/extension/telemetry/server_test.go +++ b/internal/awslambda/extension/telemetry/server_test.go @@ -17,13 +17,13 @@ import ( func TestNewServer(t *testing.T) { t.Parallel() - assert.NotNil(t, NewServer(logrus.New(), func() {})) + assert.NotNil(t, NewServer(logrus.New(), NoopHook())) } func TestServerStart(t *testing.T) { t.Parallel() - s := NewServer(logrus.New(), func() {}, WithCustomAddr("127.0.0.1:8083")) + s := NewServer(logrus.New(), NoopHook(), WithCustomAddr("127.0.0.1:8083")) ctx, cancel := context.WithCancel(context.Background()) go func() { <-time.NewTimer(1 * time.Second).C @@ -91,12 +91,12 @@ func TestServerReturnsCorrectEndpoint(t *testing.T) { }{ { name: "default server uses sandbox endpoint", - server: NewServer(logrus.New(), func() {}), + server: NewServer(logrus.New(), NoopHook()), expectedEndpoint: "http://sandbox:8083/telemetry", }, { name: "custom server address returns correct endpoint", - server: NewServer(logrus.New(), func() {}, WithCustomAddr("127.0.0.1:8081")), + server: NewServer(logrus.New(), NoopHook(), WithCustomAddr("127.0.0.1:8081")), expectedEndpoint: "http://127.0.0.1:8081/telemetry", }, }