bump bstream, dmetering, firehose

go.mod

@@ -11,15 +11,15 @@ require (
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.15.0
-	github.com/streamingfast/bstream v0.0.2-0.20230731142753-b2dbb4d8b89d
+	github.com/streamingfast/bstream v0.0.2-0.20230731165201-639b4f347707
 	github.com/streamingfast/cli v0.0.4-0.20230608140431-f501fec4f1ce
 	github.com/streamingfast/dauth v0.0.0-20230726175303-fc1d7198cb33
 	github.com/streamingfast/dgrpc v0.0.0-20230623191332-4ed02c06bc6f
 	github.com/streamingfast/dlauncher v0.0.0-20230607184145-76399faad89e
-	github.com/streamingfast/dmetering v0.0.0-20230731134711-568a297e7d00
+	github.com/streamingfast/dmetering v0.0.0-20230731155453-e1df53e362aa
 	github.com/streamingfast/dmetrics v0.0.0-20230516031116-28fcfeb4b9ed
 	github.com/streamingfast/dstore v0.1.1-0.20230620124109-3924b3b36c77
-	github.com/streamingfast/firehose v0.1.1-0.20230717171430-1d7a06ed55c5
+	github.com/streamingfast/firehose v0.1.1-0.20230731171526-3428fc0ff8d9
 	github.com/streamingfast/index-builder v0.0.0-20221031203737-fa2e70f09dc2
 	github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0
 	github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091

go.sum

@@ -564,8 +564,8 @@ github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jH
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/streamingfast/atm v0.0.0-20220131151839-18c87005e680 h1:fGJnUx0shX9Y312QOlz+/+yLquihXRhNqctJ26jtZZM=
 github.com/streamingfast/atm v0.0.0-20220131151839-18c87005e680/go.mod h1:iISPGAstbUsPgyC3auLLi7PYUTi9lHv5z0COam0OPOY=
-github.com/streamingfast/bstream v0.0.2-0.20230731142753-b2dbb4d8b89d h1:/Ic+nXc95x444+rScoyIxgvHv4ro/q9rpL0rvfVIgfk=
-github.com/streamingfast/bstream v0.0.2-0.20230731142753-b2dbb4d8b89d/go.mod h1:Njkx972HcZiz0djWBylxqO/eq686eDGr+egQ1lePj3Q=
+github.com/streamingfast/bstream v0.0.2-0.20230731165201-639b4f347707 h1:hJW+QNNJrR1boQuoEaajlMFjWh0XKt4Fcg33h9hT7Eo=
+github.com/streamingfast/bstream v0.0.2-0.20230731165201-639b4f347707/go.mod h1:Njkx972HcZiz0djWBylxqO/eq686eDGr+egQ1lePj3Q=
 github.com/streamingfast/cli v0.0.4-0.20230608140431-f501fec4f1ce h1:aGa+KdxKEC5QiDdM9NDcCF3b2QmWl+0lQsIW32wJElM=
 github.com/streamingfast/cli v0.0.4-0.20230608140431-f501fec4f1ce/go.mod h1:aOGP1TCGlElmh5ErULAiHmaj5x1jrjFHv6JjJSn7tP0=
 github.com/streamingfast/dauth v0.0.0-20230726175303-fc1d7198cb33 h1:MyOFvos5szhJWpoLYUeJ3UMlXBlL9kOhdD5LgEfDK48=
@@ -578,16 +578,16 @@ github.com/streamingfast/dgrpc v0.0.0-20230623191332-4ed02c06bc6f h1:qiIHzYZpnHd
 github.com/streamingfast/dgrpc v0.0.0-20230623191332-4ed02c06bc6f/go.mod h1:0tXk90PNAgFur+u/W6bQPdgfOGPGSwUqHILZKacqJj4=
 github.com/streamingfast/dlauncher v0.0.0-20230607184145-76399faad89e h1:Nh/gLDv8rOMIidb/gpO4rZOYVe09k+tof/trezkpku4=
 github.com/streamingfast/dlauncher v0.0.0-20230607184145-76399faad89e/go.mod h1:xErlHEDd5+4NlR+Mg3ZtW7BTTLB0yZBxZAjHPrkk8X4=
-github.com/streamingfast/dmetering v0.0.0-20230731134711-568a297e7d00 h1:BwDjxo3vyG7PqlVg9GFX/dD/3LEP1BK4fg00nDvqbUw=
-github.com/streamingfast/dmetering v0.0.0-20230731134711-568a297e7d00/go.mod h1:6lfPT2SUXDk/n0C6bGwcMx/yPQCdDolvI4+/eFJTc78=
+github.com/streamingfast/dmetering v0.0.0-20230731155453-e1df53e362aa h1:bM6iy5X7Gtw1oh1bMxFmtroouKZu4K4BHXaFvR96jNw=
+github.com/streamingfast/dmetering v0.0.0-20230731155453-e1df53e362aa/go.mod h1:3XggUfQMyciaue133qhbIkFqJQqNzozGpa/gI3sdwac=
 github.com/streamingfast/dmetrics v0.0.0-20230516031116-28fcfeb4b9ed h1:b6EFwgne8MSK4kUjvulyyg2GGyvVUgQ+xY6o8eXlFIA=
 github.com/streamingfast/dmetrics v0.0.0-20230516031116-28fcfeb4b9ed/go.mod h1:JbxEDbzWRG1dHdNIPrYfuPllEkktZMgm40AwVIBENcw=
 github.com/streamingfast/dstore v0.1.1-0.20230620124109-3924b3b36c77 h1:u7FWLqz3Uwff609Ja9M+3aGOWqBCVU7dx9i6R6Qc4qI=
 github.com/streamingfast/dstore v0.1.1-0.20230620124109-3924b3b36c77/go.mod h1:ngKU7WzHwVjOFpt2g+Wtob5mX4IvN90HYlnARcTRbmQ=
 github.com/streamingfast/dtracing v0.0.0-20220305214756-b5c0e8699839 h1:K6mJPvh1jAL+/gBS7Bh9jyzWaTib6N47m06gZOTUPwQ=
 github.com/streamingfast/dtracing v0.0.0-20220305214756-b5c0e8699839/go.mod h1:huOJyjMYS6K8upTuxDxaNd+emD65RrXoVBvh8f1/7Ns=
-github.com/streamingfast/firehose v0.1.1-0.20230717171430-1d7a06ed55c5 h1:Au6EIQFGdJVJ02R+aPZioqDmmADy1daGVO1qL0XUEvU=
-github.com/streamingfast/firehose v0.1.1-0.20230717171430-1d7a06ed55c5/go.mod h1:zj9KeON9HfZCYUaV4rhEqMhneJFHKv1ppwtPR/rEFAk=
+github.com/streamingfast/firehose v0.1.1-0.20230731171526-3428fc0ff8d9 h1:SybLEPFkJk8EINJGDlijSWxEZGNXDul4zqlDpttQUCI=
+github.com/streamingfast/firehose v0.1.1-0.20230731171526-3428fc0ff8d9/go.mod h1:lGC1T6mpAAApjBQNF5COSXb3SbrYRI3dBR1f6/PZE54=
 github.com/streamingfast/index-builder v0.0.0-20221031203737-fa2e70f09dc2 h1:dgYLhP3STiPi30fISAijFPEB11D4r1fQFc8D3cpgV5s=
 github.com/streamingfast/index-builder v0.0.0-20221031203737-fa2e70f09dc2/go.mod h1:OYv1UX/kRsV9aP4SEwa9zpt34qGzdtJzOvdGn+n56as=
 github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0 h1:g8eEYbFSykyzIyuxNMmHEUGGUvJE0ivmqZagLDK42gw=

main.go

@@ -15,7 +15,8 @@ import (
 	dauthnull "github.com/streamingfast/dauth/null"
 	dauthtrust "github.com/streamingfast/dauth/trust"
 	"github.com/streamingfast/dlauncher/launcher"
-	"github.com/streamingfast/dmetering"
+	dmeteringgrpc "github.com/streamingfast/dmetering/grpc"
+	dmeteringlogger "github.com/streamingfast/dmetering/logger"
 	"github.com/streamingfast/logging"
 	"go.uber.org/zap"
 )
@@ -30,7 +31,8 @@ func Main[B Block](chain *Chain[B]) {
 	dauthgrpc.Register()
 	dauthnull.Register()
 	dauthtrust.Register()
-	dmetering.RegisterDefault()
+	dmeteringgrpc.Register()
+	dmeteringlogger.Register()
 
 	chain.Validate()
 	chain.Init()

start.go

@@ -91,9 +91,7 @@ func start(dataDir string, args []string) (err error) {
 		return fmt.Errorf("unable to initialize dmetering: %w", err)
 	}
 	defer func() {
-		if err := eventEmitter.Close(); err != nil {
-			rootLog.Warn("failed to properly close event emitter", zap.Error(err))
-		}
+		eventEmitter.Shutdown(nil)
 	}()
 	dmetering.SetDefaultEmitter(eventEmitter)