Version in User-Agent

This commit is contained in:
Alexey Milovidov 2024-06-16 17:32:41 +02:00
parent 2c1918908a
commit 35ce8c6e72
2 changed files with 3 additions and 2 deletions

View File

@ -1,4 +1,5 @@
#include <Poco/Timespan.h>
#include <Common/config_version.h>
#include "config.h"
#if USE_AWS_S3
@ -110,7 +111,7 @@ PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
, error_report(error_report_)
{
/// This is used to identify configurations created by us.
userAgent = "ClickHouse";
userAgent = std::string(VERSION_FULL) + VERSION_OFFICIAL;
}
void PocoHTTPClientConfiguration::updateSchemeAndRegion()

View File

@ -15,7 +15,7 @@ namespace DB::S3
std::shared_ptr<Aws::Http::HttpClient>
PocoHTTPClientFactory::CreateHttpClient(const Aws::Client::ClientConfiguration & client_configuration) const
{
if (client_configuration.userAgent == "ClickHouse")
if (client_configuration.userAgent.starts_with("ClickHouse"))
return std::make_shared<PocoHTTPClient>(static_cast<const PocoHTTPClientConfiguration &>(client_configuration));
else /// This client is created inside the AWS SDK with default settings to obtain ECS credentials from localhost.
return std::make_shared<PocoHTTPClient>(client_configuration);