resolving merge conflict

Author: Akshay2191

.github/workflows/ci.yml

@@ -50,10 +50,10 @@ jobs:
         with:
             go-version-file: 'go.mod'
             cache: false
-      - name: run install-tools
-        run: make install-tools
-      - name: run lint
-        run: make lint
+      - name: Lint Go
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.4.0
 
   unit-test:
       name: Unit Tests

.github/workflows/release-branch.yml

@@ -42,7 +42,7 @@ on:
 
 env:
   NFPM_VERSION: 'v2.35.3'
-  GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"
+  GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-local-approved-dependency"
 
 defaults:
   run:

.golangci.yml

@@ -122,7 +122,6 @@ linters:
         - G110
         - G111
         - G112
-        - G113
         - G114
         - G201
         - G202

Makefile

@@ -125,6 +125,7 @@ build: ## Build agent executable
 
 lint: ## Run linter
 	@$(GOVET) ./...
+	@$(GORUN) $(GOLANGCILINT) config verify -c ./.golangci.yml
 	@$(GORUN) $(GOLANGCILINT) run -c ./.golangci.yml
 	@cd api/grpc && $(GORUN) $(BUF) generate
 	@echo "🏯 Linting Done"

Makefile.tools

@@ -1,6 +1,6 @@
 OAPICODEGEN	    = github.com/deepmap/oapi-codegen/v2/cmd/[email protected]
 LEFTHOOK	    = github.com/evilmartians/[email protected]
-GOLANGCILINT    = github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.2.1
+GOLANGCILINT    = github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
 PROTOCGENGO	    = google.golang.org/protobuf/cmd/[email protected]
 GOFUMPT	        = mvdan.cc/[email protected]
 COUNTERFEITER   = github.com/maxbrunsfeld/counterfeiter/[email protected]

go.mod

@@ -2,7 +2,7 @@ module github.com/nginx/agent/v3
 
 go 1.24.0
 
-toolchain go1.24.4
+toolchain go1.24.6
 
 require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1

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

@@ -7,6 +7,7 @@ package cgroup
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"os/exec"
 	"path"
@@ -63,17 +64,17 @@ func NewCPUSource(basePath string) *CPUSource {
 	}
 }
 
-func (cs *CPUSource) Collect() (ContainerCPUStats, error) {
-	cpuStats, err := cs.collectCPUStats()
+func (cs *CPUSource) Collect(ctx context.Context) (ContainerCPUStats, error) {
+	cpuStats, err := cs.collectCPUStats(ctx)
 	if err != nil {
 		return ContainerCPUStats{}, err
 	}
 
 	return cpuStats, nil
 }
 
-func (cs *CPUSource) collectCPUStats() (ContainerCPUStats, error) {
-	clockTicks, err := clockTicks()
+func (cs *CPUSource) collectCPUStats(ctx context.Context) (ContainerCPUStats, error) {
+	clockTicks, err := clockTicks(ctx)
 	const nanosecondsPerMillisecond = 1000
 	if err != nil {
 		return ContainerCPUStats{}, err
@@ -190,8 +191,8 @@ func systemCPUUsage(clockTicks int) (float64, error) {
 	return 0, errors.New("unable to process " + CPUStatsPath + ". No cpu found")
 }
 
-func clockTicks() (int, error) {
-	cmd := exec.Command("getconf", "CLK_TCK")
+func clockTicks(ctx context.Context) (int, error) {
+	cmd := exec.CommandContext(ctx, "getconf", "CLK_TCK")
 	out := new(bytes.Buffer)
 	cmd.Stdout = out
 

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

@@ -6,6 +6,7 @@
 package cgroup
 
 import (
+	"context"
 	"os"
 	"path"
 	"runtime"
@@ -19,6 +20,8 @@ func TestCollectCPUStats(t *testing.T) {
 	_, filename, _, _ := runtime.Caller(0)
 	localDirectory := path.Dir(filename)
 
+	ctx := context.Background()
+
 	tests := []struct {
 		errorType error
 		name      string
@@ -73,7 +76,7 @@ func TestCollectCPUStats(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(tt *testing.T) {
 			cgroupCPUSource := NewCPUSource(test.basePath)
-			cpuStat, err := cgroupCPUSource.collectCPUStats()
+			cpuStat, err := cgroupCPUSource.collectCPUStats(ctx)
 
 			// Assert error
 			assert.IsType(tt, test.errorType, err)

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

@@ -57,12 +57,12 @@ func (s *CPUScraper) Start(_ context.Context, _ component.Host) error {
 	return nil
 }
 
-func (s *CPUScraper) Scrape(context.Context) (pmetric.Metrics, error) {
+func (s *CPUScraper) Scrape(ctx context.Context) (pmetric.Metrics, error) {
 	s.settings.Logger.Debug("Scraping container CPU metrics")
 
 	now := pcommon.NewTimestampFromTime(time.Now())
 
-	stats, err := s.cpuSource.Collect()
+	stats, err := s.cpuSource.Collect(ctx)
 	if err != nil {
 		return pmetric.NewMetrics(), err
 	}

internal/collector/nginxossreceiver/internal/scraper/stubstatus/stub_status_scraper.go

@@ -62,7 +62,7 @@ func (s *NginxStubStatusScraper) ID() component.ID {
 	return component.NewID(metadata.Type)
 }
 
-//nolint:unparam // // Result is always nil
+//nolint:unparam // Result is always nil
 func (s *NginxStubStatusScraper) Start(_ context.Context, _ component.Host) error {
 	s.logger.Info("Starting NGINX stub status scraper")
 	httpClient := http.DefaultClient
@@ -92,8 +92,9 @@ func (s *NginxStubStatusScraper) Start(_ context.Context, _ component.Host) erro
 
 	if strings.HasPrefix(s.cfg.APIDetails.Listen, "unix:") {
 		httpClient.Transport = &http.Transport{
-			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
-				return net.Dial("unix", strings.TrimPrefix(s.cfg.APIDetails.Listen, "unix:"))
+			DialContext: func(ctx context.Context, _, _ string) (net.Conn, error) {
+				dialer := &net.Dialer{}
+				return dialer.DialContext(ctx, "unix", strings.TrimPrefix(s.cfg.APIDetails.Listen, "unix:"))
 			},
 		}
 	}