Skip to content

Fix build with C++20. #114

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.

Sign up for GitHub

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

Open
bavshin-f5 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build with C++20. #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/http_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,8 @@ template <class Id>
ngx_int_t hexIdVar(ngx_http_request_t* r, ngx_http_variable_value_t* v,
uintptr_t data)
{
namespace nostd = opentelemetry::nostd;

auto ctx = ensureOtelCtx(r);
if (!ctx) {
return NGX_ERROR;
Expand All @@ -867,13 +869,13 @@ ngx_int_t hexIdVar(ngx_http_request_t* r, ngx_http_variable_value_t* v,
auto id = (Id*)((char*)ctx + data);

if (id->IsValid()) {
auto size = id->Id().size() * 2;
constexpr auto size = 2 * Id::kSize;
auto buf = (char*)ngx_pnalloc(r->pool, size);
if (buf == NULL) {
return NGX_ERROR;
}

id->ToLowerBase16({buf, size});
id->ToLowerBase16(nostd::span<char, size>{buf, size});

v->len = size;
v->valid = 1;
Expand Down
5 changes: 3 additions & 2 deletions src/trace_context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,17 @@ struct TraceContext {
static void serialize(const TraceContext& tc, char* out)
{
using namespace opentelemetry::trace::propagation;
namespace nostd = opentelemetry::nostd;

*out++ = '0';
*out++ = '0';
*out++ = '-';

tc.traceId.ToLowerBase16({out, kTraceIdSize});
tc.traceId.ToLowerBase16(nostd::span<char, kTraceIdSize>{out, kTraceIdSize});
out += kTraceIdSize;
*out++ = '-';

tc.spanId.ToLowerBase16({out, kSpanIdSize});
tc.spanId.ToLowerBase16(nostd::span<char, kSpanIdSize>{out, kSpanIdSize});
out += kSpanIdSize;
*out++ = '-';

Expand Down