mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Fix the OpenTelemetry test
This commit is contained in:
parent
cbbdec572a
commit
d9dd9341ce
@ -90,11 +90,6 @@ OpenTelemetrySpanHolder::OpenTelemetrySpanHolder(const std::string & _operation_
|
|||||||
start_time_us = std::chrono::duration_cast<std::chrono::microseconds>(
|
start_time_us = std::chrono::duration_cast<std::chrono::microseconds>(
|
||||||
std::chrono::system_clock::now().time_since_epoch()).count();
|
std::chrono::system_clock::now().time_since_epoch()).count();
|
||||||
|
|
||||||
#ifndef NDEBUG
|
|
||||||
attribute_names.push_back("clickhouse.start.stacktrace");
|
|
||||||
attribute_values.push_back(StackTrace().toString());
|
|
||||||
#endif
|
|
||||||
|
|
||||||
thread.thread_trace_context.span_id = span_id;
|
thread.thread_trace_context.span_id = span_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,11 +125,6 @@ OpenTelemetrySpanHolder::~OpenTelemetrySpanHolder()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NDEBUG
|
|
||||||
attribute_names.push_back("clickhouse.end.stacktrace");
|
|
||||||
attribute_values.push_back(StackTrace().toString());
|
|
||||||
#endif
|
|
||||||
|
|
||||||
auto log = context->getOpenTelemetrySpanLog();
|
auto log = context->getOpenTelemetrySpanLog();
|
||||||
if (!log)
|
if (!log)
|
||||||
{
|
{
|
||||||
|
@ -356,11 +356,6 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
|
|||||||
span.attribute_names.push_back("clickhouse.thread_id");
|
span.attribute_names.push_back("clickhouse.thread_id");
|
||||||
span.attribute_values.push_back(thread_id);
|
span.attribute_values.push_back(thread_id);
|
||||||
|
|
||||||
#ifndef NDEBUG
|
|
||||||
span.attribute_names.push_back("clickhouse.end.stacktrace");
|
|
||||||
span.attribute_values.push_back(StackTrace().toString());
|
|
||||||
#endif
|
|
||||||
|
|
||||||
opentelemetry_span_log->add(span);
|
opentelemetry_span_log->add(span);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,7 +70,9 @@ export CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:="9009"}
|
|||||||
export CLICKHOUSE_URL_INTERSERVER=${CLICKHOUSE_URL_INTERSERVER:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_INTERSERVER}/"}
|
export CLICKHOUSE_URL_INTERSERVER=${CLICKHOUSE_URL_INTERSERVER:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_INTERSERVER}/"}
|
||||||
|
|
||||||
export CLICKHOUSE_CURL_COMMAND=${CLICKHOUSE_CURL_COMMAND:="curl"}
|
export CLICKHOUSE_CURL_COMMAND=${CLICKHOUSE_CURL_COMMAND:="curl"}
|
||||||
export CLICKHOUSE_CURL_TIMEOUT=${CLICKHOUSE_CURL_TIMEOUT:="10"}
|
# The queries in CI are prone to sudden delays, and we often don't check for curl
|
||||||
|
# errors, so it makes sense to set a relatively generous timeout.
|
||||||
|
export CLICKHOUSE_CURL_TIMEOUT=${CLICKHOUSE_CURL_TIMEOUT:="60"}
|
||||||
export CLICKHOUSE_CURL=${CLICKHOUSE_CURL:="${CLICKHOUSE_CURL_COMMAND} -q -s --max-time ${CLICKHOUSE_CURL_TIMEOUT}"}
|
export CLICKHOUSE_CURL=${CLICKHOUSE_CURL:="${CLICKHOUSE_CURL_COMMAND} -q -s --max-time ${CLICKHOUSE_CURL_TIMEOUT}"}
|
||||||
export CLICKHOUSE_TMP=${CLICKHOUSE_TMP:="."}
|
export CLICKHOUSE_TMP=${CLICKHOUSE_TMP:="."}
|
||||||
mkdir -p ${CLICKHOUSE_TMP}
|
mkdir -p ${CLICKHOUSE_TMP}
|
||||||
|
Loading…
Reference in New Issue
Block a user