ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-03 00:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup updates after merge

Browse Source 
Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
This commit is contained in:
Pratik Mankawde
2026-05-29 16:38:41 +01:00
parent 8f9057729c
commit 8395e69e94
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/xrpld/app/main/GRPCServer.cpp
View File

@@ -192,7 +192,8 @@ GRPCServerImpl::CallData<Request, Response>::process(std::shared_ptr<JobQueue::C
span.setAttribute(
grpc_span::attr::grpcRole,
role == Role::ADMIN ? grpc_span::val::admin : grpc_span::val::user);
role == Role::ADMIN ? std::string_view{grpc_span::val::admin}
: std::string_view{grpc_span::val::user});
{
std::stringstream toLog;
@@ -230,7 +231,7 @@ GRPCServerImpl::CallData<Request, Response>::process(std::shared_ptr<JobQueue::C
{
RPC::ErrorInfo const errorInfo = RPC::getErrorInfo(conditionMetRes);
span.setAttribute(grpc_span::attr::grpcStatus, grpc_span::val::error);
span.setError(errorInfo.token.c_str());
span.setError(errorInfo.token.cStr());
grpc::Status const status{
grpc::StatusCode::FAILED_PRECONDITION, errorInfo.message.cStr()};
responder_.FinishWithError(status, this);

6
src/xrpld/rpc/detail/RPCHandler.cpp
View File

@@ -188,7 +188,9 @@ callMethod(JsonContext& context, Method method, std::string const& name, Object&
// Status::operator bool() returns true when there IS an error
// (code_ != OK), so the ternary correctly maps error->error, ok->success.
span.setAttribute(
rpc_span::attr::rpcStatus, ret ? rpc_span::val::error : rpc_span::val::success);
rpc_span::attr::rpcStatus,
ret ? std::string_view{rpc_span::val::error}
: std::string_view{rpc_span::val::success});
if (!ret)
span.setOk();
return ret;
@@ -235,7 +237,7 @@ doCommand(RPC::JsonContext& context, json::Value& result)
// "unknown" name only when the request truly omits both fields.
auto span = SpanGuard::span(TraceCategory::Rpc, rpc_span::prefix::command, cmdName);
span.setAttribute(rpc_span::attr::command, cmdName.c_str());
span.setError(getErrorInfo(error).token.c_str());
span.setError(getErrorInfo(error).token.cStr());
injectError(error, result);
return error;

2
src/xrpld/rpc/detail/RpcSpanNames.h
View File

@@ -154,6 +154,8 @@ using telemetry::attr_val::success;
inline constexpr auto admin = makeStr("admin");
inline constexpr auto user = makeStr("user");
inline constexpr auto unknownCommand = makeStr("unknown");
/// "invalid_json" — WS message parse failure or oversize.
inline constexpr auto invalidJson = makeStr("invalid_json");
} // namespace val
} // namespace xrpl::telemetry::rpc_span

4
src/xrpld/rpc/detail/ServerHandler.cpp
View File

@@ -349,7 +349,7 @@ ServerHandler::onWSMessage(
{
auto span =
SpanGuard::span(TraceCategory::Rpc, rpc_span::prefix::rpc, rpc_span::op::wsMessage);
span.setError("jsonInvalid");
span.setError(rpc_span::val::invalidJson);
json::Value jvResult(json::ValueType::Object);
jvResult[jss::type] = jss::error;
@@ -573,7 +573,7 @@ ServerHandler::processSession(
std::shared_ptr<Session> const& session,
std::shared_ptr<JobQueue::Coro> coro)
{
[[maybe_unused]] auto span =
auto span =
SpanGuard::span(TraceCategory::Rpc, rpc_span::prefix::rpc, rpc_span::op::httpRequest);
processRequest(