upgrade infra-sdk to a compatible v3 version

kilokang · kilokang · commit 01d0e9ede9b2 · 2024-10-02T15:40:00.000+02:00
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/containerd/cgroups v1.1.0
 	github.com/docker/docker v26.1.5+incompatible
 	github.com/dustin/go-humanize v1.0.1
-	github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible
+	github.com/newrelic/infra-integrations-sdk/v3 v3.9.1
 	github.com/stretchr/testify v1.9.0
 )
 
diff --git a/go.sum b/go.sum
@@ -65,6 +65,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible h1:Ktcm1aPAl7CW3o+FXAIKJ+jygWVXDXaUIWFyf2CXQTk=
 github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible/go.mod h1:tMUHRMq6mJS0YyBnbWrTXAnREnQqC1AGO6Lu45u5xAM=
+github.com/newrelic/infra-integrations-sdk/v3 v3.9.1 h1:dCtVLsYNHWTQ5aAlAaHroomOUlqxlGTrdi6XTlvBDfI=
+github.com/newrelic/infra-integrations-sdk/v3 v3.9.1/go.mod h1:yPeidhcq9Cla0QDquGXH0KqvS2k9xtetFOD7aLA0Z8M=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
diff --git a/src/biz/metrics.go b/src/biz/metrics.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
-	"github.com/newrelic/infra-integrations-sdk/log"
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 
 	"github.com/newrelic/nri-docker/src/raw"
 )
diff --git a/src/biz/metrics_aws_test.go b/src/biz/metrics_aws_test.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
diff --git a/src/biz/metrics_test.go b/src/biz/metrics_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 	"github.com/newrelic/nri-docker/src/raw"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/src/config/config.go b/src/config/config.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/newrelic/infra-integrations-sdk/args"
+import "github.com/newrelic/infra-integrations-sdk/v3/args"
 
 type ArgumentList struct {
 	args.DefaultArgumentList
diff --git a/src/docker.go b/src/docker.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/docker/docker/api/types/system"
 	"github.com/docker/docker/client"
-	"github.com/newrelic/infra-integrations-sdk/integration"
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-docker/src/config"
 	"github.com/newrelic/nri-docker/src/nri"
 	"github.com/newrelic/nri-docker/src/raw"
diff --git a/src/nri/metrics.go b/src/nri/metrics.go
@@ -2,7 +2,7 @@
 // by the New Relic Infrastructure Agent
 package nri
 
-import "github.com/newrelic/infra-integrations-sdk/data/metric"
+import "github.com/newrelic/infra-integrations-sdk/v3/data/metric"
 
 var (
 	metricCommandLine                 = metricFunc("commandLine", metric.ATTRIBUTE)
diff --git a/src/nri/sampler.go b/src/nri/sampler.go
@@ -9,11 +9,11 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/system"
-	"github.com/newrelic/infra-integrations-sdk/data/attribute"
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/infra-integrations-sdk/integration"
-	"github.com/newrelic/infra-integrations-sdk/log"
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/attribute"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 
 	"github.com/newrelic/nri-docker/src/biz"
 	"github.com/newrelic/nri-docker/src/config"
diff --git a/src/nri/sampler_test.go b/src/nri/sampler_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
diff --git a/src/raw/aws/fargate_fetcher.go b/src/raw/aws/fargate_fetcher.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	docker "github.com/docker/docker/api/types"
-	"github.com/newrelic/infra-integrations-sdk/log"
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 
 	"github.com/newrelic/nri-docker/src/raw"
 )
diff --git a/src/raw/aws/fargate_inspector.go b/src/raw/aws/fargate_inspector.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/newrelic/infra-integrations-sdk/log"
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 )
 
 const fargateTaskMetadataCacheKey = "task-metadata-response"
