Skip to content
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.

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

HPCC-33295 SOAP request count metric name has illegal name #19461

Open
wants to merge 1 commit into
base: candidate-9.10.x
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions esp/bindings/SOAP/Platform/soapbind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
#include "SOAP/xpp/xjx/xjxpp.hpp"
#include "jmetrics.hpp"

static std::once_flag metricsInitialized;
#ifdef _SOLVED_DYNAMIC_METRIC_PROBLEM
static auto pSoapRequestCount = hpccMetrics::registerCounterMetric("esp.soap_requests.received", "Number of JSON and SOAP POST requests received", SMeasureCount);
static std::shared_ptr<hpccMetrics::CounterMetric> pSoapRequestCount;
#endif


Expand Down Expand Up @@ -68,15 +69,20 @@ int CSoapBinding::processRequest(IRpcMessage* rpc_call, IRpcMessage* rpc_respons
return 0;
}

CHttpSoapBinding::CHttpSoapBinding():EspHttpBinding(NULL, NULL, NULL)
CHttpSoapBinding::CHttpSoapBinding()
: CHttpSoapBinding(NULL, NULL, NULL)
{
log_level_=hsl_none;
}

CHttpSoapBinding::CHttpSoapBinding(IPropertyTree* cfg, const char *bindname, const char *procname, http_soap_log_level level)
: EspHttpBinding(cfg, bindname, procname)
{
log_level_=level;
#ifdef _SOLVED_DYNAMIC_METRIC_PROBLEM
std::call_once(metricsInitialized, [](){
pSoapRequestCount = hpccMetrics::registerCounterMetric("esp.soap.requests.received", "Number of JSON and SOAP POST requests received", SMeasureCount);
});
#endif
}

CHttpSoapBinding::~CHttpSoapBinding()
Expand Down
Loading