Merge pull request #16 from FireTail-io/tidy-debug-logs

Tidy debug logs

Author: TheTeaCat

await_shutdown.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"firetail-lambda-extension/extensionsapi"
-	"log"
 
 	"github.com/pkg/errors"
 )
@@ -14,10 +13,8 @@ func awaitShutdown(extensionClient *extensionsapi.Client, ctx context.Context) (
 	for {
 		select {
 		case <-ctx.Done():
-			log.Printf(", returning...")
 			return "context cancelled", nil
 		default:
-			log.Printf("Waiting for event...")
 			res, err := extensionClient.NextEvent(ctx) // This is a blocking call
 			if err != nil {
 				return "", errors.WithMessage(err, "failed to get next event")

extensionsapi/register.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 )
 
@@ -63,6 +62,5 @@ func (e *Client) Register(ctx context.Context, extensionName string) (*RegisterR
 		return nil, err
 	}
 	e.ExtensionID = httpRes.Header.Get(extensionIdentiferHeader)
-	log.Println("Extension id:", e.ExtensionID)
 	return &res, nil
 }

firetail/record_test.go

@@ -2,7 +2,6 @@ package firetail
 
 import (
 	"encoding/json"
-	"log"
 	"strings"
 	"testing"
 
@@ -124,8 +123,6 @@ func TestEncodeAndDecodeRecord(t *testing.T) {
 	remarshalledRecordBytes, err := unmarshalledRecord.Marshal()
 	require.Nil(t, err)
 	assert.Equal(t, testRecordBytes, remarshalledRecordBytes)
-
-	log.Println(string(remarshalledRecordBytes))
 }
 
 func TestGetLogEntryRequestAPIGatewayProxyRequest(t *testing.T) {
@@ -162,8 +159,6 @@ func TestGetLogEntryRequestAPIGatewayProxyRequestWithNoRequestHeaders(t *testing
 	// tagged as omitempty. 🥲
 	apiGatewayProxyRequestBytes := []byte(`{"resource":"/hi","path":"/hi","httpMethod":"GET","queryStringParameters":null,"multiValueQueryStringParameters":null,"pathParameters":null,"stageVariables":null,"requestContext":{"accountId":"453671210445","resourceId":"GET /hi","stage":"$default","domainName":"5iagptskg6.execute-api.eu-west-2.amazonaws.com","domainPrefix":"5iagptskg6","requestId":"bvmgijZArPEEJ0w=","extendedRequestId":"bvmgijZArPEEJ0w=","protocol":"HTTP/1.1","identity":{"cognitoIdentityPoolId":"","accountId":"","cognitoIdentityId":"","caller":"","apiKey":"","apiKeyId":"","accessKey":"","sourceIp":"37.228.214.117","cognitoAuthenticationType":"","cognitoAuthenticationProvider":"","userArn":"","userAgent":"PostmanRuntime/7.28.4","user":""},"resourcePath":"/hi","path":"/hi","authorizer":null,"httpMethod":"GET","requestTime":"17/Nov/2022:11:41:55 +0000","requestTimeEpoch":1668685315222,"apiId":"5iagptskg6"},"body":""}`)
 
-	log.Print(string(apiGatewayProxyRequestBytes))
-
 	testRecord := Record{
 		Event: json.RawMessage(apiGatewayProxyRequestBytes),
 		Response: RecordResponse{

firetail/send_records_to_saas.go

@@ -64,7 +64,7 @@ func SendRecordsToSaaS(records []Record, apiUrl, apiKey string) (int, error) {
 	// TODO: investigate above.
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return 0, multierror.Append(errs, fmt.Errorf("Failed to make log request, err: %s", err.Error()))
+		return marshalledRecords, multierror.Append(errs, fmt.Errorf("Failed to make log request, err: %s", err.Error()))
 	}
 
 	var res map[string]interface{}
@@ -73,7 +73,7 @@ func SendRecordsToSaaS(records []Record, apiUrl, apiKey string) (int, error) {
 		return marshalledRecords, multierror.Append(errs, fmt.Errorf("Failed to decode logs API response: %s", err.Error()))
 	}
 	if res["message"] != "success" {
-		return marshalledRecords, multierror.Append(errs, fmt.Errorf("Got err response from firetail api: %v, req body:\n'%s'\n", res, string(reqBytes)))
+		return marshalledRecords, multierror.Append(errs, fmt.Errorf("Got err response from firetail api: %v", res))
 	}
 
 	return marshalledRecords, errs

firetail/send_records_to_saas_test.go

@@ -93,7 +93,7 @@ func TestSendRecordToUnavailableSaas(t *testing.T) {
 	testRecord := getValidRecord(t)
 
 	recordsSent, err := SendRecordsToSaaS([]Record{testRecord}, testServer.URL, "")
-	assert.Equal(t, 0, recordsSent)
+	assert.Equal(t, 1, recordsSent)
 	require.NotNil(t, err)
 	assert.Contains(t, err.Error(), "connect: connection refused")
 	assert.Contains(t, err.Error(), "Failed to make log request, err: Post")

logsapi/client_test.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"firetail-lambda-extension/firetail"
 	"fmt"
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -43,7 +42,6 @@ func TestNewClient(t *testing.T) {
 	shutdownWaitgroup.Add(1)
 	defer shutdownWaitgroup.Wait()
 	go func() {
-		log.Println("Listening and serving...")
 		err := client.ListenAndServe()
 		assert.Equal(t, "http: Server closed", err.Error())
 		shutdownWaitgroup.Done()
@@ -64,7 +62,6 @@ func TestNewClient(t *testing.T) {
 
 	// Test the logs API client gave a 200 response
 	result := recorder.Result()
-	log.Println(result)
 	assert.Equal(t, 200, result.StatusCode)
 
 	// Wait until the batch callback has received at least 1 batch

logsapi/logs_api_handler.go

@@ -3,7 +3,6 @@ package logsapi
 import (
 	"encoding/json"
 	"io/ioutil"
-	"log"
 	"net/http"
 
 	"github.com/pkg/errors"
@@ -27,7 +26,6 @@ func (c *Client) logsApiHandler(w http.ResponseWriter, r *http.Request) {
 	if errs != nil {
 		c.errCallback(errs)
 	}
-	log.Printf("Received %d firetail records from Lambda Logs API", len(newFiretailRecords))
 
 	for _, firetailRecord := range newFiretailRecords {
 		c.recordsChannel <- firetailRecord

logsapi/options.go

@@ -87,7 +87,6 @@ func (o *Options) setDefaults() {
 			recordsSent, err := firetail.SendRecordsToSaaS(batch, o.firetailApiUrl, o.firetailApiToken)
 			if err != nil {
 				err = errors.WithMessage(err, fmt.Sprintf("Err sending %d record(s) to Firetail SaaS", recordsSent))
-				log.Println(err.Error())
 				return err
 			}
 			log.Printf("Successfully sent %d record(s) sent to Firetail.", recordsSent)

logsapi/record_receiver.go

@@ -26,6 +26,7 @@ func (c *Client) recordReceiver() {
 		// Give the batch to the batch callback. If it errs, we continue
 		err := c.batchCallback(recordsBatch)
 		if err != nil {
+			c.errCallback(err)
 			continue
 		}
 

logsapi/record_receiver_test.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"firetail-lambda-extension/firetail"
 	"fmt"
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"strconv"
@@ -50,7 +49,6 @@ func TestRecordReceiverBatchCallbackFail(t *testing.T) {
 	shutdownWaitgroup.Add(1)
 	defer shutdownWaitgroup.Wait()
 	go func() {
-		log.Println("Listening and serving...")
 		err := client.ListenAndServe()
 		assert.Equal(t, "http: Server closed", err.Error())
 		shutdownWaitgroup.Done()
@@ -71,7 +69,6 @@ func TestRecordReceiverBatchCallbackFail(t *testing.T) {
 
 	// Test the logs API client gave a 200 response
 	result := recorder.Result()
-	log.Println(result)
 	assert.Equal(t, 200, result.StatusCode)
 
 	// Wait until the batch callback has received at least 1 batch
@@ -125,7 +122,6 @@ func TestRecordReceiverMaxBatchSize(t *testing.T) {
 	shutdownWaitgroup.Add(1)
 	defer shutdownWaitgroup.Wait()
 	go func() {
-		log.Println("Listening and serving...")
 		err := client.ListenAndServe()
 		assert.Equal(t, "http: Server closed", err.Error())
 		shutdownWaitgroup.Done()