From 8395e69e9451507710bc467ec0e1e4c6560c0298 Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Fri, 29 May 2026 16:38:41 +0100
Subject: [PATCH] cleanup updates after merge

Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
---
 src/xrpld/app/main/GRPCServer.cpp      | 5 +++--
 src/xrpld/rpc/detail/RPCHandler.cpp    | 6 ++++--
 src/xrpld/rpc/detail/RpcSpanNames.h    | 2 ++
 src/xrpld/rpc/detail/ServerHandler.cpp | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp
index 48d5181602..b8e15e1742 100644
--- a/src/xrpld/app/main/GRPCServer.cpp
+++ b/src/xrpld/app/main/GRPCServer.cpp
@@ -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);
diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp
index 744b31a555..d1fb9e5c93 100644
--- a/src/xrpld/rpc/detail/RPCHandler.cpp
+++ b/src/xrpld/rpc/detail/RPCHandler.cpp
@@ -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;
diff --git a/src/xrpld/rpc/detail/RpcSpanNames.h b/src/xrpld/rpc/detail/RpcSpanNames.h
index 62eba3de71..e174d9ac9e 100644
--- a/src/xrpld/rpc/detail/RpcSpanNames.h
+++ b/src/xrpld/rpc/detail/RpcSpanNames.h
@@ -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
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index a8dc6ee498..8d6160a298 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -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(