Update file watcher to only monitor directories referenced in the nginx configuration

Author: dhurley

go.mod

@@ -16,7 +16,6 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
-	github.com/hashicorp/go-multierror v1.1.1
 	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
 	github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
 	github.com/nginxinc/nginx-prometheus-exporter v1.3.0
@@ -133,7 +132,6 @@ require (
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/hashicorp/consul/api v1.30.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect

go.sum

@@ -278,7 +278,6 @@ github.com/hashicorp/consul/api v1.30.0 h1:ArHVMMILb1nQv8vZSGIwwQd2gtc+oSQZ6Caly
 github.com/hashicorp/consul/api v1.30.0/go.mod h1:B2uGchvaXVW2JhFoS8nqTxMD5PBykr4ebY4JWHTTeLM=
 github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A=
 github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=

internal/collector/containermetricsreceiver/internal/scraper/cpuscraper/internal/cgroup/cpu_test.go

@@ -6,15 +6,12 @@
 package cgroup
 
 import (
-	"errors"
 	"os"
 	"path"
 	"runtime"
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/go-multierror"
-
 	"github.com/stretchr/testify/assert"
 )
 
@@ -79,16 +76,7 @@ func TestCollectCPUStats(t *testing.T) {
 			cpuStat, err := cgroupCPUSource.collectCPUStats()
 
 			// Assert error
-			if err != nil {
-				var multiError *multierror.Error
-				if errors.As(err, &multiError) {
-					assert.IsType(tt, test.errorType, multiError.Errors[0])
-				} else {
-					assert.IsType(tt, test.errorType, err)
-				}
-			} else {
-				assert.IsType(tt, test.errorType, err)
-			}
+			assert.IsType(tt, test.errorType, err)
 
 			// Assert result
 			assert.Equal(tt, test.cpuStat, cpuStat)

internal/collector/containermetricsreceiver/internal/scraper/memoryscraper/internal/cgroup/memory_test.go

@@ -7,15 +7,12 @@ package cgroup
 
 import (
 	"context"
-	"errors"
 	"os"
 	"path"
 	"runtime"
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/go-multierror"
-
 	"github.com/shirou/gopsutil/v4/mem"
 	"github.com/stretchr/testify/assert"
 )
@@ -118,16 +115,7 @@ func TestVirtualMemoryStat(t *testing.T) {
 			virtualMemoryStat, err := cgroupCPUSource.VirtualMemoryStat()
 
 			// Assert error
-			if err != nil {
-				var multiError *multierror.Error
-				if errors.As(err, &multiError) {
-					assert.IsType(tt, test.errorType, multiError.Errors[0])
-				} else {
-					assert.IsType(tt, test.errorType, err)
-				}
-			} else {
-				assert.IsType(tt, test.errorType, err)
-			}
+			assert.IsType(tt, test.errorType, err)
 
 			// Assert result
 			assert.Equal(tt, test.virtualMemoryStat, *virtualMemoryStat)

internal/collector/containermetricsreceiver/internal/utils.go

@@ -11,8 +11,6 @@ import (
 	"os"
 	"strconv"
 	"strings"
-
-	"github.com/hashicorp/go-multierror"
 )
 
 type Source interface {
@@ -29,7 +27,9 @@ func ReadLinesOffsetN(filename string, offset uint, n int) (lines []string, err
 	defer func() {
 		closeErr := f.Close()
 		if closeErr != nil {
-			err = multierror.Append(err, closeErr)
+			if err == nil {
+				err = closeErr
+			}
 		}
 	}()