@@ -14,6 +14,7 @@ import (
1414 "github.com/aws/aws-sdk-go-v2/service/lambda"
1515 "github.com/aws/smithy-go"
1616 "github.com/caddyserver/caddy/v2"
17+ "github.com/google/uuid"
1718 "go.uber.org/zap"
1819 "go.uber.org/zap/zaptest/observer"
1920)
@@ -228,6 +229,58 @@ func TestServeHTTPReturnsApplicationResponse(t *testing.T) {
228229 }
229230}
230231
232+ func TestServeHTTPGeneratesRequestIDWhenAbsent (t * testing.T ) {
233+ fake := & fakeLambdaInvoker {output : & lambda.InvokeOutput {Payload : []byte (`{"statusCode":200,"body":"ok"}` )}}
234+ m := & Lambda {FunctionName : "test-function" , EventFormat : eventFormatAPIGatewayV2 , Timeout : caddy .Duration (time .Second ), log : zap .NewNop (), svc : fake }
235+ w := httptest .NewRecorder ()
236+
237+ if err := m .ServeHTTP (w , httptest .NewRequest (http .MethodGet , "/" , nil ), nil ); err != nil {
238+ t .Fatalf ("ServeHTTP() error = %v" , err )
239+ }
240+
241+ var event APIGatewayV2Request
242+ if err := json .Unmarshal (fake .input .Payload , & event ); err != nil {
243+ t .Fatalf ("decode request payload: %v" , err )
244+ }
245+ requestID := event .RequestContext .RequestID
246+ if requestID == "" {
247+ t .Fatal ("request ID is empty, want generated ID" )
248+ }
249+ if _ , err := uuid .Parse (requestID ); err != nil {
250+ t .Fatalf ("request ID %q is not a UUID: %v" , requestID , err )
251+ }
252+ if got := w .Header ().Get ("X-Request-ID" ); got != requestID {
253+ t .Errorf ("X-Request-ID response header = %q, want %q" , got , requestID )
254+ }
255+ }
256+
257+ func TestServeHTTPPreservesExistingRequestID (t * testing.T ) {
258+ core , logs := observer .New (zap .DebugLevel )
259+ fake := & fakeLambdaInvoker {output : & lambda.InvokeOutput {Payload : []byte (`{"statusCode":200,"body":"ok"}` )}}
260+ m := & Lambda {FunctionName : "test-function" , EventFormat : eventFormatAPIGatewayV2 , Timeout : caddy .Duration (time .Second ), log : zap .New (core ), svc : fake }
261+ w := httptest .NewRecorder ()
262+ r := httptest .NewRequest (http .MethodGet , "/" , nil )
263+ r .Header .Set ("X-Request-ID" , "existing-id" )
264+
265+ if err := m .ServeHTTP (w , r , nil ); err != nil {
266+ t .Fatalf ("ServeHTTP() error = %v" , err )
267+ }
268+
269+ var event APIGatewayV2Request
270+ if err := json .Unmarshal (fake .input .Payload , & event ); err != nil {
271+ t .Fatalf ("decode request payload: %v" , err )
272+ }
273+ if got := event .RequestContext .RequestID ; got != "existing-id" {
274+ t .Errorf ("request ID = %q, want %q" , got , "existing-id" )
275+ }
276+ if got := w .Header ().Get ("X-Request-ID" ); got != "existing-id" {
277+ t .Errorf ("X-Request-ID response header = %q, want %q" , got , "existing-id" )
278+ }
279+ if got := logs .All ()[0 ].ContextMap ()["request_id" ]; got != "existing-id" {
280+ t .Errorf ("logged request_id = %#v, want existing-id" , got )
281+ }
282+ }
283+
231284func TestServeHTTPLimitsLoggedRequestID (t * testing.T ) {
232285 core , logs := observer .New (zap .DebugLevel )
233286 fake := & fakeLambdaInvoker {output : & lambda.InvokeOutput {Payload : []byte (`{"type":"HTTPJSON-REP","meta":{"status":200},"body":"ok"}` )}}
0 commit comments