Merge remote-tracking branch 'origin/main' into raja_signal_v2_draft

Author: boks1971

webhook/resource_queue.go

@@ -114,8 +114,9 @@ func (r *resourceQueue) worker() {
 		}
 
 		item := r.items.PopFront()
+		qLen := r.items.Len()
 		r.mu.Unlock()
 
-		r.params.Poster.Process(item.ctx, item.queuedAt, item.event, item.params)
+		r.params.Poster.Process(item.ctx, item.queuedAt, item.event, item.params, qLen)
 	}
 }

webhook/resource_url_notifier.go

@@ -54,7 +54,13 @@ var DefaultResourceURLNotifierConfig = ResourceURLNotifierConfig{
 }
 
 type poster interface {
-	Process(ctx context.Context, queuedAt time.Time, event *livekit.WebhookEvent, params *ResourceURLNotifierParams)
+	Process(
+		ctx context.Context,
+		queuedAt time.Time,
+		event *livekit.WebhookEvent,
+		params *ResourceURLNotifierParams,
+		qLen int,
+	)
 }
 
 type resourceQueueInfo struct {
@@ -254,11 +260,17 @@ func (r *ResourceURLNotifier) Stop(force bool) {
 }
 
 // poster interface
-func (r *ResourceURLNotifier) Process(ctx context.Context, queuedAt time.Time, event *livekit.WebhookEvent, params *ResourceURLNotifierParams) {
+func (r *ResourceURLNotifier) Process(
+	ctx context.Context,
+	queuedAt time.Time,
+	event *livekit.WebhookEvent,
+	params *ResourceURLNotifierParams,
+	qLen int,
+) {
 	fields := logFields(event, params.URL)
 
 	queueDuration := time.Since(queuedAt)
-	fields = append(fields, "queueDuration", queueDuration)
+	fields = append(fields, "queueDuration", queueDuration, "qLen", qLen)
 
 	if queueDuration > params.Config.MaxAge {
 		fields = append(fields, "reason", "age")