Fix segmentation violation on connection failed (#7593)

This commit is contained in:
Nicolas Filotto 2020-05-28 20:05:57 +02:00 committed by GitHub
parent d7bb4a931b
commit 430854f6de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 8 deletions

View File

@ -271,14 +271,6 @@ func (h *HTTPResponse) httpGather(u string) (map[string]interface{}, map[string]
resp, err := h.client.Do(request) resp, err := h.client.Do(request)
response_time := time.Since(start).Seconds() response_time := time.Since(start).Seconds()
// Add the response headers
for headerName, tag := range h.HTTPHeaderTags {
headerValues, foundHeader := resp.Header[headerName]
if foundHeader && len(headerValues) > 0 {
tags[tag] = headerValues[0]
}
}
// If an error in returned, it means we are dealing with a network error, as // If an error in returned, it means we are dealing with a network error, as
// HTTP error codes do not generate errors in the net/http library // HTTP error codes do not generate errors in the net/http library
if err != nil { if err != nil {
@ -306,6 +298,14 @@ func (h *HTTPResponse) httpGather(u string) (map[string]interface{}, map[string]
// required by the net/http library // required by the net/http library
defer resp.Body.Close() defer resp.Body.Close()
// Add the response headers
for headerName, tag := range h.HTTPHeaderTags {
headerValues, foundHeader := resp.Header[headerName]
if foundHeader && len(headerValues) > 0 {
tags[tag] = headerValues[0]
}
}
// Set log the HTTP response code // Set log the HTTP response code
tags["status_code"] = strconv.Itoa(resp.StatusCode) tags["status_code"] = strconv.Itoa(resp.StatusCode)
fields["http_response_code"] = resp.StatusCode fields["http_response_code"] = resp.StatusCode

View File

@ -287,6 +287,33 @@ func TestHTTPHeaderTags(t *testing.T) {
"result": "success", "result": "success",
} }
checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil) checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
// Connection failed
h = &HTTPResponse{
Log: testutil.Logger{},
Address: "https:/nonexistent.nonexistent", // Any non-routable IP works here
Body: "",
Method: "GET",
ResponseTimeout: internal.Duration{Duration: time.Second * 5},
HTTPHeaderTags: map[string]string{"Server": "my_server", "Content-Type": "content_type"},
FollowRedirects: false,
}
acc = testutil.Accumulator{}
err = h.Gather(&acc)
require.NoError(t, err)
expectedFields = map[string]interface{}{
"result_type": "connection_failed",
"result_code": 3,
}
expectedTags = map[string]interface{}{
"server": nil,
"method": "GET",
"result": "connection_failed",
}
absentFields = []string{"http_response_code", "response_time", "content_length", "response_string_match"}
checkOutput(t, &acc, expectedFields, expectedTags, absentFields, nil)
} }
func findInterface() (net.Interface, error) { func findInterface() (net.Interface, error) {