Merge pull request #24 from FireTail-io/fire-747/lenient-payload-parsing

Fire 747/lenient payload parsing

Author: rileyfiretail

logsapi/extract_firetail_records.go

@@ -51,11 +51,16 @@ func extractFiretailRecords(requestBody []byte) ([]firetail.Record, error) {
 func decodeFiretailRecord(record string) (*firetail.Record, error) {
 	recordParts := strings.Split(record, ":")
 
-	if len(recordParts) != 3 {
+	if len(recordParts) < 3 {
 		return nil, fmt.Errorf("record had %d parts when split by ':'", len(recordParts))
 	}
 
-	if recordParts[0] != "firetail" {
+	// If there's more than 3 parts, we take the last three; we're assuming the last part of the log is the payload we want.
+	if len(recordParts) > 3 {
+		recordParts = recordParts[len(recordParts)-3:]
+	}
+
+	if !strings.HasSuffix(recordParts[0], "firetail") {
 		return nil, fmt.Errorf("record did not have firetail prefix")
 	}
 

logsapi/extract_firetail_records_test.go

@@ -40,7 +40,7 @@ func TestDecodeFiretailRecordWithMissingPart(t *testing.T) {
 	assert.Equal(t, "record had 2 parts when split by ':'", err.Error())
 }
 
-func TestDecodeFiretailRecordWithExtraPart(t *testing.T) {
+func TestDecodeFiretailRecordWithExtraPartSuffixed(t *testing.T) {
 	testRecord := firetail.Record{
 		Response: firetail.RecordResponse{
 			StatusCode: 200,
@@ -56,7 +56,25 @@ func TestDecodeFiretailRecordWithExtraPart(t *testing.T) {
 	assert.Nil(t, decodedRecord)
 	require.NotNil(t, err)
 
-	assert.Equal(t, "record had 4 parts when split by ':'", err.Error())
+	assert.Equal(t, "record did not have firetail prefix", err.Error())
+}
+
+func TestDecodeFiretailRecordWithExtraPartPrefixed(t *testing.T) {
+	testRecord := firetail.Record{
+		Response: firetail.RecordResponse{
+			StatusCode: 200,
+			Body:       "Test Body",
+		},
+	}
+	testPayloadBytes, err := json.Marshal(testRecord)
+	require.Nil(t, err)
+
+	encodedRecord := "extra:firetail:log-ext:" + base64.StdEncoding.EncodeToString(testPayloadBytes) + ""
+
+	decodedRecord, err := decodeFiretailRecord(encodedRecord)
+	require.Nil(t, err)
+
+	assert.Equal(t, testRecord.Response, *&decodedRecord.Response)
 }
 
 func TestDecodeFiretailRecordWithInvalidPrefix(t *testing.T) {
@@ -78,6 +96,24 @@ func TestDecodeFiretailRecordWithInvalidPrefix(t *testing.T) {
 	assert.Equal(t, "record did not have firetail prefix", err.Error())
 }
 
+func TestDecodeFiretailRecordWithTimestampPrefix(t *testing.T) {
+	testRecord := firetail.Record{
+		Response: firetail.RecordResponse{
+			StatusCode: 200,
+			Body:       "Test Body",
+		},
+	}
+	testPayloadBytes, err := json.Marshal(testRecord)
+	require.Nil(t, err)
+
+	encodedRecord := "2023-02-09T14:12:59.574Z    7b9025e7-228f-4f39-ab16-1cadba2bb3f6    INFO    firetail:log-ext:" + base64.StdEncoding.EncodeToString(testPayloadBytes)
+
+	decodedRecord, err := decodeFiretailRecord(encodedRecord)
+	require.Nil(t, err)
+
+	assert.Equal(t, testRecord.Response, *&decodedRecord.Response)
+}
+
 func TestDecodeFiretailRecordWithInvalidToken(t *testing.T) {
 	testRecord := firetail.Record{
 		Response: firetail.RecordResponse{