Skip to content

http_server: api: v1: traces: fix finding inputs by alias. #8886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edsiper merged 1 commit into from
Jun 6, 2024
Merged

http_server: api: v1: traces: fix finding inputs by alias. #8886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions src/http_server/api/v1/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,11 @@ static struct flb_input_instance *find_input(struct flb_hs *hs, const char *name

mk_list_foreach(head, &hs->config->inputs) {
in = mk_list_entry(head, struct flb_input_instance, _head);
if (strlen(in->name) != nlen) {
continue;
}
if (strncmp(name, in->name, nlen) == 0) {
if ((strlen(in->name) == nlen) && (strncmp(name, in->name, nlen) == 0)) {
return in;
}
if (in->alias) {
if (strcmp(name, in->alias) == 0) {
if ((strlen(in->alias) == nlen) && (strncmp(name, in->alias, nlen) == 0)) {
return in;
}
}
Expand Down Expand Up @@ -113,7 +110,7 @@ static int disable_trace_input(struct flb_hs *hs, const char *name, size_t nlen)

static flb_sds_t get_input_name(mk_request_t *request)
{
const char *base = "/api/v1/trace/";
const char base[] = "/api/v1/trace/";


if (request->real_path.data == NULL) {
Expand All @@ -124,7 +121,7 @@ static flb_sds_t get_input_name(mk_request_t *request)
}

return flb_sds_create_len(&request->real_path.data[sizeof(base)-1],
request->real_path.len - sizeof(base)-1);
request->real_path.len - (sizeof(base)-1));
}

static int http_disable_trace(mk_request_t *request, void *data,
Expand Down