Merge pull request #172 from libp2p/metrics

enable quic-go metrics collection
libp2p · Sep 2, 2020 · fbda35c · fbda35c
2 parents ec4007a + b5e3105
commit fbda35c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/p2p/transport/quic/qlog.go → p2p/transport/quic/tracer.go b/p2p/transport/quic/qlog.go → p2p/transport/quic/tracer.go
@@ -9,21 +9,24 @@ import (
 	"time"
 
 	"github.com/lucas-clemente/quic-go/logging"
+	"github.com/lucas-clemente/quic-go/metrics"
 	"github.com/lucas-clemente/quic-go/qlog"
 )
 
 var tracer logging.Tracer
 
 func init() {
-	qlogDir := os.Getenv("QLOGDIR")
-	if len(qlogDir) == 0 {
-		return
+	tracers := []logging.Tracer{metrics.NewTracer()}
+	if qlogDir := os.Getenv("QLOGDIR"); len(qlogDir) > 0 {
+		if qlogger := initQlogger(qlogDir); qlogger != nil {
+			tracers = append(tracers, qlogger)
+		}
 	}
-	initQlogger(qlogDir)
+	tracer = logging.NewMultiplexedTracer(tracers...)
 }
 
-func initQlogger(qlogDir string) {
-	tracer = qlog.NewTracer(func(role logging.Perspective, connID []byte) io.WriteCloser {
+func initQlogger(qlogDir string) logging.Tracer {
+	return qlog.NewTracer(func(role logging.Perspective, connID []byte) io.WriteCloser {
 		// create the QLOGDIR, if it doesn't exist
 		if err := os.MkdirAll(qlogDir, 0777); err != nil {
 			log.Errorf("creating the QLOGDIR failed: %s", err)

diff --git a/p2p/transport/quic/qlog_test.go → p2p/transport/quic/tracer_test.go b/p2p/transport/quic/qlog_test.go → p2p/transport/quic/tracer_test.go