Merge pull request #32 from kpetremann/refacto

refacto: remove package events aliases
kpetremann · Jun 19, 2023 · cf5c1b5 · cf5c1b5
2 parents ae1d37c + 3aa95a5
commit cf5c1b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/salt-exporter/main.go b/cmd/salt-exporter/main.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/kpetremann/salt-exporter/internal/logging"
 	"github.com/kpetremann/salt-exporter/internal/metrics"
-	events "github.com/kpetremann/salt-exporter/pkg/event"
+	"github.com/kpetremann/salt-exporter/pkg/event"
 	"github.com/kpetremann/salt-exporter/pkg/listener"
 	"github.com/kpetremann/salt-exporter/pkg/parser"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -83,7 +83,7 @@ func main() {
 	defer stop()
 
 	log.Info().Msg("listening for events...")
-	eventChan := make(chan events.SaltEvent)
+	eventChan := make(chan event.SaltEvent)
 
 	// listen and expose metric
 	parser := parser.NewEventParser(false)

diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/kpetremann/salt-exporter/internal/filters"
-	events "github.com/kpetremann/salt-exporter/pkg/event"
+	"github.com/kpetremann/salt-exporter/pkg/event"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/rs/zerolog/log"
@@ -19,7 +19,7 @@ func boolToFloat64(b bool) float64 {
 	return 0.0
 }
 
-func ExposeMetrics(ctx context.Context, eventChan <-chan events.SaltEvent, metricsConfig MetricsConfig) {
+func ExposeMetrics(ctx context.Context, eventChan <-chan event.SaltEvent, metricsConfig MetricsConfig) {
 	newJobCounter := promauto.NewCounterVec(
 		prometheus.CounterOpts{
 			Name: "salt_new_job_total",