From 74e0072872deca64f9e9ce97450c94954035e95c Mon Sep 17 00:00:00 2001
From: colindickson <colin.dickson@gmail.com>
Date: Wed, 4 Sep 2024 14:00:36 -0400
Subject: [PATCH] debugging tier2 metering with additional logging

---
 service/tier2.go | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/service/tier2.go b/service/tier2.go
index 9eaa91e2..41f308bf 100644
--- a/service/tier2.go
+++ b/service/tier2.go
@@ -513,11 +513,17 @@ func canSkipBlockSource(existingExecOuts map[string]*execout.File, requiredModul
 
 func tier2ResponseHandler(ctx context.Context, logger *zap.Logger, streamSrv pbssinternal.Substreams_ProcessRangeServer) substreams.ResponseFunc {
 	meter := dmetering.GetBytesMeter(ctx)
-	auth := dauth.FromContext(ctx)
-	userID := auth.UserID()
-	apiKeyID := auth.APIKeyID()
-	userMeta := auth.Meta()
-	ip := auth.RealIP()
+
+	var userID, apiKeyID, userMeta, ip string
+	if auth := dauth.FromContext(ctx); auth != nil {
+		userID = auth.UserID()
+		apiKeyID = auth.APIKeyID()
+		userMeta = auth.Meta()
+		ip = auth.RealIP()
+		logger.Info("auth information available in tier2 response handler", zap.String("user_id", userID), zap.String("key_id", apiKeyID), zap.String("ip_address", ip))
+	} else {
+		logger.Warn("no auth information available in tier2 response handler")
+	}
 
 	return func(respAny substreams.ResponseFromAnyTier) error {
 		resp := respAny.(*pbssinternal.ProcessRangeResponse)
@@ -526,6 +532,13 @@ func tier2ResponseHandler(ctx context.Context, logger *zap.Logger, streamSrv pbs
 			return connect.NewError(connect.CodeUnavailable, err)
 		}
 
+		logger.Info("sending metering event",
+			zap.String("user_id", userID),
+			zap.String("key_id", apiKeyID),
+			zap.String("ip_address", ip),
+			zap.String("user_meta", userMeta),
+			zap.String("endpoint", "sf.substreams.internal.v2/ProcessRange"),
+		)
 		metering.Send(ctx, meter, userID, apiKeyID, ip, userMeta, "sf.substreams.internal.v2/ProcessRange", resp)
 		return nil
 	}