Merge branch 'port-2021-05-02'

go.mod

-module gitlab.dms3.io/dms3/public/go-ds-measure
+module gitlab.dms3.io/dms3/go-ds-measure
 
 require (
-	gitlab.dms3.io/dms3/public/go-datastore v0.0.1
-	gitlab.dms3.io/dms3/public/go-metrics-interface v0.0.1
+	gitlab.dms3.io/dms3/go-datastore v0.0.2
+	gitlab.dms3.io/dms3/go-metrics-interface v0.0.2
 )
 
 go 1.15

go.sum

@@ -19,11 +19,11 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-gitlab.dms3.io/dms3/public/go-datastore v0.0.1 h1:RjZLvnqlvWDpb5ZwvkVEWGONF7zKNPe4Q0DND5oxZec=
-gitlab.dms3.io/dms3/public/go-datastore v0.0.1/go.mod h1:qSI0hpmVMo6HCp0uveHTKyQ87j1aVe2hqiTeiPCehYA=
-gitlab.dms3.io/dms3/public/go-dms3-delay v0.0.1/go.mod h1:Mg+buHOoh8UruN+MMqeqBUPBKMRTmpsXAyxv5ZSt+X4=
-gitlab.dms3.io/dms3/public/go-metrics-interface v0.0.1 h1:oLJzd5zSjf5C1aEMHziNbV4RbJVuPaNzzKW4VBzKnQM=
-gitlab.dms3.io/dms3/public/go-metrics-interface v0.0.1/go.mod h1:Ag1ayfnHxy0H659akn+bjAGn9k/HJrpxsVrB90DmRL8=
+gitlab.dms3.io/dms3/go-datastore v0.0.2 h1:cLsmDEiDz+onFnbPhyLYuPECw+tJEnvpil958ps0WHw=
+gitlab.dms3.io/dms3/go-datastore v0.0.2/go.mod h1:IOybd0feVxRiGt5idG/FzjdeK6itS0uaMgD42CmANFo=
+gitlab.dms3.io/dms3/go-dms3-delay v0.0.2/go.mod h1:WPBu+WALc2GAYE3KfI5QM+r3dX9gv7wHJVfTFlYBwDg=
+gitlab.dms3.io/dms3/go-metrics-interface v0.0.2 h1:ne/5rq39etdUVBeSl80e/BM6U8dLSzB/nMvSoZ6woXM=
+gitlab.dms3.io/dms3/go-metrics-interface v0.0.2/go.mod h1:7A1hwAuYHn/sPzRzK2bF/yJwwyH85pqC9q09ezOCzgE=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=

measure.go

 // Package measure provides a Datastore wrapper that records metrics
-// using gitlab.dms3.io/dms3/public/go-metrics-interface
+// using gitlab.dms3.io/dms3/go-metrics-interface
 package measure
 
 import (
 	"io"
 	"time"
 
-	"gitlab.dms3.io/dms3/public/go-datastore"
-	"gitlab.dms3.io/dms3/public/go-datastore/query"
-	"gitlab.dms3.io/dms3/public/go-metrics-interface"
+	"gitlab.dms3.io/dms3/go-datastore"
+	"gitlab.dms3.io/dms3/go-datastore/query"
+	"gitlab.dms3.io/dms3/go-metrics-interface"
 )
 
 var (

measure_test.go

@@ -3,7 +3,7 @@ package measure
 import (
 	"testing"
 
-	dstest "gitlab.dms3.io/dms3/public/go-datastore/test"
+	dstest "gitlab.dms3.io/dms3/go-datastore/test"
 )
 
 func TestSuite(t *testing.T) {