ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-08-21 22:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pratik/otel-phase1b-telemetry-infra' into pratik/otel-phase1c-rpc-integration

Browse Source 
# Conflicts:
#	src/xrpld/app/main/GRPCServer.cpp
This commit is contained in:
Pratik Mankawde
2026-08-20 12:05:54 +01:00
parent 379f4ff60b 8c9a79e4ae
commit 1135470656
464 changed files with 27952 additions and 14299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
#include <xrpl/basics/FileUtilities.h>
#include <xrpl/basics/Log.h>
#include <xrpl/basics/StringUtilities.h>
#include <xrpl/basics/contract.h>
#include <xrpl/beast/core/CurrentThreadName.h>
#include <xrpl/beast/net/IPAddressConversion.h>
@@ -26,7 +27,6 @@
#include <xrpl/server/InfoSub.h>
#include <xrpl/telemetry/SpanGuard.h>
#include <boost/algorithm/string/trim.hpp>
#include <boost/asio/ip/address.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/icl/interval_set.hpp>
@@ -52,6 +52,7 @@
#include <stdexcept>
#include <string>
#include <string_view>
#include <system_error>
#include <utility>
#include <vector>
@@ -407,7 +408,7 @@ GRPCServerImpl::GRPCServerImpl(Application& app)
std::string ip;
while (std::getline(ss, ip, ','))
{
boost::algorithm::trim(ip);
ip = trimWhitespace(ip);
auto const addr = boost::asio::ip::make_address(ip);
if (addr.is_unspecified())
@@ -655,7 +656,7 @@ GRPCServerImpl::createServerCredentials()
try
{
boost::system::error_code ec;
std::error_code ec;
grpc::SslServerCredentialsOptions sslOpts;
grpc::SslServerCredentialsOptions::PemKeyCertPair keyCertPair;