refactor: injecting only metric struct and substitution metric and co…

…llector files

internal/collector.go

@@ -0,0 +1,49 @@
+package internal
+
+import "github.com/prometheus/client_golang/prometheus"
+
+type Collector struct {
+	cronsumerMetric *CronsumerMetric
+
+	totalRetriedMessagesCounter   *prometheus.Desc
+	totalDiscardedMessagesCounter *prometheus.Desc
+}
+
+func NewCollector(cronsumerMetric *CronsumerMetric) *Collector {
+	return &Collector{
+		cronsumerMetric: cronsumerMetric,
+
+		totalRetriedMessagesCounter: prometheus.NewDesc(
+			prometheus.BuildFQName(Name, "retried_messages_total", "current"),
+			"Total number of retried messages.",
+			[]string{},
+			nil,
+		),
+		totalDiscardedMessagesCounter: prometheus.NewDesc(
+			prometheus.BuildFQName(Name, "discarded_messages_total", "current"),
+			"Total number of discarded messages.",
+			[]string{},
+			nil,
+		),
+	}
+}
+
+func (s *Collector) Describe(ch chan<- *prometheus.Desc) {
+	prometheus.DescribeByCollect(s, ch)
+}
+
+func (s *Collector) Collect(ch chan<- prometheus.Metric) {
+	ch <- prometheus.MustNewConstMetric(
+		s.totalRetriedMessagesCounter,
+		prometheus.CounterValue,
+		float64(s.cronsumerMetric.TotalRetriedMessagesCounter),
+		[]string{}...,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		s.totalDiscardedMessagesCounter,
+		prometheus.CounterValue,
+		float64(s.cronsumerMetric.TotalDiscardedMessagesCounter),
+		[]string{}...,
+	)
+}

internal/cron.go

@@ -23,11 +23,12 @@ type cronsumer struct {
 func NewCronsumer(cfg *kafka.Config, fn kafka.ConsumeFn) kafka.Cronsumer {
 	cfg.Logger = logger.New(cfg.LogLevel)
 	c := newKafkaCronsumer(cfg, fn)
+
 	return &cronsumer{
 		cron:             gocron.New(),
 		consumer:         c,
 		cfg:              cfg,
-		metricCollectors: []prometheus.Collector{NewCollector(*c)},
+		metricCollectors: []prometheus.Collector{NewCollector(c.metric)},
 	}
 }
 

internal/metric.go

@@ -1,58 +1,8 @@
 package internal
 
-import "github.com/prometheus/client_golang/prometheus"
-
 const Name = "kafka_cronsumer_"
 
-type Collector struct {
-	kafkaCronsumer kafkaCronsumer
-
-	totalRetriedMessagesCounter   *prometheus.Desc
-	totalDiscardedMessagesCounter *prometheus.Desc
-}
-
-func (s *Collector) Describe(ch chan<- *prometheus.Desc) {
-	prometheus.DescribeByCollect(s, ch)
-}
-
-func (s *Collector) Collect(ch chan<- prometheus.Metric) {
-	producerMetric := s.kafkaCronsumer.GetMetric()
-
-	ch <- prometheus.MustNewConstMetric(
-		s.totalRetriedMessagesCounter,
-		prometheus.CounterValue,
-		float64(producerMetric.TotalRetriedMessagesCounter),
-		[]string{}...,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		s.totalDiscardedMessagesCounter,
-		prometheus.CounterValue,
-		float64(producerMetric.TotalDiscardedMessagesCounter),
-		[]string{}...,
-	)
-}
-
 type CronsumerMetric struct {
 	TotalRetriedMessagesCounter   int64
 	TotalDiscardedMessagesCounter int64
 }
-
-func NewCollector(kafkaCronsumer kafkaCronsumer) *Collector {
-	return &Collector{
-		kafkaCronsumer: kafkaCronsumer,
-
-		totalRetriedMessagesCounter: prometheus.NewDesc(
-			prometheus.BuildFQName(Name, "retried_messages_total", "current"),
-			"Total number of retried messages.",
-			[]string{},
-			nil,
-		),
-		totalDiscardedMessagesCounter: prometheus.NewDesc(
-			prometheus.BuildFQName(Name, "discarded_messages_total", "current"),
-			"Total number of discarded messages.",
-			[]string{},
-			nil,
-		),
-	}
-}