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

Move gRPC/Protobuf logs handling to a dedicated file.

Browse source
This commit is contained in:
Dmitry Plotnikov 2024-02-29 10:06:37 -08:00 • committed by dplotnikov-f5
parent aac5678def
commit b54c65005a
5 changed files with 66 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/http_module.cpp
View file

@ -1,11 +1,6 @@
extern "C" {
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>
}
#include "ngx.hpp"
#include <grpc/support/log.h>
#include <google/protobuf/stubs/logging.h>
#include "grpc_log.hpp"
#include "str_view.hpp"
#include "trace_context.hpp"
@ -504,28 +499,6 @@ ngx_int_t onRequestEnd(ngx_http_request_t* r)
return NGX_DECLINED;
}
void grpcLogHandler(gpr_log_func_args* args)
{
ngx_uint_t level = args->severity == GPR_LOG_SEVERITY_ERROR ? NGX_LOG_ERR :
args->severity == GPR_LOG_SEVERITY_INFO ? NGX_LOG_INFO :
/*GPR_LOG_SEVERITY_DEBUG*/ NGX_LOG_DEBUG;
ngx_log_error(level, ngx_cycle->log, 0, "OTel/grpc: %s", args->message);
}
void protobufLogHandler(google::protobuf::LogLevel logLevel,
const char* filename, int line, const std::string& msg)
{
using namespace google::protobuf;
ngx_uint_t level = logLevel == LOGLEVEL_FATAL ? NGX_LOG_EMERG :
logLevel == LOGLEVEL_ERROR ? NGX_LOG_ERR :
logLevel == LOGLEVEL_WARNING ? NGX_LOG_WARN :
/*LOGLEVEL_INFO*/ NGX_LOG_INFO;
ngx_log_error(level, ngx_cycle->log, 0, "OTel/protobuf: %s", msg.c_str());
}
ngx_int_t initModule(ngx_conf_t* cf)
{
auto cmcf = (ngx_http_core_main_conf_t*)ngx_http_conf_get_module_main_conf(
@ -547,8 +520,7 @@ ngx_int_t initModule(ngx_conf_t* cf)
*h = onRequestEnd;
gpr_set_log_function(grpcLogHandler);
google::protobuf::SetLogHandler(protobufLogHandler);
initGrpcLog();
return NGX_OK;
}