Skip to content

Commit

Permalink
upgrade infra-sdk to a compatible v3 version
Browse files Browse the repository at this point in the history
  • Loading branch information
@kang-makes
kang-makes committed Oct 2, 2024
1 parent c860447 commit 33c9510
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.1
require (
github.com/jmoiron/sqlx v1.4.0
github.com/microsoft/go-mssqldb v1.7.2
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
github.com/xeipuuv/gojsonschema v1.2.0
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP
github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
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/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
4 changes: 2 additions & 2 deletions src/args/argument_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"os"

sdkArgs "github.com/newrelic/infra-integrations-sdk/args"
"github.com/newrelic/infra-integrations-sdk/log"
sdkArgs "github.com/newrelic/infra-integrations-sdk/v3/args"
"github.com/newrelic/infra-integrations-sdk/v3/log"
)

// ArgumentList struct that holds all MSSQL arguments
Expand Down
2 changes: 1 addition & 1 deletion src/connection/sql_connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
// go-mssqldb is required for mssql driver but isn't used in code
"github.com/jmoiron/sqlx"
_ "github.com/microsoft/go-mssqldb"
"github.com/newrelic/infra-integrations-sdk/log"
"github.com/newrelic/infra-integrations-sdk/v3/log"
"github.com/newrelic/nri-mssql/src/args"
)

Expand Down
6 changes: 3 additions & 3 deletions src/database/sql_database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package database
import (
"reflect"

"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/v3/data/attribute"
"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
"github.com/newrelic/infra-integrations-sdk/v3/integration"
"github.com/newrelic/nri-mssql/src/connection"
)

Expand Down
4 changes: 2 additions & 2 deletions src/database/sql_database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sort"
"testing"

"github.com/newrelic/infra-integrations-sdk/data/attribute"
"github.com/newrelic/infra-integrations-sdk/integration"
"github.com/newrelic/infra-integrations-sdk/v3/data/attribute"
"github.com/newrelic/infra-integrations-sdk/v3/integration"
"github.com/newrelic/nri-mssql/src/connection"
"gopkg.in/DATA-DOG/go-sqlmock.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion src/instance/sql_instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"database/sql"
"fmt"

"github.com/newrelic/infra-integrations-sdk/integration"
"github.com/newrelic/infra-integrations-sdk/v3/integration"
"github.com/newrelic/nri-mssql/src/connection"
)

Expand Down
2 changes: 1 addition & 1 deletion src/instance/sql_instance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"testing"

"github.com/newrelic/infra-integrations-sdk/integration"
"github.com/newrelic/infra-integrations-sdk/v3/integration"
"github.com/newrelic/nri-mssql/src/connection"
"github.com/stretchr/testify/assert"
"gopkg.in/DATA-DOG/go-sqlmock.v1"
Expand Down
4 changes: 2 additions & 2 deletions src/inventory/inventory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
package inventory

import (
"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-mssql/src/connection"
)

Expand Down
4 changes: 2 additions & 2 deletions src/inventory/inventory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

"github.com/jmoiron/sqlx"
"github.com/newrelic/infra-integrations-sdk/data/inventory"
"github.com/newrelic/infra-integrations-sdk/integration"
"github.com/newrelic/infra-integrations-sdk/v3/data/inventory"
"github.com/newrelic/infra-integrations-sdk/v3/integration"
"github.com/newrelic/nri-mssql/src/connection"
"gopkg.in/DATA-DOG/go-sqlmock.v1"
)
Expand Down
8 changes: 4 additions & 4 deletions src/metrics/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"strconv"
"sync"

"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/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/nri-mssql/src/args"
"github.com/newrelic/nri-mssql/src/connection"
"github.com/newrelic/nri-mssql/src/database"
Expand Down
4 changes: 2 additions & 2 deletions src/metrics/metrics_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/newrelic/infra-integrations-sdk/data/attribute"
"github.com/newrelic/infra-integrations-sdk/integration"
"github.com/newrelic/infra-integrations-sdk/v3/data/attribute"
"github.com/newrelic/infra-integrations-sdk/v3/integration"
"github.com/newrelic/nri-mssql/src/args"
"github.com/newrelic/nri-mssql/src/connection"
"github.com/newrelic/nri-mssql/src/database"
Expand Down
4 changes: 2 additions & 2 deletions src/mssql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"runtime"
"strings"

"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-mssql/src/args"
"github.com/newrelic/nri-mssql/src/connection"
"github.com/newrelic/nri-mssql/src/instance"
Expand Down
2 changes: 1 addition & 1 deletion tests/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"path/filepath"
"strings"

"github.com/newrelic/infra-integrations-sdk/log"
"github.com/newrelic/infra-integrations-sdk/v3/log"
"github.com/xeipuuv/gojsonschema"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/mssql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/newrelic/infra-integrations-sdk/log"
"github.com/newrelic/infra-integrations-sdk/v3/log"
"github.com/newrelic/nri-mssql/src/args"
"github.com/newrelic/nri-mssql/src/connection"
"github.com/stretchr/testify/assert"
Expand Down

0 comments on commit 33c9510

Please sign in to comment.