Skip to content

Commit

Permalink
[chore] Upgrade aerospike dependency to v7.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
djaglowski committed Jul 24, 2024
1 parent daaaf62 commit 3edec30
Show file tree
Hide file tree
Showing 19 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ require (
github.com/SAP/go-hdb v1.10.1 // indirect
github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect
github.com/Showmax/go-fqdn v1.0.0 // indirect
github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect
github.com/aerospike/aerospike-client-go/v7 v7.6.0 // indirect
github.com/alecthomas/participle/v2 v2.1.1 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/aliyun/aliyun-log-go-sdk v0.1.80 // indirect
Expand Down Expand Up @@ -749,7 +749,7 @@ require (
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync"
"time"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster"
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package aerospikereceiver // import "github.com/open-telemetry/opentelemetry-col
import (
"testing"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"github.com/stretchr/testify/require"
"go.uber.org/zap"

Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package cluster // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster"

import (
as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
)

// asclient interface is for mocking
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package cluster // import "github.com/open-telemetry/opentelemetry-collector-con
import (
"testing"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster/mocks"
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/mock_connFactoryFunc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/mock_nodeFactoryFunc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/mocks/Node.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/mocks/asclient.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/mocks/asconn.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions receiver/aerospikereceiver/cluster/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

as "github.com/aerospike/aerospike-client-go/v6"
"github.com/aerospike/aerospike-client-go/v6/types"
as "github.com/aerospike/aerospike-client-go/v7"
"github.com/aerospike/aerospike-client-go/v7/types"
)

// asconn is used to mock aerospike connections
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster/mocks"
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/subset_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package cluster // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster"

import (
as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
)

type SubsetCluster struct {
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/cluster/subset_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"testing"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster/mocks"
Expand Down
6 changes: 3 additions & 3 deletions receiver/aerospikereceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerosp
go 1.21.0

require (
github.com/aerospike/aerospike-client-go/v6 v6.13.0
github.com/aerospike/aerospike-client-go/v7 v7.6.0
github.com/docker/go-connections v0.5.0
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0
Expand Down Expand Up @@ -84,7 +84,7 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe // indirect
Expand All @@ -102,7 +102,7 @@ require (
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
24 changes: 12 additions & 12 deletions receiver/aerospikereceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"github.com/docker/go-connections/nat"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/wait"
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strconv"
"time"

as "github.com/aerospike/aerospike-client-go/v6"
as "github.com/aerospike/aerospike-client-go/v7"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/pdata/pcommon"
Expand Down

0 comments on commit 3edec30

Please sign in to comment.