feat: log package in mobile webhooks (#2606)

brave-intl · Jul 18, 2024 · 0ad379f · 0ad379f
1 parent 7d05017
commit 0ad379f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/services/skus/appstore.go b/services/skus/appstore.go
@@ -128,6 +128,14 @@ func (x *appStoreSrvNotification) shouldCancel() bool {
 	}
 }
 
+func (x *appStoreSrvNotification) ntfType() string {
+	return string(x.val.NotificationType)
+}
+
+func (x *appStoreSrvNotification) ntfSubType() string {
+	return string(x.val.Subtype)
+}
+
 func (x *appStoreSrvNotification) effect() string {
 	switch {
 	case x.shouldRenew():
@@ -139,6 +147,10 @@ func (x *appStoreSrvNotification) effect() string {
 	}
 }
 
+func (x *appStoreSrvNotification) pkg() string {
+	return x.val.Data.BundleID
+}
+
 func parseAppStoreSrvNotification(vrf *assnCertVerifier, spayload string) (*appStoreSrvNotification, error) {
 	certs, err := extractASSNCerts(spayload)
 	if err != nil {

diff --git a/services/skus/controllers.go b/services/skus/controllers.go
@@ -1036,7 +1036,7 @@ func handleWebhookPlayStoreH(w http.ResponseWriter, r *http.Request, svc *Servic
 	}
 
 	if err := svc.processPlayStoreNotification(ctx, ntf); err != nil {
-		l := lg.With().Str("ntf_type", ntf.ntfType()).Int("ntf_subtype", ntf.ntfSubType()).Str("ntf_effect", ntf.effect()).Logger()
+		l := lg.With().Str("ntf_type", ntf.ntfType()).Int("ntf_subtype", ntf.ntfSubType()).Str("ntf_effect", ntf.effect()).Str("ntf_package", ntf.pkg()).Logger()
 
 		switch {
 		case errors.Is(err, context.Canceled):
@@ -1085,7 +1085,7 @@ func handleWebhookPlayStoreH(w http.ResponseWriter, r *http.Request, svc *Servic
 		msg = "processed play store notification"
 	}
 
-	lg.Info().Str("ntf_type", ntf.ntfType()).Int("ntf_subtype", ntf.ntfSubType()).Str("ntf_effect", ntf.effect()).Msg(msg)
+	lg.Info().Str("ntf_type", ntf.ntfType()).Int("ntf_subtype", ntf.ntfSubType()).Str("ntf_effect", ntf.effect()).Str("ntf_package", ntf.pkg()).Msg(msg)
 
 	return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 }
@@ -1126,7 +1126,7 @@ func handleWebhookAppStoreH(w http.ResponseWriter, r *http.Request, svc *Service
 	}
 
 	if err := svc.processAppStoreNotification(ctx, ntf); err != nil {
-		l := lg.With().Str("ntf_type", string(ntf.val.NotificationType)).Str("ntf_subtype", string(ntf.val.Subtype)).Str("ntf_effect", ntf.effect()).Logger()
+		l := lg.With().Str("ntf_type", ntf.ntfType()).Str("ntf_subtype", ntf.ntfSubType()).Str("ntf_effect", ntf.effect()).Str("ntf_package", ntf.pkg()).Logger()
 
 		switch {
 		case errors.Is(err, context.Canceled):
@@ -1176,7 +1176,7 @@ func handleWebhookAppStoreH(w http.ResponseWriter, r *http.Request, svc *Service
 		msg = "processed app store notification"
 	}
 
-	lg.Info().Str("ntf_type", string(ntf.val.NotificationType)).Str("ntf_subtype", string(ntf.val.Subtype)).Str("ntf_effect", ntf.effect()).Msg(msg)
+	lg.Info().Str("ntf_type", ntf.ntfType()).Str("ntf_subtype", ntf.ntfSubType()).Str("ntf_effect", ntf.effect()).Str("ntf_package", ntf.pkg()).Msg(msg)
 
 	return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 }

diff --git a/services/skus/playstore.go b/services/skus/playstore.go
@@ -200,6 +200,10 @@ func (x *playStoreDevNotification) effect() string {
 	}
 }
 
+func (x *playStoreDevNotification) pkg() string {
+	return x.PackageName
+}
+
 func (x *playStoreDevNotification) isBeforeCutoff() bool {
 	ems, err := x.EventTimeMilli.Int64()
 	if err != nil {