upgrade infra-sdk to a compatible v3 version

kilokang · kilokang · commit 1faf57e2e0ba · 2024-10-02T15:40:04.000+02:00
diff --git a/cmd/nri-vsphere/nri-vsphere.go b/cmd/nri-vsphere/nri-vsphere.go
@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-vsphere/internal/client"
 	"github.com/newrelic/nri-vsphere/internal/collect"
 	"github.com/newrelic/nri-vsphere/internal/config"
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/nri-vsphere
 go 1.23.1
 
 require (
-	github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible
+	github.com/newrelic/infra-integrations-sdk/v3 v3.9.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	github.com/vmware/govmomi v0.36.3
diff --git a/go.sum b/go.sum
@@ -8,6 +8,8 @@ github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 )
 
 type Cache struct {
diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/collect/datacenters.go b/internal/collect/datacenters.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/newrelic/infra-integrations-sdk/persist"
+	"github.com/newrelic/infra-integrations-sdk/v3/persist"
 	"github.com/newrelic/nri-vsphere/internal/cache"
 	"github.com/newrelic/nri-vsphere/internal/config"
 	"github.com/newrelic/nri-vsphere/internal/events"
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -13,8 +13,8 @@ import (
 	"github.com/newrelic/nri-vsphere/internal/performance"
 	"github.com/newrelic/nri-vsphere/internal/tag"
 
-	sdkArgs "github.com/newrelic/infra-integrations-sdk/args"
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	sdkArgs "github.com/newrelic/infra-integrations-sdk/v3/args"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	logrus "github.com/sirupsen/logrus"
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/view"
diff --git a/internal/process/cluster.go b/internal/process/cluster.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/newrelic/nri-vsphere/internal/config"
 
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
 )
 
 func createClusterSamples(config *config.Config) {
diff --git a/internal/process/datacenter.go b/internal/process/datacenter.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/newrelic/nri-vsphere/internal/config"
 
-	eventSDK "github.com/newrelic/infra-integrations-sdk/data/event"
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	eventSDK "github.com/newrelic/infra-integrations-sdk/v3/data/event"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-vsphere/internal/events"
 	logrus "github.com/sirupsen/logrus"
 )
diff --git a/internal/process/datastores.go b/internal/process/datastores.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/newrelic/nri-vsphere/internal/config"
 
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
 	"github.com/vmware/govmomi/vim25/types"
 )
 
diff --git a/internal/process/hosts.go b/internal/process/hosts.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/newrelic/nri-vsphere/internal/config"
 
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
 )
 
 func createHostSamples(config *config.Config) {
diff --git a/internal/process/process.go b/internal/process/process.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-vsphere/internal/config"
 
 	logrus "github.com/sirupsen/logrus"
diff --git a/internal/process/resourcepool.go b/internal/process/resourcepool.go
@@ -4,7 +4,7 @@
 package process
 
 import (
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
 	"github.com/newrelic/nri-vsphere/internal/config"
 )
 
diff --git a/internal/process/snapshot.go b/internal/process/snapshot.go
@@ -11,8 +11,8 @@ import (
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 )
 
 const invalidFile = -1
diff --git a/internal/process/snapshot_test.go b/internal/process/snapshot_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-vsphere/internal/process/testdata"
 )
 
diff --git a/internal/process/vms.go b/internal/process/vms.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/newrelic/infra-integrations-sdk/data/metric"
+	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
 	"github.com/newrelic/nri-vsphere/internal/config"
 )
 
diff --git a/internal/process/vms_test.go b/internal/process/vms_test.go
@@ -2,7 +2,7 @@ package process
 
 import (
 	"context"
-	"github.com/newrelic/infra-integrations-sdk/integration"
+	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-vsphere/internal/client"
 	"github.com/newrelic/nri-vsphere/internal/collect"
 	"github.com/newrelic/nri-vsphere/internal/config"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/newrelic/infra-integrations-sdk/persist"`
	`7`	`+ "github.com/newrelic/infra-integrations-sdk/v3/persist"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type Cache struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/newrelic/infra-integrations-sdk/persist"`
	`7`	`+ "github.com/newrelic/infra-integrations-sdk/v3/persist"`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/newrelic/nri-vsphere/internal/config"`
`11`	`11`
`12`		`- "github.com/newrelic/infra-integrations-sdk/data/metric"`
	`12`	`+ "github.com/newrelic/infra-integrations-sdk/v3/data/metric"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func createClusterSamples(config *config.Config) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/newrelic/nri-vsphere/internal/config"`
`10`	`10`
`11`		`- "github.com/newrelic/infra-integrations-sdk/data/metric"`
	`11`	`+ "github.com/newrelic/infra-integrations-sdk/v3/data/metric"`
`12`	`12`	`"github.com/vmware/govmomi/vim25/types"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`package process`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "github.com/newrelic/infra-integrations-sdk/data/metric"`
	`7`	`+ "github.com/newrelic/infra-integrations-sdk/v3/data/metric"`
`8`	`8`	`"github.com/newrelic/nri-vsphere/internal/config"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"github.com/vmware/govmomi/vim25/mo"`
`12`	`12`	`"github.com/vmware/govmomi/vim25/types"`
`13`	`13`
`14`		`- "github.com/newrelic/infra-integrations-sdk/data/metric"`
`15`		`- "github.com/newrelic/infra-integrations-sdk/integration"`
	`14`	`+ "github.com/newrelic/infra-integrations-sdk/v3/data/metric"`
	`15`	`+ "github.com/newrelic/infra-integrations-sdk/v3/integration"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const invalidFile = -1`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/vmware/govmomi/vim25/mo"`
`12`	`12`	`"github.com/vmware/govmomi/vim25/types"`
`13`	`13`
`14`		`- "github.com/newrelic/infra-integrations-sdk/integration"`
	`14`	`+ "github.com/newrelic/infra-integrations-sdk/v3/integration"`
`15`	`15`	`"github.com/newrelic/nri-vsphere/internal/process/testdata"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strconv"`
`9`	`9`	`"strings"`
`10`	`10`
`11`		`- "github.com/newrelic/infra-integrations-sdk/data/metric"`
	`11`	`+ "github.com/newrelic/infra-integrations-sdk/v3/data/metric"`
`12`	`12`	`"github.com/newrelic/nri-vsphere/internal/config"`
`13`	`13`	`)`
`14`	`14`