Merge branch 'main' into nap-default-server

aphralG · aphralG · commit 544169c75e49 · 2025-10-13T11:50:21.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -293,7 +293,7 @@ jobs:
           name: nginx-agent-unsigned-snapshots
           path: build
       - name: Login to Docker Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ${{ secrets.TEST_REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USERNAME }}
@@ -414,7 +414,7 @@ jobs:
           name: nginx-agent-unsigned-snapshots
           path: build
       - name: Login to Docker Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ${{ secrets.TEST_REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USERNAME }}
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -25,6 +25,6 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
+        uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
         with:
           config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/nginx/agent/v3
 
-go 1.24.0
+go 1.24.2
 
 toolchain go1.24.7
 
@@ -17,7 +17,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
 	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
-	github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
+	github.com/nginx/nginx-plus-go-client/v3 v3.0.1
 	github.com/nginxinc/nginx-prometheus-exporter v1.3.0
 	github.com/nxadm/tail v1.4.11
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.135.0
@@ -340,7 +340,7 @@ require (
 	golang.org/x/arch v0.12.0 // indirect
 	golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.36.0 // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
diff --git a/go.sum b/go.sum
@@ -468,10 +468,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nginx/nginx-plus-go-client/v3 v3.0.1 h1:SU8MoRQVSa1aXqNUI3fc+OA9GM30aqAhV4yBWs9tD2s=
+github.com/nginx/nginx-plus-go-client/v3 v3.0.1/go.mod h1:PjlGB6drb5RCWnUp1XDTlzKFPRI2a3ePg2kNCb1AN94=
 github.com/nginxinc/nginx-go-crossplane v0.4.46 h1:QsmhZRHkl2IcPjqjbLB8s55ViH0u5hopSv6DpwgtmOo=
 github.com/nginxinc/nginx-go-crossplane v0.4.46/go.mod h1:UzbZnyFv0vPlt1Urbnp/mrFCzBL4tYCReFuNBpFQEfI=
-github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o=
-github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1/go.mod h1:He+1izxYxVVO5/C9ZTukwOpvkAx5eS19nRQgKXDhX5I=
 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 h1:1JtdxsZH0Uwhu1nL/j/QyOXytP5V5j68AEo2X+DFWb0=
 github.com/nginxinc/nginx-prometheus-exporter v1.3.0/go.mod h1:hXoH+X6aIKSyQuO6QTIiPKH3eZyxqy/wW8GYiE3dflU=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
@@ -1028,8 +1028,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/internal/collector/nginxplusreceiver/record/cache_metrics.go b/internal/collector/nginxplusreceiver/record/cache_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/http_metrics.go b/internal/collector/nginxplusreceiver/record/http_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
@@ -35,22 +35,22 @@ func (hm *HTTPMetrics) RecordHTTPMetrics(stats *plusapi.Stats, now pcommon.Times
 	// Connections
 	hm.mb.RecordNginxHTTPConnectionsDataPoint(
 		now,
-		int64(stats.Connections.Accepted),
+		stats.Connections.Accepted,
 		metadata.AttributeNginxConnectionsOutcomeACCEPTED,
 	)
 	hm.mb.RecordNginxHTTPConnectionsDataPoint(
 		now,
-		int64(stats.Connections.Dropped),
+		stats.Connections.Dropped,
 		metadata.AttributeNginxConnectionsOutcomeDROPPED,
 	)
 	hm.mb.RecordNginxHTTPConnectionCountDataPoint(
 		now,
-		int64(stats.Connections.Active),
+		stats.Connections.Active,
 		metadata.AttributeNginxConnectionsOutcomeACTIVE,
 	)
 	hm.mb.RecordNginxHTTPConnectionCountDataPoint(
 		now,
-		int64(stats.Connections.Idle),
+		stats.Connections.Idle,
 		metadata.AttributeNginxConnectionsOutcomeIDLE,
 	)
 }
diff --git a/internal/collector/nginxplusreceiver/record/location_zone_metrics.go b/internal/collector/nginxplusreceiver/record/location_zone_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/server_zone_metrics.go b/internal/collector/nginxplusreceiver/record/server_zone_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/slab_metrics.go b/internal/collector/nginxplusreceiver/record/slab_metrics.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.uber.org/zap"
 )
