From ccde0d235749161c5d59370ccfea516195680f7c Mon Sep 17 00:00:00 2001
From: Tomas Knappek <kppk@users.noreply.github.com>
Date: Thu, 17 May 2018 13:21:36 -0700
Subject: [PATCH] Wrap custom datastore with metrics and validator (#1002)

* Wrap method added to datastore

* datastore formatting fixed
---
 api/datastore/datastore.go | 6 +++++-
 api/server/server.go       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/datastore/datastore.go b/api/datastore/datastore.go
index e93236ca4..b50148ed2 100644
--- a/api/datastore/datastore.go
+++ b/api/datastore/datastore.go
@@ -18,7 +18,11 @@ func New(ctx context.Context, dbURL string) (models.Datastore, error) {
 		return nil, err
 	}
 
-	return datastoreutil.MetricDS(datastoreutil.NewValidator(ds)), nil
+	return Wrap(ds), nil
+}
+
+func Wrap(ds models.Datastore) models.Datastore {
+	return datastoreutil.MetricDS(datastoreutil.NewValidator(ds))
 }
 
 func newds(ctx context.Context, dbURL string) (models.Datastore, error) {
diff --git a/api/server/server.go b/api/server/server.go
index 4cfd9392b..e13c26a0e 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -325,7 +325,7 @@ func WithNodeCertAuthority(ca string) ServerOption {
 
 func WithDatastore(ds models.Datastore) ServerOption {
 	return func(ctx context.Context, s *Server) error {
-		s.datastore = ds
+		s.datastore = datastore.Wrap(ds)
 		return nil
 	}
 }