Skip to content

Commit

Permalink
Merge pull request #416 from bazsi/http-response-for-non-200-responses
Browse files Browse the repository at this point in the history 
http: add HTTP response text to the diagnostic messages
  • Loading branch information
@bazsi
bazsi authored Dec 16, 2024
2 parents 251cf98 + a4715c8 commit 29807af
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 6 deletions.
32 changes: 26 additions & 6 deletions modules/http/http-worker.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,21 @@ _curl_debug_function(CURL *handle, curl_infotype type,
return 0;
}

#define HTTP_RESPONSE_MAX_LENGTH 1024

static size_t
_curl_write_function(char *ptr, size_t size, size_t nmemb, void *userdata)
{
// Discard response content
return nmemb * size;
HTTPDestinationWorker *self = (HTTPDestinationWorker *) userdata;
gsize count = nmemb * size;

if (self->response_buffer->len >= HTTP_RESPONSE_MAX_LENGTH)
return count;

gsize remaining = HTTP_RESPONSE_MAX_LENGTH - self->response_buffer->len;
g_string_append_len(self->response_buffer, (gchar *) ptr, MIN(remaining, count));

return count;
}

/* Set up options that are static over the course of a single configuration,
Expand All @@ -110,6 +119,7 @@ _setup_static_options_in_curl(HTTPDestinationWorker *self)
curl_easy_reset(self->curl);

curl_easy_setopt(self->curl, CURLOPT_WRITEFUNCTION, _curl_write_function);
curl_easy_setopt(self->curl, CURLOPT_WRITEDATA, self);

curl_easy_setopt(self->curl, CURLOPT_URL, owner->url);

Expand Down Expand Up @@ -315,7 +325,7 @@ static LogThreadedResult
_default_1XX(HTTPDestinationWorker *self, const gchar *url, glong http_code)
{
HTTPDestinationDriver *owner = (HTTPDestinationDriver *) self->super.owner;
msg_error("http: Server returned with a 1XX (continuation) status code, which was not handled by curl. ",
msg_error("http: Server returned with a 1XX (continuation) status code, which was not handled by curl",
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_str("driver", owner->super.super.super.id),
Expand All @@ -333,7 +343,7 @@ _default_3XX(HTTPDestinationWorker *self, const gchar *url, glong http_code)
{
HTTPDestinationDriver *owner = (HTTPDestinationDriver *) self->super.owner;
msg_notice("http: Server returned with a 3XX (redirect) status code. "
"Either accept-redirect() is set to no, or this status code is unknown.",
"Either accept-redirect() is set to no, or this status code is unknown",
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_str("driver", owner->super.super.super.id),
Expand All @@ -349,9 +359,10 @@ _default_4XX(HTTPDestinationWorker *self, const gchar *url, glong http_code)
{
HTTPDestinationDriver *owner = (HTTPDestinationDriver *) self->super.owner;
msg_notice("http: Server returned with a 4XX (client errors) status code, which means we are not "
"authorized or the URL is not found.",
"authorized or the URL is not found",
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_str("driver", owner->super.super.super.id),
log_pipe_location_tag(&owner->super.super.super.super));

Expand All @@ -370,9 +381,10 @@ static LogThreadedResult
_default_5XX(HTTPDestinationWorker *self, const gchar *url, glong http_code)
{
HTTPDestinationDriver *owner = (HTTPDestinationDriver *) self->super.owner;
msg_notice("http: Server returned with a 5XX (server errors) status code, which indicates server failure.",
msg_notice("http: Server returned with a 5XX (server errors) status code, which indicates server failure",
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_str("driver", owner->super.super.super.id),
log_pipe_location_tag(&owner->super.super.super.super));
if (http_code == 508)
Expand Down Expand Up @@ -458,6 +470,7 @@ _debug_response_info(HTTPDestinationWorker *self, const gchar *url, glong http_c
msg_debug("http: HTTP response received",
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_int("body_size", self->request_body->len),
evt_tag_int("batch_size", self->super.batch_size),
evt_tag_int("redirected", redirect_count != 0),
Expand All @@ -482,6 +495,7 @@ _custom_map_http_result(HTTPDestinationWorker *self, const gchar *url, HttpRespo
evt_tag_str("action", "success"),
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_str("driver", owner->super.super.super.id),
log_pipe_location_tag(&owner->super.super.super.super));
return LTR_SUCCESS;
Expand All @@ -491,6 +505,7 @@ _custom_map_http_result(HTTPDestinationWorker *self, const gchar *url, HttpRespo
evt_tag_str("action", "retry"),
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_str("driver", owner->super.super.super.id),
log_pipe_location_tag(&owner->super.super.super.super));
return LTR_ERROR;
Expand All @@ -500,6 +515,7 @@ _custom_map_http_result(HTTPDestinationWorker *self, const gchar *url, HttpRespo
evt_tag_str("action", "drop"),
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_str("driver", owner->super.super.super.id),
log_pipe_location_tag(&owner->super.super.super.super));
return LTR_DROP;
Expand All @@ -509,6 +525,7 @@ _custom_map_http_result(HTTPDestinationWorker *self, const gchar *url, HttpRespo
evt_tag_str("action", "disconnect"),
evt_tag_str("url", url),
evt_tag_int("status_code", http_code),
evt_tag_mem("response", self->response_buffer->str, self->response_buffer->len),
evt_tag_str("driver", owner->super.super.super.id),
log_pipe_location_tag(&owner->super.super.super.super));
return LTR_NOT_CONNECTED;
Expand Down Expand Up @@ -548,6 +565,7 @@ _curl_perform_request(HTTPDestinationWorker *self, const gchar *url)
curl_easy_setopt(self->curl, CURLOPT_POSTFIELDS, self->request_body->str);
curl_easy_setopt(self->curl, CURLOPT_HTTPHEADER, http_curl_header_list_as_slist(self->request_headers));

g_string_truncate(self->response_buffer, 0);
CURLcode ret = curl_easy_perform(self->curl);
if (ret != CURLE_OK)
{
Expand Down Expand Up @@ -904,6 +922,7 @@ http_dw_free(LogThreadedDestWorker *s)

dyn_metrics_store_free(self->metrics.cache);
http_lb_client_deinit(&self->lbc);
g_string_free(self->response_buffer, TRUE);
log_threaded_dest_worker_free_method(s);
}

Expand All @@ -925,6 +944,7 @@ http_dw_new(LogThreadedDestDriver *o, gint worker_index)
self->super.insert = _insert_single;

self->metrics.cache = dyn_metrics_store_new();
self->response_buffer = g_string_sized_new(1024);

http_lb_client_init(&self->lbc, owner->load_balancer);
return &self->super;
Expand Down
1 change: 1 addition & 0 deletions modules/http/http-worker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ typedef struct _HTTPDestinationWorker
Compressor *compressor;
List *request_headers;
GString *url_buffer;
GString *response_buffer;
LogMessage *msg_for_templated_url;

struct
Expand Down

0 comments on commit 29807af

Please sign in to comment.