Merge branch 'feature/prometheus-by-indexname'

Author: 3n0ugh

elasticsearch/bulk/bulk.go

@@ -49,9 +49,9 @@ type Bulk struct {
 	batchTicker         *time.Ticker
 	isClosed            chan bool
 	esClient            *elasticsearch.Client
-	batch               []BatchItem
-	typeName            []byte
 	readers             []*bytes.MultiDimensionReader
+	typeName            []byte
+	batch               []BatchItem
 	batchIndex          int
 	batchSize           int
 	batchSizeLimit      int
@@ -60,7 +60,6 @@ type Bulk struct {
 	batchByteSize       int
 	concurrentRequest   int
 	flushLock           sync.Mutex
-	pqCDC               *cdc.Connector
 }
 
 type BatchItem struct {

elasticsearch/bulk/metric.go

@@ -20,14 +20,12 @@ type Metric interface {
 var hostname, _ = os.Hostname()
 
 type metric struct {
-	slotName string
-	pqCDC    cdc.Connector
-
+	pqCDC                       cdc.Connector
 	processLatencyMs            prometheus.Gauge
 	bulkRequestProcessLatencyMs prometheus.Gauge
-
-	totalIndex  map[string]prometheus.Counter
-	totalDelete map[string]prometheus.Counter
+	totalIndex                  map[string]prometheus.Counter
+	totalDelete                 map[string]prometheus.Counter
+	slotName                    string
 }
 
 func NewMetric(pqCDC cdc.Connector, slotName string) Metric {