Merge branch 'dev'

Author: TheTeaCat

firetail/record.go

@@ -19,8 +19,9 @@ func (r *Record) Marshal() ([]byte, error) {
 
 // Record represents a record that will be generated by a lambda function and passed to the extension via the Lambda logs API
 type Record struct {
-	Event    json.RawMessage `json:"event"`
-	Response RecordResponse  `json:"response"`
+	Event         json.RawMessage `json:"event"`
+	Response      RecordResponse  `json:"response"`
+	ExecutionTime float64         `json:"execution_time"`
 }
 
 // RecordResponse represents the response contained within a Firetail log Record
@@ -46,6 +47,9 @@ func (r *Record) getLogEntryRequest() (*LogEntryRequest, error) {
 			URI:          "https://" + apiGatewayV1Request.RequestContext.DomainName + apiGatewayV1Request.RequestContext.Path,
 			Resource:     apiGatewayV1Request.Resource,
 		}
+		if logEntryRequest.Headers == nil {
+			logEntryRequest.Headers = map[string][]string{}
+		}
 		for header, value := range apiGatewayV1Request.Headers {
 			_, hasValues := logEntryRequest.Headers[header]
 			if hasValues {

firetail/send_records_to_saas.go

@@ -28,7 +28,7 @@ func SendRecordsToSaaS(records []Record, apiUrl, apiKey string) (int, error) {
 
 		logEntryBytes, err := json.Marshal(LogEntry{
 			DateCreated:   time.Now().UnixMilli(),
-			ExecutionTime: 0,
+			ExecutionTime: record.ExecutionTime,
 			Request:       *logEntryRequest,
 			Response: LogEntryResponse{
 				Body:       record.Response.Body,

main.go

@@ -139,6 +139,7 @@ func main() {
 	for {
 		select {
 		case <-ctx.Done():
+			debugLog("Context cancelled, exiting...")
 			return
 		default:
 			debugLog("Waiting for event...")
@@ -148,9 +149,9 @@ func main() {
 				return
 			}
 
-			switch res.EventType {
-			case extension.Shutdown:
-				// Exit if we receive a SHUTDOWN event
+			// Exit if we receive a SHUTDOWN event
+			if res.EventType == extension.Shutdown {
+				debugLog("Received extension shutdown event, exiting...")
 				logsApiAgent.Shutdown()
 				close(logQueue)
 				return