Skip to content

Commit efa496c

Browse files
committed
Try to fix lifetime of GlobalLogHandler
1 parent 4998eb1 commit efa496c

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

sdk/include/opentelemetry/sdk/common/global_log_handler.h

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,24 +142,23 @@ OPENTELEMETRY_END_NAMESPACE
142142
* To ensure that GlobalLogHandler is the first one to be initialized (and so last to be
143143
* destroyed), it is first used inside the constructors of TraceProvider, MeterProvider
144144
* and LoggerProvider for debug logging. */
145-
#define OTEL_INTERNAL_LOG_DISPATCH(level, message, attributes) \
146-
do \
147-
{ \
148-
using opentelemetry::sdk::common::internal_log::GlobalLogHandler; \
149-
using opentelemetry::sdk::common::internal_log::LogHandler; \
150-
if (level > GlobalLogHandler::GetLogLevel()) \
151-
{ \
152-
break; \
153-
} \
154-
const opentelemetry::nostd::shared_ptr<LogHandler> &log_handler = \
155-
GlobalLogHandler::GetLogHandler(); \
156-
if (!log_handler) \
157-
{ \
158-
break; \
159-
} \
160-
std::stringstream tmp_stream; \
161-
tmp_stream << message; \
162-
log_handler->Handle(level, __FILE__, __LINE__, tmp_stream.str().c_str(), attributes); \
145+
#define OTEL_INTERNAL_LOG_DISPATCH(level, message, attributes) \
146+
do \
147+
{ \
148+
using opentelemetry::sdk::common::internal_log::GlobalLogHandler; \
149+
using opentelemetry::sdk::common::internal_log::LogHandler; \
150+
if (level > GlobalLogHandler::GetLogLevel()) \
151+
{ \
152+
break; \
153+
} \
154+
opentelemetry::nostd::shared_ptr<LogHandler> log_handler = GlobalLogHandler::GetLogHandler(); \
155+
if (!log_handler) \
156+
{ \
157+
break; \
158+
} \
159+
std::stringstream tmp_stream; \
160+
tmp_stream << message; \
161+
log_handler->Handle(level, __FILE__, __LINE__, tmp_stream.str().c_str(), attributes); \
163162
} while (false);
164163

165164
#define OTEL_INTERNAL_LOG_GET_3RD_ARG(arg1, arg2, arg3, ...) arg3

0 commit comments

Comments
 (0)