Make ResourceURLNotifier configurable. (#1004)

* Make ResourceURLNotifier configurable.

Also change default max age to 10s.

* generated protobuf

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Author: boks1971

webhook/resource_url_notifier.go

@@ -35,14 +35,19 @@ import (
 
 const (
 	defaultTimeout  = 5 * time.Minute
-	defaultMaxAge   = 5 * time.Second
+	defaultMaxAge   = 10 * time.Second
 	defaultMaxDepth = 200
 )
 
 var (
 	errClosed = errors.New("notifier is closed")
 )
 
+type ResourceURLNotifierConfig struct {
+	MaxAge   time.Duration
+	MaxDepth int
+}
+
 type poster interface {
 	Process(ctx context.Context, queuedAt time.Time, event *livekit.WebhookEvent)
 }
@@ -57,8 +62,7 @@ type ResourceURLNotifierParams struct {
 	HTTPClientParams
 	Logger     logger.Logger
 	Timeout    time.Duration
-	MaxAge     time.Duration
-	MaxDepth   int
+	Config     ResourceURLNotifierConfig
 	URL        string
 	APIKey     string
 	APISecret  string
@@ -93,11 +97,11 @@ func NewResourceURLNotifier(params ResourceURLNotifierParams) *ResourceURLNotifi
 	if params.Timeout == 0 {
 		params.Timeout = defaultTimeout
 	}
-	if params.MaxAge == 0 {
-		params.MaxAge = defaultMaxAge
+	if params.Config.MaxAge == 0 {
+		params.Config.MaxAge = defaultMaxAge
 	}
-	if params.MaxDepth == 0 {
-		params.MaxDepth = defaultMaxDepth
+	if params.Config.MaxDepth == 0 {
+		params.Config.MaxDepth = defaultMaxDepth
 	}
 
 	rhc := retryablehttp.NewClient()
@@ -167,7 +171,7 @@ func (r *ResourceURLNotifier) QueueNotify(ctx context.Context, event *livekit.We
 	rqi := r.resourceQueues[key]
 	if rqi == nil || !r.resourceQueueTimeoutQueue.Reset(rqi.tqi) {
 		rq := newResourceQueue(resourceQueueParams{
-			MaxDepth: r.params.MaxDepth,
+			MaxDepth: r.params.Config.MaxDepth,
 			Poster:   r,
 		})
 		rqi = &resourceQueueInfo{resourceQueue: rq, key: key}
@@ -223,7 +227,7 @@ func (r *ResourceURLNotifier) Process(ctx context.Context, queuedAt time.Time, e
 	queueDuration := time.Since(queuedAt)
 	fields = append(fields, "queueDuration", queueDuration)
 
-	if queueDuration > r.params.MaxAge {
+	if queueDuration > r.params.Config.MaxAge {
 		fields = append(fields, "reason", "age")
 		r.params.Logger.Infow("dropped webhook", fields...)
 

webhook/webhook_test.go

@@ -601,8 +601,10 @@ func TestResourceURLNotifierLifecycle(t *testing.T) {
 			URL:       testUrl,
 			APIKey:    apiKey,
 			APISecret: apiSecret,
-			MaxAge:    200 * time.Millisecond,
-			MaxDepth:  50,
+			Config: ResourceURLNotifierConfig{
+				MaxAge:   200 * time.Millisecond,
+				MaxDepth: 50,
+			},
 			HTTPClientParams: HTTPClientParams{
 				RetryWaitMax:  time.Millisecond,
 				MaxRetries:    1,
@@ -636,8 +638,10 @@ func TestResourceURLNotifierLifecycle(t *testing.T) {
 			URL:       "http://localhost:9987",
 			APIKey:    apiKey,
 			APISecret: apiSecret,
-			MaxAge:    200 * time.Millisecond,
-			MaxDepth:  50,
+			Config: ResourceURLNotifierConfig{
+				MaxAge:   200 * time.Millisecond,
+				MaxDepth: 50,
+			},
 			HTTPClientParams: HTTPClientParams{
 				RetryWaitMax:  time.Millisecond,
 				MaxRetries:    1,
@@ -660,11 +664,13 @@ func TestResourceURLNotifierFilter(t *testing.T) {
 
 	t.Run("none", func(t *testing.T) {
 		resourceURLNotifier := NewResourceURLNotifier(ResourceURLNotifierParams{
-			URL:          testUrl,
-			APIKey:       apiKey,
-			APISecret:    apiSecret,
-			MaxAge:       200 * time.Millisecond,
-			MaxDepth:     50,
+			URL:       testUrl,
+			APIKey:    apiKey,
+			APISecret: apiSecret,
+			Config: ResourceURLNotifierConfig{
+				MaxAge:   200 * time.Millisecond,
+				MaxDepth: 50,
+			},
 			FilterParams: FilterParams{},
 		})
 		defer resourceURLNotifier.Stop(false)
@@ -691,8 +697,10 @@ func TestResourceURLNotifierFilter(t *testing.T) {
 			URL:       testUrl,
 			APIKey:    apiKey,
 			APISecret: apiSecret,
-			MaxAge:    200 * time.Millisecond,
-			MaxDepth:  50,
+			Config: ResourceURLNotifierConfig{
+				MaxAge:   200 * time.Millisecond,
+				MaxDepth: 50,
+			},
 			FilterParams: FilterParams{
 				IncludeEvents: []string{EventRoomStarted},
 			},
@@ -721,8 +729,10 @@ func TestResourceURLNotifierFilter(t *testing.T) {
 			URL:       testUrl,
 			APIKey:    apiKey,
 			APISecret: apiSecret,
-			MaxAge:    200 * time.Millisecond,
-			MaxDepth:  50,
+			Config: ResourceURLNotifierConfig{
+				MaxAge:   200 * time.Millisecond,
+				MaxDepth: 50,
+			},
 			FilterParams: FilterParams{
 				ExcludeEvents: []string{EventRoomStarted},
 			},
@@ -751,8 +761,10 @@ func TestResourceURLNotifierFilter(t *testing.T) {
 			URL:       testUrl,
 			APIKey:    apiKey,
 			APISecret: apiSecret,
-			MaxAge:    200 * time.Millisecond,
-			MaxDepth:  50,
+			Config: ResourceURLNotifierConfig{
+				MaxAge:   200 * time.Millisecond,
+				MaxDepth: 50,
+			},
 			FilterParams: FilterParams{
 				IncludeEvents: []string{EventRoomStarted},
 				ExcludeEvents: []string{EventRoomStarted, EventRoomFinished},
@@ -785,8 +797,10 @@ func newTestResourceNotifier(timeout time.Duration, maxAge time.Duration, maxDep
 		APIKey:    apiKey,
 		APISecret: apiSecret,
 		Timeout:   timeout,
-		MaxAge:    maxAge,
-		MaxDepth:  maxDepth,
+		Config: ResourceURLNotifierConfig{
+			MaxAge:   maxAge,
+			MaxDepth: maxDepth,
+		},
 	})
 }