thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 02:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Frank Chen 2022-07-07 17:44:32 +08:00
parent 93dc109e36
commit 90efbc323d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Interpreters/Context.h
View File

@ -550,6 +550,7 @@ public:
const String & projection_name = {},
const String & view_name = {});
OpenTelemetryThreadTraceContextScopePtr startTracing(const std::string& name);
/// Supported factories for records in query_log
enum class QueryLogFactories

2
src/Server/TCPHandler.cpp
View File

@ -467,7 +467,7 @@ void TCPHandler::runImpl()
if (exception)
{
if (thread_trace_context)
thread_trace_context->root_span.addAttribute(exception.value());
thread_trace_context->root_span.addAttribute(*exception);
try
{