simplify creating cassandra metrics

Author: Dieterbe

cassandra/metrics.go

@@ -16,13 +16,15 @@ type Metrics struct {
 	cassErrOther           met.Count
 }
 
-func (m *Metrics) Init(component string, stats met.Backend) {
-	m.cassErrTimeout = stats.NewCount(fmt.Sprintf("%s.error.timeout", component))
-	m.cassErrTooManyTimeouts = stats.NewCount(fmt.Sprintf("%s.error.too-many-timeouts", component))
-	m.cassErrConnClosed = stats.NewCount(fmt.Sprintf("%s.error.conn-closed", component))
-	m.cassErrNoConns = stats.NewCount(fmt.Sprintf("%s.error.no-connections", component))
-	m.cassErrUnavailable = stats.NewCount(fmt.Sprintf("%s.error.unavailable", component))
-	m.cassErrOther = stats.NewCount(fmt.Sprintf("%s.error.other", component))
+func NewMetrics(component string, stats met.Backend) Metrics {
+	return Metrics{
+		cassErrTimeout:         stats.NewCount(fmt.Sprintf("%s.error.timeout", component)),
+		cassErrTooManyTimeouts: stats.NewCount(fmt.Sprintf("%s.error.too-many-timeouts", component)),
+		cassErrConnClosed:      stats.NewCount(fmt.Sprintf("%s.error.conn-closed", component)),
+		cassErrNoConns:         stats.NewCount(fmt.Sprintf("%s.error.no-connections", component)),
+		cassErrUnavailable:     stats.NewCount(fmt.Sprintf("%s.error.unavailable", component)),
+		cassErrOther:           stats.NewCount(fmt.Sprintf("%s.error.other", component)),
+	}
 }
 
 func (m *Metrics) Inc(err error) {

idx/cassandra/cassandra.go

@@ -131,8 +131,7 @@ func (c *CasIdx) Init(stats met.Backend) error {
 	idxCasFail = stats.NewCount("idx.cassandra.fail")
 	idxCasAddDuration = stats.NewTimer("idx.cassandra.add_duration", 0)
 	idxCasDeleteDuration = stats.NewTimer("idx.cassandra.delete_duration", 0)
-	metrics = cassandra.Metrics{}
-	metrics.Init("idx.cassandra", stats)
+	metrics = cassandra.NewMetrics("idx.cassandra", stats)
 
 	for i := 0; i < numConns; i++ {
 		c.wg.Add(1)

mdata/store_cassandra.go

@@ -98,7 +98,6 @@ func NewCassandraStore(stats met.Backend, addrs, keyspace, consistency string, t
 		writeQueues:      make([]chan *ChunkWriteRequest, writers),
 		readQueue:        make(chan *ChunkReadRequest, readqsize),
 		writeQueueMeters: make([]met.Meter, writers),
-		metrics:          cassandra.Metrics{},
 	}
 
 	for i := 0; i < writers; i++ {
@@ -128,7 +127,7 @@ func (c *cassandraStore) InitMetrics(stats met.Backend) {
 	chunkSizeAtSave = stats.NewMeter("chunk_size.at_save", 0)
 	chunkSizeAtLoad = stats.NewMeter("chunk_size.at_load", 0)
 
-	c.metrics.Init("cassandra", stats)
+	c.metrics = cassandra.NewMetrics("cassandra", stats)
 }
 
 func (c *cassandraStore) Add(cwr *ChunkWriteRequest) {