Consistent RequestId on proxied request from API Gateway to Lambda

[pnmcosta]

Hi,

I'm relatively new to rolling my own stack to AWS using CDK (I'm using the Typescript flavour), having worked with other clouds previously.

I'm not sure if this is the correct medium to ask these question, so please advice if there's another place for better reach?

As per the title my stack is an API Gateway proxying webhook requests to a Lambda function, I already have the stack defined and implemented and can synth, deploy and destroy without an issue.

However, I have noticed log entries on CloudWatch that my handler emits a requestId that does not match the lambda's

I'm assuming the one in yellow is the actual Lambda's requestId and the one my code emits is the Api Gateway's that is included in the request's body.

I would prefer to use the Lambda's requestId instead, so that I can actually consistently observe reports about these (time/billing, etc).

My CDK stack integration with the lambda and API looks like this:

    const lambdaIntegration = new apigateway.LambdaIntegration(webhookLambda);
    const resource = props?.api.root.addResource(`webhook`);
    resource.addMethod('POST', lambdaIntegration);

And my Lamba's GO code like this:

func (app *app) Handle(request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
	requestId := request.RequestContext.RequestID
	(.... trimmed)
}

I have used Amazon Q to ask this question but neither of the examples have worked, seems to me that requestTemplates only apply if the gateway is not actually proxying?

Any advice?

Thank you