daroche/nginx-otel-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not require otel_exporter directive.

Browse source
This commit is contained in:
Dmitry Plotnikov 2023-04-18 22:49:13 +00:00 • committed by dplotnikov-f5
parent 387d391823
commit 470e4a2906
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/http_module.cpp
View file

@ -552,7 +552,8 @@ ngx_int_t initWorkerProcess(ngx_cycle_t* cycle)
auto mcf = (MainConf*)ngx_http_cycle_get_module_main_conf( auto mcf = (MainConf*)ngx_http_cycle_get_module_main_conf(
cycle, gHttpModule); cycle, gHttpModule);
if (mcf == NULL) { // no 'http' or 'otel_exporter' blocks
if (mcf == NULL || mcf->endpoint.len == 0) {
return NGX_OK; return NGX_OK;
} }
@ -688,11 +689,6 @@ char* initMainConf(ngx_conf_t* cf, void* conf)
{ {
auto mcf = (MainConf*)conf; auto mcf = (MainConf*)conf;
if (mcf->endpoint.len == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"otel_exporter\" block is missing");
return (char*)NGX_CONF_ERROR;
}
ngx_conf_init_msec_value(mcf->interval, 5000); ngx_conf_init_msec_value(mcf->interval, 5000);
ngx_conf_init_size_value(mcf->batchSize, 512); ngx_conf_init_size_value(mcf->batchSize, 512);
@ -837,6 +833,14 @@ char* mergeLocationConf(ngx_conf_t* cf, void* parent, void* child)
conf->spanAttrs = prev->spanAttrs; conf->spanAttrs = prev->spanAttrs;
} }
auto mcf = (MainConf*)ngx_http_conf_get_module_main_conf(cf, gHttpModule);
if (mcf->endpoint.len == 0 && conf->trace) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"otel_exporter\" block is missing");
return (char*)NGX_CONF_ERROR;
}
return NGX_CONF_OK; return NGX_CONF_OK;
} }