diff --git a/internal/collector/nginxplusreceiver/record/ssl_metrics.go b/internal/collector/nginxplusreceiver/record/ssl_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/stream_metrics.go b/internal/collector/nginxplusreceiver/record/stream_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/upstream_metrics.go b/internal/collector/nginxplusreceiver/record/upstream_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/scraper.go b/internal/collector/nginxplusreceiver/scraper.go
@@ -27,7 +27,7 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 )
 
 type NginxPlusScraper struct {
diff --git a/internal/file/file_manager_service.go b/internal/file/file_manager_service.go
@@ -110,7 +110,7 @@ type FileManagerService struct {
 	manifestFilePath      string
 	tempConfigDir         string
 	tempRollbackDir       string
-	configPath            string
+	tempConfigPath        string
 	rollbackManifest      bool
 	filesMutex            sync.RWMutex
 }
@@ -127,13 +127,13 @@ func NewFileManagerService(fileServiceClient mpi.FileServiceClient, agentConfig
 		previousManifestFiles: make(map[string]*model.ManifestFile),
 		rollbackManifest:      true,
 		manifestFilePath:      agentConfig.LibDir + "/manifest.json",
-		configPath:            "/etc/nginx/",
 		manifestLock:          manifestLock,
 	}
 }
 
 func (fms *FileManagerService) SetConfigPath(configPath string) {
-	fms.configPath = filepath.Dir(configPath)
+	fms.tempConfigPath = fmt.Sprintf("%s/.agent-%s", filepath.Dir(configPath), fms.agentConfig.UUID)
+	fms.ClearCache()
 }
 
 func (fms *FileManagerService) ResetClient(ctx context.Context, fileServiceClient mpi.FileServiceClient) {
@@ -219,18 +219,13 @@ func (fms *FileManagerService) ConfigApply(ctx context.Context,
 }
 
 func (fms *FileManagerService) ClearCache() {
-	slog.Debug("Clearing cache and temp files after config apply")
+	slog.Debug("Clearing cache and temp files")
 	clear(fms.fileActions)
 	clear(fms.previousManifestFiles)
 
-	configErr := os.RemoveAll(fms.tempConfigDir)
-	if configErr != nil {
-		slog.Error("Error removing temp config directory", "path", fms.tempConfigDir, "err", configErr)
-	}
-
-	rollbackErr := os.RemoveAll(fms.tempRollbackDir)
-	if rollbackErr != nil {
-		slog.Error("Error removing temp rollback directory", "path", fms.tempRollbackDir, "err", rollbackErr)
+	configErr := os.RemoveAll(fms.tempConfigPath)
+	if configErr != nil && !os.IsNotExist(configErr) {
+		slog.Error("Error removing temp directory", "path", fms.tempConfigDir, "err", configErr)
 	}
 }
 
@@ -759,7 +754,13 @@ func (fms *FileManagerService) convertToFile(manifestFile *model.ManifestFile) *
 }
 
 func (fms *FileManagerService) createTempConfigDirectory(pattern string) (string, error) {
-	tempDir, tempDirError := os.MkdirTemp(fms.configPath, pattern)
+	if _, err := os.Stat(fms.tempConfigPath); os.IsNotExist(err) {
+		mkdirErr := os.MkdirAll(fms.tempConfigPath, dirPerm)
+		if mkdirErr != nil {
+			return "", mkdirErr
+		}
+	}
+	tempDir, tempDirError := os.MkdirTemp(fms.tempConfigPath, pattern)
 	if tempDirError != nil {
 		return "", fmt.Errorf("failed creating temp config directory: %w", tempDirError)
 	}
diff --git a/internal/file/file_manager_service_test.go b/internal/file/file_manager_service_test.go
@@ -59,7 +59,7 @@ func TestFileManagerService_ConfigApply_Add(t *testing.T) {
 	agentConfig.AllowedDirectories = []string{tempDir}
 
 	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
-	fileManagerService.configPath = filepath.Dir(filePath)
+	fileManagerService.tempConfigPath = filepath.Dir(filePath)
 	fileManagerService.agentConfig.LibDir = manifestDirPath
 	fileManagerService.manifestFilePath = manifestFilePath
 
@@ -109,7 +109,7 @@ func TestFileManagerService_ConfigApply_Add_LargeFile(t *testing.T) {
 	agentConfig.AllowedDirectories = []string{tempDir}
 	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
 	fileManagerService.agentConfig.LibDir = manifestDirPath
-	fileManagerService.configPath = filepath.Dir(filePath)
+	fileManagerService.tempConfigPath = filepath.Dir(filePath)
 	fileManagerService.manifestFilePath = manifestFilePath
 
 	request := protos.CreateConfigApplyRequest(overview)
@@ -170,7 +170,7 @@ func TestFileManagerService_ConfigApply_Update(t *testing.T) {
 
 	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
 	fileManagerService.agentConfig.LibDir = manifestDirPath
-	fileManagerService.configPath = filepath.Dir(tempFile.Name())
+	fileManagerService.tempConfigPath = filepath.Dir(tempFile.Name())
 	fileManagerService.manifestFilePath = manifestFilePath
 	err := fileManagerService.UpdateCurrentFilesOnDisk(ctx, filesOnDisk, false)
 	require.NoError(t, err)
@@ -226,7 +226,7 @@ func TestFileManagerService_ConfigApply_Delete(t *testing.T) {
 	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
 	fileManagerService.agentConfig.LibDir = manifestDirPath
 	fileManagerService.manifestFilePath = manifestFilePath
-	fileManagerService.configPath = filepath.Dir(tempFile.Name())
+	fileManagerService.tempConfigPath = filepath.Dir(tempFile.Name())
 	err := fileManagerService.UpdateCurrentFilesOnDisk(ctx, filesOnDisk, false)
 	require.NoError(t, err)
 
@@ -290,7 +290,7 @@ func TestFileManagerService_ConfigApply_Failed(t *testing.T) {
 
 	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
 	fileManagerService.agentConfig.LibDir = manifestDirPath
-	fileManagerService.configPath = filepath.Dir(filePath)
+	fileManagerService.tempConfigPath = filepath.Dir(filePath)
 	fileManagerService.manifestFilePath = manifestFilePath
 
 	request := protos.CreateConfigApplyRequest(overview)
@@ -332,7 +332,7 @@ func TestFileManagerService_ConfigApply_FileWithExecutePermissions(t *testing.T)
 	agentConfig.AllowedDirectories = []string{tempDir}
 
 	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
-	fileManagerService.configPath = filepath.Dir(filePath)
+	fileManagerService.tempConfigPath = filepath.Dir(filePath)
 	fileManagerService.agentConfig.LibDir = manifestDirPath
 	fileManagerService.manifestFilePath = manifestFilePath
 
@@ -512,15 +512,20 @@ func TestFileManagerService_removeExecuteFilePermissions(t *testing.T) {
 //nolint:usetesting // need to use MkDirTemp instead of t.tempDir for rollback as t.tempDir does not accept a pattern
 func TestFileManagerService_ClearCache(t *testing.T) {
 	tempDir := t.TempDir()
-	rollbackDir, err := os.MkdirTemp(tempDir, "rollback")
+	agentConfig := types.AgentConfig()
+	tempPath := fmt.Sprintf("%s.agent_%s", tempDir, agentConfig.UUID)
+	err := os.Mkdir(tempPath, dirPerm)
+	require.NoError(t, err)
+	rollbackDir, err := os.MkdirTemp(tempPath, "rollback")
 	require.NoError(t, err)
-	configDir, err := os.MkdirTemp(tempDir, "config")
+	configDir, err := os.MkdirTemp(tempPath, "config")
 	require.NoError(t, err)
 
 	fakeFileServiceClient := &v1fakes.FakeFileServiceClient{}
-	fileManagerService := NewFileManagerService(fakeFileServiceClient, types.AgentConfig(), &sync.RWMutex{})
+	fileManagerService := NewFileManagerService(fakeFileServiceClient, agentConfig, &sync.RWMutex{})
 	fileManagerService.tempConfigDir = configDir
 	fileManagerService.tempRollbackDir = rollbackDir
+	fileManagerService.tempConfigPath = tempPath
 
 	filesCache := map[string]*model.FileCache{
 		"file/path/test.conf": {
@@ -654,7 +659,7 @@ func TestFileManagerService_Rollback(t *testing.T) {
 	fileManagerService.fileActions = filesCache
 	fileManagerService.agentConfig.LibDir = manifestDirPath
 	fileManagerService.tempRollbackDir = rollbackDir
-	fileManagerService.configPath = filepath.Dir(updateFile.Name())
+	fileManagerService.tempConfigPath = filepath.Dir(updateFile.Name())
 	fileManagerService.manifestFilePath = manifestFilePath
 
 	err := fileManagerService.Rollback(ctx, instanceID)
@@ -841,7 +846,7 @@ func TestFileManagerService_DetermineFileActions(t *testing.T) {
 			fileManagerService.agentConfig.AllowedDirectories = test.allowedDirs
 			fileManagerService.agentConfig.LibDir = manifestDirPath
 			fileManagerService.manifestFilePath = manifestFilePath
-			fileManagerService.configPath = filepath.Dir(updateTestFile.Name())
+			fileManagerService.tempConfigPath = filepath.Dir(updateTestFile.Name())
 
 			require.NoError(tt, err)
 
@@ -1238,16 +1243,16 @@ func TestFileManagerService_createTempConfigDirectory(t *testing.T) {
 	configPath := tempDir
 
 	fileManagerService := FileManagerService{
-		agentConfig: agentConfig,
-		configPath:  configPath,
+		agentConfig:    agentConfig,
+		tempConfigPath: configPath,
 	}
 
 	dir, err := fileManagerService.createTempConfigDirectory("config")
 	assert.NotEmpty(t, dir)
 	require.NoError(t, err)
 
 	// Test for unknown directory path
-	fileManagerService.configPath = "/unknown/"
+	fileManagerService.tempConfigPath = "/unknown/"
 
 	dir, err = fileManagerService.createTempConfigDirectory("config")
 	assert.Empty(t, dir)
diff --git a/internal/resource/resource_plugin_test.go b/internal/resource/resource_plugin_test.go
@@ -17,7 +17,7 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/nginx/agent/v3/test/helpers"
-	"github.com/nginxinc/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 
 	"github.com/nginx/agent/v3/internal/bus/busfakes"
 
diff --git a/internal/resource/resource_service.go b/internal/resource/resource_service.go
@@ -30,7 +30,7 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nginxinc/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/nginx/agent/v3/internal/config"
diff --git a/internal/resource/resource_service_test.go b/internal/resource/resource_service_test.go
diff --git a/internal/resource/resourcefakes/fake_resource_service_interface.go b/internal/resource/resourcefakes/fake_resource_service_interface.go
diff --git a/test/helpers/nginx_plus.go b/test/helpers/nginx_plus.go

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package record`
`7`	`7`
`8`	`8`	`import (`
`9`	`9`	`"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"`
`10`		`- plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"`
	`10`	`+ plusapi "github.com/nginx/nginx-plus-go-client/v3/client"`
`11`	`11`	`"go.opentelemetry.io/collector/pdata/pcommon"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"strconv"`
`10`	`10`
`11`	`11`	`"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"`
`12`		`- plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"`
	`12`	`+ plusapi "github.com/nginx/nginx-plus-go-client/v3/client"`
`13`	`13`	`"go.opentelemetry.io/collector/pdata/pcommon"`
`14`	`14`	`"go.uber.org/zap"`
`15`	`15`	`)`