updated dependencies

go.mod

@@ -1,11 +1,25 @@
 module github.com/phin1x/cups-exporter
 
-go 1.13
+go 1.20
 
 require (
-	github.com/go-logr/logr v0.1.0
-	github.com/go-logr/zapr v0.1.1
-	github.com/phin1x/go-ipp v1.2.1-0.20191226192803-6c9dee854ace
-	github.com/prometheus/client_golang v1.3.0
-	go.uber.org/zap v1.13.0
+	github.com/go-logr/logr v1.2.4
+	github.com/go-logr/zapr v1.2.3
+	github.com/phin1x/go-ipp v1.6.0
+	github.com/prometheus/client_golang v1.15.0
+	go.uber.org/zap v1.24.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 )

pkg/exporter.go → internal/exporter.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"github.com/go-logr/logr"
@@ -95,7 +95,7 @@ func (e *Exporter) Describe(ch chan<- *prometheus.Desc) {
 	ch <- e.jobsTotal
 	ch <- e.jobsActiveTotal
 	ch <- e.printersTotal
-	ch <-e.printerStateTotal
+	ch <- e.printerStateTotal
 }
 
 func (e *Exporter) Collect(ch chan<- prometheus.Metric) {

pkg/jobs.go → internal/jobs.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"github.com/phin1x/go-ipp"
@@ -32,7 +32,7 @@ func (e *Exporter) jobsMetrics(ch chan<- prometheus.Metric) error {
 }
 
 /*
-	returns the last job id, the last completed job id and the current active jobs
+returns the last job id, the last completed job id and the current active jobs
 */
 func getLastJobId(m map[int]ipp.Attributes) int {
 	lastJobId := 0

pkg/printers.go → internal/printers.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"github.com/phin1x/go-ipp"
@@ -12,13 +12,14 @@ func (e *Exporter) printerMetrics(ch chan<- prometheus.Metric) error {
 		return err
 	}
 
-	states := make(map[ipp.PrinterState]int)
-	states[ipp.PrinterStateIdle] = 0
-	states[ipp.PrinterStateProcessing] = 0
-	states[ipp.PrinterStateStopped] = 0
+	states := map[int8]int{
+		ipp.PrinterStateIdle:       0,
+		ipp.PrinterStateProcessing: 0,
+		ipp.PrinterStateStopped:    0,
+	}
 
 	for _, attr := range printers {
-		states[ipp.PrinterState(attr["printer-state"][0].Value.(int))]++
+		states[attr["printer-state"][0].Value.(int8)]++
 	}
 
 	ch <- prometheus.MustNewConstMetric(e.printersTotal, prometheus.GaugeValue, float64(len(printers)))

main.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
-	"github.com/phin1x/cups-exporter/pkg"
+	"github.com/phin1x/cups-exporter/internal"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
@@ -29,7 +29,7 @@ func main() {
 	flag.Parse()
 
 	log.Info("starting cups exporter")
-	exporter, err := pkg.NewExporter(opts.CupsUri, log)
+	exporter, err := internal.NewExporter(opts.CupsUri, log)
 	if err != nil {
 		log.Error(err, "failed to create the exporter")
 		os.Exit(1)