diff --git a/src/raw/aws/fargate_metadata.go b/src/raw/aws/fargate_metadata.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 )
 
 const (
diff --git a/src/raw/aws/fargate_raw_metrics.go b/src/raw/aws/fargate_raw_metrics.go
@@ -3,7 +3,7 @@ package aws
 import (
 	"time"
 
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-docker/src/raw"
 )
 
diff --git a/src/raw/cgroup_detect.go b/src/raw/cgroup_detect.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 )
 
 const (
diff --git a/src/raw/cgroupv1.go b/src/raw/cgroupv1.go
@@ -14,7 +14,7 @@ import (
 	"github.com/containerd/cgroups"
 	cgroupstats "github.com/containerd/cgroups/stats/v1"
 	"github.com/docker/docker/api/types"
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 )
 
 const nanoSecondsPerSecond = 1e9
diff --git a/src/raw/cgroupv2.go b/src/raw/cgroupv2.go
@@ -10,7 +10,7 @@ import (
 	cgroupsV2 "github.com/containerd/cgroups/v2"
 	cgroupstatsV2 "github.com/containerd/cgroups/v2/stats"
 	"github.com/docker/docker/api/types"
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 )
 
 // CgroupsV2Fetcher fetches the metrics that can be found in cgroups (v2) file system
diff --git a/src/raw/dockerapi/fetcher.go b/src/raw/dockerapi/fetcher.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-docker/src/raw"
 )
 
diff --git a/src/raw/network_stats_getter.go b/src/raw/network_stats_getter.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
 )
 
 type NetworkStatsGetter interface {
diff --git a/test/integration/common.go b/test/integration/common.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/client"
-	"github.com/newrelic/infra-integrations-sdk/args"
+	"github.com/newrelic/infra-integrations-sdk/v3/args"
 	"github.com/newrelic/nri-docker/src/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
-	"github.com/newrelic/infra-integrations-sdk/log"
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/log"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ require (`
`6`	`6`	`github.com/containerd/cgroups v1.1.0`
`7`	`7`	`github.com/docker/docker v26.1.5+incompatible`
`8`	`8`	`github.com/dustin/go-humanize v1.0.1`
`9`		`- github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible`
	`9`	`+ github.com/newrelic/infra-integrations-sdk/v3 v3.9.1`
`10`	`10`	`github.com/stretchr/testify v1.9.0`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"time"`
`12`	`12`
`13`	`13`	`"github.com/docker/docker/api/types"`
`14`		`- "github.com/newrelic/infra-integrations-sdk/log"`
`15`		`- "github.com/newrelic/infra-integrations-sdk/persist"`
	`14`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
	`15`	`+ "github.com/newrelic/infra-integrations-sdk/v3/persist"`
`16`	`16`
`17`	`17`	`"github.com/newrelic/nri-docker/src/raw"`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/docker/docker/api/types"`
`10`	`10`	`"github.com/docker/docker/api/types/container"`
`11`		`- "github.com/newrelic/infra-integrations-sdk/persist"`
	`11`	`+ "github.com/newrelic/infra-integrations-sdk/v3/persist"`
`12`	`12`	`"github.com/newrelic/nri-docker/src/raw"`
`13`	`13`	`"github.com/stretchr/testify/assert"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"time"`
`9`	`9`
`10`	`10`	`docker "github.com/docker/docker/api/types"`
`11`		`- "github.com/newrelic/infra-integrations-sdk/log"`
`12`		`- "github.com/newrelic/infra-integrations-sdk/persist"`
	`11`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
	`12`	`+ "github.com/newrelic/infra-integrations-sdk/v3/persist"`
`13`	`13`
`14`	`14`	`"github.com/newrelic/nri-docker/src/raw"`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"os"`
`23`	`23`	`"time"`
`24`	`24`
`25`		`- "github.com/newrelic/infra-integrations-sdk/log"`
	`25`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package aws`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
`6`		`- "github.com/newrelic/infra-integrations-sdk/log"`
	`6`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
`7`	`7`	`"github.com/newrelic/nri-docker/src/raw"`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"path/filepath"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/newrelic/infra-integrations-sdk/log"`
	`9`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/containerd/cgroups"`
`15`	`15`	`cgroupstats "github.com/containerd/cgroups/stats/v1"`
`16`	`16`	`"github.com/docker/docker/api/types"`
`17`		`- "github.com/newrelic/infra-integrations-sdk/log"`
	`17`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`const nanoSecondsPerSecond = 1e9`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`cgroupsV2 "github.com/containerd/cgroups/v2"`
`11`	`11`	`cgroupstatsV2 "github.com/containerd/cgroups/v2/stats"`
`12`	`12`	`"github.com/docker/docker/api/types"`
`13`		`- "github.com/newrelic/infra-integrations-sdk/log"`
	`13`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// CgroupsV2Fetcher fetches the metrics that can be found in cgroups (v2) file system`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/newrelic/infra-integrations-sdk/log"`
	`10`	`+ "github.com/newrelic/infra-integrations-sdk/v3/log"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type NetworkStatsGetter interface {`