Skip to content

Commit

Permalink
OM-203 - Upgrade aerospike-client-go library to latest version v7,6.1…
Browse files Browse the repository at this point in the history
… from v6.x (#126)

* OM-203 - upgrade aerospike-client-go library
* OM-203 - Closing the existing aerospike server connection when an error occurs, this is required to avoid reading any remaining characters from existing connection
  • Loading branch information
mphanias authored Aug 20, 2024
1 parent d1574b4 commit a9c06f2
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 148 deletions.
25 changes: 12 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/BurntSushi/toml v1.2.1
github.com/aerospike/aerospike-client-go/v6 v6.10.0
github.com/aerospike/aerospike-client-go/v7 v7.6.1
github.com/gobwas/glob v0.2.3
github.com/hashicorp/go-version v1.6.0
github.com/prometheus/client_golang v1.14.0
Expand All @@ -23,25 +23,24 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/onsi/gomega v1.27.10 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/yuin/gopher-lua v1.1.0 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/grpc v1.63.3 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
158 changes: 31 additions & 127 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/BurntSushi/toml"

aslog "github.com/aerospike/aerospike-client-go/v6/logger"
aslog "github.com/aerospike/aerospike-client-go/v7/logger"
log "github.com/sirupsen/logrus"
)

Expand Down
8 changes: 5 additions & 3 deletions internal/pkg/dataprovider/aero_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"time"

aero "github.com/aerospike/aerospike-client-go/v6"
"github.com/aerospike/aerospike-client-go/v6/types"
aero "github.com/aerospike/aerospike-client-go/v7"
"github.com/aerospike/aerospike-client-go/v7/types"
"github.com/aerospike/aerospike-prometheus-exporter/internal/pkg/commons"
"github.com/aerospike/aerospike-prometheus-exporter/internal/pkg/config"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -157,7 +157,9 @@ func fetchRequestInfoFromAerospike(infoKeys []string) (map[string]string, error)
// Info request
rawMetrics, err = asConnection.RequestInfo(infoKeys...)
if err != nil {
logrus.Debug("Error while requestInfo ( infoKeys...) : ", err)
logrus.Debug("Error while requestInfo ( infoKeys...), closing connection : Error is: ", err, " and infoKeys: ", infoKeys)
asConnection.Close()
//TODO: do we need to assign nil to asConnection? i.e. asConnection = nil
continue
}

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/dataprovider/data_provider.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dataprovider

import (
aero "github.com/aerospike/aerospike-client-go/v6"
aero "github.com/aerospike/aerospike-client-go/v7"
"github.com/aerospike/aerospike-prometheus-exporter/internal/pkg/config"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/dataprovider/fake_data_provider.go

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

2 changes: 1 addition & 1 deletion internal/pkg/dataprovider/mock_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

aero "github.com/aerospike/aerospike-client-go/v6"
aero "github.com/aerospike/aerospike-client-go/v7"
"github.com/aerospike/aerospike-prometheus-exporter/internal/pkg/commons"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/statprocessors/sp_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/aerospike/aerospike-prometheus-exporter/internal/pkg/config"
"github.com/aerospike/aerospike-prometheus-exporter/internal/pkg/dataprovider"

aero "github.com/aerospike/aerospike-client-go/v6"
aero "github.com/aerospike/aerospike-client-go/v7"
log "github.com/sirupsen/logrus"
)

Expand Down

0 comments on commit a9c06f2

Please sign in to comment.