kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_prometheus.c: Set Content-Type header on /metrics response.

Browse Source 
This should resolve the Prometheus error:

> Error scraping target: non-compliant scrape target
  sending blank Content-Type and no
  fallback_scrape_protocol specified for target.

Resolves: #1075
(cherry picked from commit fa286641fb)
This commit is contained in:
Sean Bright
2025-01-21 18:37:54 -05:00
committed by Asterisk Development Team
parent ae766ffdc1
commit d05f174bc5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_prometheus.c
View File

@@ -603,6 +603,7 @@ static int http_callback(struct ast_tcptls_session_instance *ser,
{ {
RAII_VAR(struct module_config *, mod_cfg, ao2_global_obj_ref(global_config), ao2_cleanup); RAII_VAR(struct module_config *, mod_cfg, ao2_global_obj_ref(global_config), ao2_cleanup);
struct ast_str *response = NULL; struct ast_str *response = NULL;
struct ast_str *content_type_header = NULL;
struct timeval start; struct timeval start;
struct timeval end; struct timeval end;
@@ -635,10 +636,13 @@ static int http_callback(struct ast_tcptls_session_instance *ser,
} }
response = ast_str_create(512); response = ast_str_create(512);
if (!response) { content_type_header = ast_str_create(32);
if (!response || !content_type_header) {
goto err500; goto err500;
} }
ast_str_set(&content_type_header, 0, "Content-Type: text/plain\r\n");
start = ast_tvnow(); start = ast_tvnow();
ast_mutex_lock(&scrape_lock); ast_mutex_lock(&scrape_lock);
@@ -659,7 +663,7 @@ static int http_callback(struct ast_tcptls_session_instance *ser,
} }
ast_mutex_unlock(&scrape_lock); ast_mutex_unlock(&scrape_lock);
ast_http_send(ser, method, 200, "OK", NULL, response, 0, 0); ast_http_send(ser, method, 200, "OK", content_type_header, response, 0, 0);
return 0; return 0;
@@ -678,14 +682,17 @@ err401:
ast_http_send(ser, method, 401, "Unauthorized", auth_challenge_headers, NULL, 0, 1); ast_http_send(ser, method, 401, "Unauthorized", auth_challenge_headers, NULL, 0, 1);
} }
ast_free(response); ast_free(response);
ast_free(content_type_header);
return 0; return 0;
err503: err503:
ast_http_send(ser, method, 503, "Service Unavailable", NULL, NULL, 0, 1); ast_http_send(ser, method, 503, "Service Unavailable", NULL, NULL, 0, 1);
ast_free(response); ast_free(response);
ast_free(content_type_header);
return 0; return 0;
err500: err500:
ast_http_send(ser, method, 500, "Server Error", NULL, NULL, 0, 1); ast_http_send(ser, method, 500, "Server Error", NULL, NULL, 0, 1);
ast_free(response); ast_free(response);
ast_free(content_type_header);
return 0; return 0;
} }