Fix nil bug when using sync.once (#23002)

[APM Onboarding] SSI bug fix for 7.52.0
DataDog · Feb 21, 2024 · bbe80bc · bbe80bc
1 parent 2c40962
commit bbe80bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pkg/clusteragent/admission/mutate/auto_instrumentation.go b/pkg/clusteragent/admission/mutate/auto_instrumentation.go
@@ -80,7 +80,7 @@ type language string
 
 type pinnedLibraries struct {
 	libraries []libInfo
-	once      *sync.Once
+	once      sync.Once
 }
 
 const (

diff --git a/pkg/clusteragent/admission/mutate/auto_instrumentation_test.go b/pkg/clusteragent/admission/mutate/auto_instrumentation_test.go
@@ -12,7 +12,6 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"sync"
 	"testing"
 	"time"
 
@@ -575,8 +574,7 @@ func TestExtractLibInfo(t *testing.T) {
 			}
 
 			// reset pinned libraries between test runs
-			pinnedLibs.once = new(sync.Once)
-			pinnedLibs.libraries = []libInfo{}
+			pinnedLibs = &pinnedLibraries{}
 
 			apmInstrumentation, err := newAPMInstrumentationWebhook()
 			require.NoError(t, err)
@@ -1848,8 +1846,7 @@ func TestInjectAutoInstrumentation(t *testing.T) {
 			fakeStoreWithDeployment(t, tt.langDetectionDeployments)
 
 			// reset pinned libraries between test runs
-			pinnedLibs.once = new(sync.Once)
-			pinnedLibs.libraries = []libInfo{}
+			pinnedLibs = &pinnedLibraries{}
 
 			apmInstrumentation, err := newAPMInstrumentationWebhook()
 			require.NoError(t, err)