From d9dd9341ce7c88f8ae64214a22e8d80704160338 Mon Sep 17 00:00:00 2001 From: Alexander Kuzmenkov Date: Mon, 30 Nov 2020 12:11:17 +0300 Subject: [PATCH] Fix the OpenTelemetry test --- src/Interpreters/OpenTelemetrySpanLog.cpp | 10 ---------- src/Interpreters/ThreadStatusExt.cpp | 5 ----- tests/queries/shell_config.sh | 4 +++- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/Interpreters/OpenTelemetrySpanLog.cpp b/src/Interpreters/OpenTelemetrySpanLog.cpp index de82f8a4d01..e1df145cf51 100644 --- a/src/Interpreters/OpenTelemetrySpanLog.cpp +++ b/src/Interpreters/OpenTelemetrySpanLog.cpp @@ -90,11 +90,6 @@ OpenTelemetrySpanHolder::OpenTelemetrySpanHolder(const std::string & _operation_ start_time_us = std::chrono::duration_cast( 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; } @@ -130,11 +125,6 @@ OpenTelemetrySpanHolder::~OpenTelemetrySpanHolder() return; } -#ifndef NDEBUG - attribute_names.push_back("clickhouse.end.stacktrace"); - attribute_values.push_back(StackTrace().toString()); -#endif - auto log = context->getOpenTelemetrySpanLog(); if (!log) { diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp index d698e8d103b..f6ee2c571d1 100644 --- a/src/Interpreters/ThreadStatusExt.cpp +++ b/src/Interpreters/ThreadStatusExt.cpp @@ -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_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); } diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh index 9cfec2c2a28..88ff59c5084 100644 --- a/tests/queries/shell_config.sh +++ b/tests/queries/shell_config.sh @@ -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_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_TMP=${CLICKHOUSE_TMP:="."} mkdir -p ${CLICKHOUSE_TMP}