Register metrics in start instead of prep

firewall/interception.go

@@ -51,15 +51,14 @@ func init() {
 }
 
 func interceptionPrep() error {
-	err := registerMetrics()
-	if err != nil {
-		return err
-	}
-
 	return prepAPIAuth()
 }
 
 func interceptionStart() error {
+	if err := registerMetrics(); err != nil {
+		return err
+	}
+
 	startAPIAuth()
 
 	interceptionModule.StartWorker("stat logger", statLogger)
@@ -86,6 +85,8 @@ func SetNameserverIPMatcher(fn func(ip net.IP) bool) error {
 }
 
 func handlePacket(ctx context.Context, pkt packet.Packet) {
+	// log.Errorf("DEBUG: firewall: handling packet %s", pkt)
+
 	// Record metrics.
 	startTime := time.Now()
 	defer packetHandlingHistogram.UpdateDuration(startTime)

nameserver/module.go

@@ -33,17 +33,16 @@ func init() {
 }
 
 func prep() error {
-	err := registerConfig()
-	if err != nil {
-		return err
-	}
-
-	return registerMetrics()
+	return registerConfig()
 }
 
 func start() error {
 	logFlagOverrides()
 
+	if err := registerMetrics(); err != nil {
+		return err
+	}
+
 	ip1, ip2, port, err := getListenAddresses(nameserverAddressConfig())
 	if err != nil {
 		return fmt.Errorf("failed to parse nameserver listen address: %w", err)

network/module.go

@@ -11,7 +11,7 @@ var (
 )
 
 func init() {
-	module = modules.Register("network", prep, start, nil, "base", "processes")
+	module = modules.Register("network", nil, start, nil, "base", "processes")
 }
 
 // SetDefaultFirewallHandler sets the default firewall handler.
@@ -21,10 +21,6 @@ func SetDefaultFirewallHandler(handler FirewallHandler) {
 	}
 }
 
-func prep() error {
-	return registerMetrics()
-}
-
 func start() error {
 	err := registerAsDatabase()
 	if err != nil {
@@ -35,6 +31,10 @@ func start() error {
 		return err
 	}
 
+	if err := registerMetrics(); err != nil {
+		return err
+	}
+
 	module.StartServiceWorker("clean connections", 0, connectionCleaner)
 	module.StartServiceWorker("write open dns requests", 0, openDNSRequestWriter)