Merge pull request #23 from ihippik/feature/21-add-metrics

Refactoring

config/metrics.go

@@ -7,23 +7,36 @@ import (
 
 // Metrics Prometheus metrics.
 type Metrics struct {
-	filterSkippedEvents, publishedEvents *prometheus.CounterVec
+	filterSkippedEvents, publishedEvents, problematicEvents *prometheus.CounterVec
 }
 
+const (
+	labelApp     = "app"
+	labelTable   = "table"
+	labelSubject = "subject"
+	labelKind    = "kind"
+)
+
 // NewMetrics create and initialize new Prometheus metrics.
 func NewMetrics() *Metrics {
 	return &Metrics{
 		publishedEvents: promauto.NewCounterVec(prometheus.CounterOpts{
 			Name: "published_events_total",
 			Help: "The total number of published events",
 		},
-			[]string{"app", "subject", "table"},
+			[]string{labelApp, labelSubject, labelTable},
+		),
+		problematicEvents: promauto.NewCounterVec(prometheus.CounterOpts{
+			Name: "problematic_events_total",
+			Help: "The total number of skipped problematic events",
+		},
+			[]string{labelApp, labelKind},
 		),
 		filterSkippedEvents: promauto.NewCounterVec(prometheus.CounterOpts{
 			Name: "filter_skipped_events_total",
 			Help: "The total number of skipped events",
 		},
-			[]string{"app", "table"},
+			[]string{labelApp, labelTable},
 		),
 	}
 }
@@ -32,10 +45,15 @@ const appName = "wal-listener"
 
 // IncPublishedEvents increment published events counter.
 func (m Metrics) IncPublishedEvents(subject, table string) {
-	m.publishedEvents.With(prometheus.Labels{"app": appName, "subject": subject, "table": table}).Inc()
+	m.publishedEvents.With(prometheus.Labels{labelApp: appName, labelSubject: subject, labelTable: table}).Inc()
 }
 
 // IncFilterSkippedEvents increment skipped by filter events counter.
 func (m Metrics) IncFilterSkippedEvents(table string) {
-	m.filterSkippedEvents.With(prometheus.Labels{"app": appName, "table": table}).Inc()
+	m.filterSkippedEvents.With(prometheus.Labels{labelApp: appName, labelTable: table}).Inc()
+}
+
+// IncProblematicEvents increment skipped by filter events counter.
+func (m Metrics) IncProblematicEvents(kind string) {
+	m.problematicEvents.With(prometheus.Labels{labelApp: appName, labelKind: kind}).Inc()
 }

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli/v2 v2.26.0
 	github.com/wagslane/go-rabbitmq v0.12.4
+	golang.org/x/sync v0.6.0
 )
 
 require (

go.sum

@@ -40,8 +40,6 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=

listener/errors.go

@@ -11,16 +11,3 @@ var (
 	errUnknownMessageType   = errors.New("unknown message type")
 	errRelationNotFound     = errors.New("relation not found")
 )
-
-type serviceErr struct {
-	Caller string
-	Err    error
-}
-
-func newListenerError(caller string, err error) *serviceErr {
-	return &serviceErr{Caller: caller, Err: err}
-}
-
-func (e *serviceErr) Error() string {
-	return e.Caller + ": " + e.Err.Error()
-}