Skip to content

[API] DO not allow unsafe Logger::EmitLogRecord #2673

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
marcalff merged 5 commits into from
May 28, 2024
Merged

[API] DO not allow unsafe Logger::EmitLogRecord #2673

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acc0294
DO not allow unsafe `Logger::EmitLogRecord`
owent May 21, 2024
eea093d
Merge branch 'main' into do_now_allow_emit_unsafe_log_record
marcalff May 27, 2024
ec4f4fc
Merge remote-tracking branch 'github/main' into do_now_allow_emit_uns…
owent May 28, 2024
3cfdd49
Add hint for invalid parameter
owent May 28, 2024
1f23592
Merge branch 'do_now_allow_emit_unsafe_log_record' of github.com:owen…
owent May 28, 2024
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
5 changes: 5 additions & 0 deletions api/include/opentelemetry/logs/logger_type_traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#pragma once

#include <chrono>
#include <memory>
#include <type_traits>

#include "opentelemetry/common/attribute_value.h"
Expand Down Expand Up @@ -145,6 +146,10 @@ struct LogRecordSetterTrait<common::KeyValueIterable>
template <class ValueType>
struct LogRecordSetterTrait
{
static_assert(!std::is_same<nostd::unique_ptr<LogRecord>, ValueType>::value &&
!std::is_same<std::unique_ptr<LogRecord>, ValueType>::value,
"unique_ptr<LogRecord> is not allowed");
Copy link
Member

@marcalff marcalff May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"unique_ptr<LogRecord> is not allowed");
"unique_ptr<LogRecord> is not allowed, use std::move()");

Also, consider adding an assert for LogRecord*

Copy link
Member Author

@owent owent May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, it's done


template <class ArgumentType,
nostd::enable_if_t<std::is_convertible<ArgumentType, nostd::string_view>::value ||
std::is_convertible<ArgumentType, common::AttributeValue>::value,
Expand Down