Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions apm-lambda-extension/extension/http_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,54 @@ func Test_handleIntakeV2EventsNoQueryParam(t *testing.T) {
<-dataChannel
assert.Equal(t, 202, resp.StatusCode)
}

func Test_handleIntakeV2EventsQueryParamEmptyData(t *testing.T) {
body := []byte(``)

AgentDoneSignal = make(chan struct{})

// Create apm server and handler
apmServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
}))
defer apmServer.Close()

// Create extension config and start the server
dataChannel := make(chan AgentData, 100)
config := extensionConfig{
apmServerUrl: apmServer.URL,
dataReceiverServerPort: ":1234",
dataReceiverTimeoutSeconds: 15,
}

StartHttpServer(dataChannel, &config)
defer agentDataServer.Close()

hosts, _ := net.LookupHost("localhost")
url := "http://" + hosts[0] + ":1234/intake/v2/events?flushed=true"

// Create a request to send to the extension
req, err := http.NewRequest("POST", url, bytes.NewReader(body))
if err != nil {
t.Logf("Could not create request")
}

// Send the request to the extension
client := &http.Client{}
go func() {
_, err := client.Do(req)
if err != nil {
t.Logf("Error fetching %s, [%v]", agentDataServer.Addr, err)
t.Fail()
}
}()

timer := time.NewTimer(1 * time.Second)
defer timer.Stop()

select {
case <-AgentDoneSignal:
case <-timer.C:
t.Log("Timed out waiting for server to send FuncDone signal")
t.Fail()
}
}
12 changes: 7 additions & 5 deletions apm-lambda-extension/extension/route_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ func handleIntakeV2Events(agentDataChan chan AgentData) func(w http.ResponseWrit
return
}

agentData := AgentData{
Data: rawBytes,
ContentEncoding: r.Header.Get("Content-Encoding"),
if len(rawBytes) > 0 {
agentData := AgentData{
Data: rawBytes,
ContentEncoding: r.Header.Get("Content-Encoding"),
}
log.Println("Adding agent data to buffer to be sent to apm server")
agentDataChan <- agentData
}
log.Println("Adding agent data to buffer to be sent to apm server")
agentDataChan <- agentData

if len(r.URL.Query()["flushed"]) > 0 && r.URL.Query()["flushed"][0] == "true" {
AgentDoneSignal <- struct{}{}
Expand Down