Dependency upgrades

.golangci

@@ -0,0 +1,66 @@
+linters-settings:
+  goimports:
+    local-prefixes: github.com/kbudde/dsa
+  golint:
+    min-confidence: 0.8
+  gocyclo:
+    min-complexity: 15
+  govet:
+    check-shadowing: true
+  misspell:
+    locale: US
+  nolintlint:
+    allow-leading-space: false # require machine-readable nolint directives (with no leading space)
+    allow-unused: false # report any unused nolint directives
+    require-explanation: true # require an explanation for nolint directives
+    require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+
+linters:
+  # please, do not use `enable-all`: it's deprecated and will be removed soon.
+  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - bodyclose
+    - depguard
+    - dupl
+    - exportloopref
+    - forcetypeassert
+    - funlen
+    - gci
+    - gocognit
+    - goconst
+    - gocritic
+    - gocyclo
+    - gofumpt
+    - gomnd
+    - goprintffuncname
+    - gosec
+    - ifshort
+    - misspell
+    - noctx
+    - nolintlint
+    - revive
+    - rowserrcheck
+    - sqlclosecheck
+    # - stylecheck 
+    - thelper
+    - tparallel
+    - unconvert
+    - unparam
+    - whitespace
+    - errorlint
+    # - goerr113
+    # - wrapcheck
+issues:
+  # enable issues excluded by default 
+  exclude-use-default: false

.promu.yml

@@ -1,5 +1,5 @@
 go: 
-    version: "1.15"
+    version: "1.17"
 verbose: true
 repository:
     path: github.com/kbudde/rabbitmq_exporter

.travis.yml

@@ -5,7 +5,7 @@ services:
 
 language: go
 go:
-  - "1.15"
+  - "1.17"
 
 env:
   global:

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "go.lintTool": "golangci-lint"
+}

bertmap.go

@@ -48,7 +48,8 @@ func (rep *rabbitBERTReply) MakeMap() MetricMap {
 	flMap := make(MetricMap)
 	term := rep.objects
 
-	parseProplist(&flMap, "", term)
+	err := parseProplist(&flMap, "", term)
+	log.WithField("error", err).Warn("Error parsing rabbitmq reply (bert, MakeMap)")
 	return flMap
 }
 
@@ -166,7 +167,8 @@ func parseProplist(toMap *MetricMap, basename string, maybeProplist interface{})
 			(*toMap)[prefix+key+"_len"] = arraySize
 		}
 
-		parseProplist(toMap, prefix+key, value) // This can fail, but we don't care
+		err := parseProplist(toMap, prefix+key, value) // This can fail, but we don't care
+		log.WithField("error", err).Debug("Error parsing rabbitmq reply (bert, parseProplist)")
 		return true
 	})
 }
@@ -197,7 +199,7 @@ func assertBertKeyedTuple(maybeTuple interface{}) (string, bert.Term, bool) {
 	if !ok {
 		return "", nil, false
 	}
-	return key, tuple[1].(bert.Term), true
+	return key, tuple[1], true
 }
 
 func assertBertAtom(val interface{}) (string, bool) {
@@ -322,7 +324,7 @@ func (rep *rabbitBERTReply) GetString(label string) (string, bool) {
 	var result bool
 	result = false
 
-	iterateBertKV(rep.objects, func(key string, value interface{}) bool {
+	err := iterateBertKV(rep.objects, func(key string, value interface{}) bool {
 		//Check if current key should be saved as label
 
 		if key == label {
@@ -336,5 +338,6 @@ func (rep *rabbitBERTReply) GetString(label string) (string, bool) {
 		}
 		return true
 	})
+	log.WithField("error", err).Warn("Error parsing rabbitmq reply (bert, GetString)")
 	return resValue, result
 }

exporter.go

@@ -41,7 +41,6 @@ type exporter struct {
 	endpointScrapeDurationMetric *prometheus.GaugeVec
 	exporter                     map[string]Exporter
 	overviewExporter             *exporterOverview
-	self                         string
 	lastScrapeOK                 bool
 }
 

go.mod

@@ -2,17 +2,49 @@ module github.com/kbudde/rabbitmq_exporter
 
 require (
 	github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/kbudde/gobert v0.0.0-20180309235759-77f4c9cb2e7e
 	github.com/kylelemons/godebug v1.1.0
 	github.com/lib/pq v1.0.0 // indirect
-	github.com/ory/dockertest/v3 v3.6.3
-	github.com/prometheus/client_golang v1.9.0
-	github.com/sirupsen/logrus v1.7.0
-	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
-	github.com/tkanos/gonfig v0.0.0-20181112185242-896f3d81fadf
-	golang.org/x/sys v0.0.0-20210105210732-16f7687f5001
-	google.golang.org/protobuf v1.25.0 // indirect
+	github.com/ory/dockertest/v3 v3.8.0
+	github.com/prometheus/client_golang v1.11.0
+	github.com/sirupsen/logrus v1.8.1
+	github.com/streadway/amqp v1.0.0
+	github.com/tkanos/gonfig v0.0.0-20210106201359-53e13348de2f
+	golang.org/x/sys v0.0.0-20211001092434-39dca1131b70
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-go 1.15
+require (
+	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
+	github.com/Microsoft/go-winio v0.5.0 // indirect
+	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/docker/cli v20.10.8+incompatible // indirect
+	github.com/docker/docker v20.10.7+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.0 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
+	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
+	github.com/opencontainers/runc v1.0.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+)
+
+go 1.17