chore: add storage type tag to metrics subscope (#81)

+ unify metrics name
+ add storage type tag to metrics

Author: bestmike007

internal/dlq/sqs/dlq.go

@@ -69,10 +69,12 @@ var (
 
 func New(params DLQParams) (DLQ, error) {
 	client := sqs.New(params.Session)
-	metrics := params.Metrics.SubScope("dlq")
+	metrics := params.Metrics.SubScope("dlq").Tagged(map[string]string{
+		"storage_type": "sqs",
+	})
 	impl := &dlqImpl{
 		config:                   params.Config,
-		logger:                   log.WithPackage(params.Logger),
+		logger:                   log.WithPackage(params.Logger).With(zap.String("storage_type", "sqs")),
 		client:                   client,
 		instrumentSendMessage:    instrument.New(metrics, "send_message"),
 		instrumentResendMessage:  instrument.New(metrics, "resend_message"),

internal/storage/blobstorage/s3/blob_storage.go

@@ -80,7 +80,9 @@ func (f *blobStorageFactory) Create() (internal.BlobStorage, error) {
 }
 
 func New(params BlobStorageParams) (internal.BlobStorage, error) {
-	metrics := params.Metrics.SubScope("blob_storage")
+	metrics := params.Metrics.SubScope("blob_storage").Tagged(map[string]string{
+		"storage_type": "s3",
+	})
 	return &blobStorageImpl{
 		logger:             log.WithPackage(params.Logger),
 		config:             params.Config,
@@ -217,6 +219,7 @@ func (s *blobStorageImpl) Download(ctx context.Context, metadata *api.BlockMetad
 func (s *blobStorageImpl) logDuration(method string, start time.Time) {
 	s.logger.Debug(
 		"blob_storage",
+		zap.String("storage_type", "s3"),
 		zap.String("method", method),
 		zap.Duration("duration", time.Since(start)),
 	)

internal/storage/metastorage/dynamodb/block_storage.go

@@ -73,7 +73,9 @@ func newBlockStorage(params Params) (internal.BlockStorage, error) {
 		return nil, xerrors.Errorf("failed to create metadata accessor: %w", err)
 	}
 
-	metrics := params.Metrics.SubScope("block_storage")
+	metrics := params.Metrics.SubScope("block_storage").Tagged(map[string]string{
+		"storage_type": "dynamodb",
+	})
 	accessor := blockStorageImpl{
 		blockTable:                       metadataTable,
 		blockStartHeight:                 params.Config.Chain.BlockStartHeight,

internal/storage/metastorage/dynamodb/event_storage.go

@@ -73,7 +73,9 @@ func newEventStorage(params Params) (internal.EventStorage, error) {
 		return nil, xerrors.Errorf("failed to create versioned event table: %w", err)
 	}
 
-	metrics := params.Metrics.SubScope("event_storage")
+	metrics := params.Metrics.SubScope("event_storage").Tagged(map[string]string{
+		"storage_type": "dynamodb",
+	})
 	storage := eventStorageImpl{
 		eventTable:                             eventTable,
 		heightIndexName:                        heightIndexName,

internal/storage/metastorage/dynamodb/transaction_storage.go

@@ -57,7 +57,9 @@ func newTransactionStorage(params Params) (internal.TransactionStorage, error) {
 		return nil, xerrors.Errorf("failed to create transaction table accessor: %w", err)
 	}
 
-	metrics := params.Metrics.SubScope("transaction_storage")
+	metrics := params.Metrics.SubScope("transaction_storage").Tagged(map[string]string{
+		"storage_type": "dynamodb",
+	})
 
 	return &transactionStorageImpl{
 		transactionTable:                 transactionTable,

internal/storage/metastorage/firestore/block_storage.go

@@ -36,7 +36,9 @@ type (
 )
 
 func newBlockStorage(params Params, client *firestore.Client) (internal.BlockStorage, error) {
-	metrics := params.Metrics.SubScope("block_storage_firestore")
+	metrics := params.Metrics.SubScope("block_storage").Tagged(map[string]string{
+		"storage_type": "firestore",
+	})
 	accessor := blockStorageImpl{
 		client:                           client,
 		projectId:                        params.Config.GCP.Project,

internal/storage/metastorage/firestore/event_storage.go

@@ -39,7 +39,9 @@ type (
 )
 
 func newEventStorage(params Params, client *firestore.Client) (internal.EventStorage, error) {
-	metrics := params.Metrics.SubScope("event_storage_firestore")
+	metrics := params.Metrics.SubScope("event_storage").Tagged(map[string]string{
+		"storage_type": "firestore",
+	})
 	storage := eventStorageImpl{
 		client:                                 client,
 		env:                                    params.Config.ConfigName,

internal/storage/metastorage/firestore/transaction_storage.go

@@ -21,7 +21,9 @@ type (
 var _ internal.TransactionStorage = (*transactionStorageImpl)(nil)
 
 func newTransactionStorage(params Params, client *firestore.Client) (internal.TransactionStorage, error) {
-	metrics := params.Metrics.SubScope("transaction_storage_firestore")
+	metrics := params.Metrics.SubScope("transaction_storage").Tagged(map[string]string{
+		"storage_type": "firestore",
+	})
 	return &transactionStorageImpl{
 		client:                           client,
 		instrumentAddOrUpdateTransaction: instrument.New(metrics, "add_transactions"),