fix(telemetry): address clang-tidy errors on phase1c RPC integration files

- Concatenate nested namespaces in SpanNames.h, RpcSpanNames.h, GrpcSpanNames.h
- Remove unused InfoSub.h and NetworkOPs.h includes from RPCHandler.cpp
- Add missing <string_view> includes in RPCHandler.cpp and GRPCServer.cpp
- Replace nested ternary with if/else-if in RPCHandler.cpp
- Add IWYU pragma keep for json_body.h in ServerHandler.cpp

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Pratik Mankawde
2026-04-29 17:52:31 +01:00
parent 019e84f0d2
commit 79fbb9c303
6 changed files with 22 additions and 23 deletions

View File

@@ -24,8 +24,7 @@
#include <cstddef>
#include <string_view>
namespace xrpl {
namespace telemetry {
namespace xrpl::telemetry {
// ===== Compile-time string utility =========================================
@@ -110,5 +109,4 @@ inline constexpr auto error = makeStr("error");
inline constexpr auto followsFrom = makeStr("follows_from");
} // namespace attr_val
} // namespace telemetry
} // namespace xrpl
} // namespace xrpl::telemetry

View File

@@ -50,6 +50,7 @@
#include <sstream>
#include <stdexcept>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

View File

@@ -20,9 +20,7 @@
#include <xrpl/telemetry/SpanNames.h>
namespace xrpl {
namespace telemetry {
namespace grpc_span {
namespace xrpl::telemetry::grpc_span {
// ===== Span prefixes =======================================================
@@ -59,6 +57,4 @@ inline constexpr auto resourceExhausted = makeStr("resource_exhausted");
inline constexpr auto failedPrecondition = makeStr("failed_precondition");
} // namespace val
} // namespace grpc_span
} // namespace telemetry
} // namespace xrpl
} // namespace xrpl::telemetry::grpc_span

View File

@@ -17,8 +17,6 @@
#include <xrpl/protocol/ErrorCodes.h>
#include <xrpl/protocol/jss.h>
#include <xrpl/resource/Fees.h>
#include <xrpl/server/InfoSub.h>
#include <xrpl/server/NetworkOPs.h>
#include <xrpl/telemetry/SpanGuard.h>
#include <atomic>
@@ -26,6 +24,7 @@
#include <cstdint>
#include <exception>
#include <string>
#include <string_view>
namespace xrpl {
using namespace telemetry;
@@ -212,10 +211,19 @@ doCommand(RPC::JsonContext& context, Json::Value& result)
Handler const* handler = nullptr;
if (auto error = fillHandler(context, handler))
{
std::string const cmdName = context.params.isMember(jss::command)
? context.params[jss::command].asString()
: context.params.isMember(jss::method) ? context.params[jss::method].asString()
: "unknown";
std::string cmdName;
if (context.params.isMember(jss::command))
{
cmdName = context.params[jss::command].asString();
}
else if (context.params.isMember(jss::method))
{
cmdName = context.params[jss::method].asString();
}
else
{
cmdName = "unknown";
}
auto span = SpanGuard::span(
TraceCategory::Rpc, rpc_span::prefix::command, rpc_span::val::unknownCommand);
span.setAttribute(rpc_span::attr::command, cmdName.c_str());

View File

@@ -111,9 +111,7 @@
#include <xrpl/telemetry/SpanNames.h>
namespace xrpl {
namespace telemetry {
namespace rpc_span {
namespace xrpl::telemetry::rpc_span {
// ===== Span prefixes =======================================================
@@ -160,6 +158,4 @@ inline constexpr auto user = makeStr("user");
inline constexpr auto unknownCommand = makeStr("unknown");
} // namespace val
} // namespace rpc_span
} // namespace telemetry
} // namespace xrpl
} // namespace xrpl::telemetry::rpc_span

View File

@@ -8,7 +8,7 @@
#include <xrpld/rpc/detail/RpcSpanNames.h>
#include <xrpld/rpc/detail/Tuning.h>
#include <xrpld/rpc/detail/WSInfoSub.h>
#include <xrpld/rpc/json_body.h>
#include <xrpld/rpc/json_body.h> // IWYU pragma: keep
#include <xrpl/basics/Log.h>
#include <xrpl/basics/base64.h>