[release-1.12] Add timeouts on receive adapter (#447)

* Update adapter.go * Update adapter.go * Update adapter.go * Update adapter.go --------- Co-authored-by: David Hadas <david.hadas@gmail.com>
knative-extensions · Nov 24, 2023 · 1abd82a · 1abd82a
1 parent 4bd6283
commit 1abd82a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"time"
 
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	"go.uber.org/zap"
@@ -79,8 +80,10 @@ func (a *gitHubAdapter) Start(ctx context.Context) error {
 	done := make(chan bool, 1)
 
 	server := &http.Server{
-		Addr:    ":" + a.port,
-		Handler: a.newRouter(),
+		ReadTimeout:       10 * time.Second,
+		ReadHeaderTimeout: 2 * time.Second,
+		Addr:              ":" + a.port,
+		Handler:           a.newRouter(),
 	}
 
 	go common.GracefulShutdown(server, a.logger, ctx.Done(), done)

diff --git a/pkg/mtadapter/adapter.go b/pkg/mtadapter/adapter.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"time"
 
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	"go.uber.org/zap"
@@ -87,8 +88,10 @@ func NewAdapter(ctx context.Context, processed adapter.EnvConfigAccessor, ceClie
 func (a *gitHubAdapter) Start(ctx context.Context) error {
 	// Start our multi-tenant server receiving GitHub events
 	server := &http.Server{
-		Addr:    fmt.Sprintf(":%d", a.port),
-		Handler: a.router,
+		ReadTimeout:       10 * time.Second,
+		ReadHeaderTimeout: 2 * time.Second,
+		Addr:              fmt.Sprintf(":%d", a.port),
+		Handler:           a.router,
 	}
 
 	done := make(chan bool, 1)