Skip to content

Fix leak in Jaeger exporter #1160

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

Merged
lalitb merged 2 commits into from
Dec 23, 2021
Merged

Fix leak in Jaeger exporter #1160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be83b1d
Fix leak in Jaeger exporter
bjosv Dec 21, 2021
33c2bfb
Merge branch 'main' into fix-leak-jaeger-exporter
bjosv Dec 23, 2021
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
12 changes: 6 additions & 6 deletions exporters/jaeger/src/thrift_sender.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ int ThriftSender::Append(std::unique_ptr<JaegerRecordable> &&span) noexcept
max_span_bytes -= process_bytes_size_;
}

thrift::Span &jaeger_span = *span->Span();
jaeger_span.__set_tags(span->Tags());
jaeger_span.__set_logs(span->Logs());
auto jaeger_span = std::unique_ptr<thrift::Span>(span->Span());
jaeger_span->__set_tags(span->Tags());
jaeger_span->__set_logs(span->Logs());

const uint32_t span_size = CalcSizeOfSerializedThrift(jaeger_span);
const uint32_t span_size = CalcSizeOfSerializedThrift(*jaeger_span);
if (span_size > max_span_bytes)
{
OTEL_INTERNAL_LOG_ERROR("[JAEGER TRACE Exporter] Append() failed: too large span");
Expand All @@ -51,7 +51,7 @@ int ThriftSender::Append(std::unique_ptr<JaegerRecordable> &&span) noexcept
byte_buffer_size_ += span_size;
if (byte_buffer_size_ <= max_span_bytes)
{
span_buffer_.push_back(jaeger_span);
span_buffer_.push_back(*jaeger_span);
if (byte_buffer_size_ < max_span_bytes)
{
return 0;
Expand All @@ -64,7 +64,7 @@ int ThriftSender::Append(std::unique_ptr<JaegerRecordable> &&span) noexcept
}

const auto flushed = Flush();
span_buffer_.push_back(jaeger_span);
span_buffer_.push_back(*jaeger_span);
byte_buffer_size_ = span_size + process_bytes_size_;

return flushed;
Expand Down