From 350cb1ab272bb025a22e7bd4caa3a4c191340dc3 Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Fri, 20 Jun 2025 16:08:39 +0300 Subject: [PATCH 1/3] dev: added NLog formatted logging --- .../appsettings.json | 2 +- slo/playground/configs/chaos.sh | 6 ++++-- slo/playground/configs/ydb.yaml | 5 +++++ slo/src/Internal/Internal.csproj | 5 ++++- slo/src/Internal/SloTableContext.cs | 8 +++++--- slo/src/Internal/nlog.config | 15 +++++++++++++++ 6 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 slo/src/Internal/nlog.config diff --git a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/appsettings.json b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/appsettings.json index 0c36629e..47870f7e 100644 --- a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/appsettings.json +++ b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/appsettings.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "ServerlessYDB": "UseTls=true;Host=ydb.serverless.yandexcloud.net;Port=2135;Database=/ru-central1/b1g8skpblkos03malf3s/etnl7uv72neobbgiahii" + "ServerlessYDB": "UseTls=true;Host=;Port=2135;Database=" } } diff --git a/slo/playground/configs/chaos.sh b/slo/playground/configs/chaos.sh index d2bb6563..b684bd61 100755 --- a/slo/playground/configs/chaos.sh +++ b/slo/playground/configs/chaos.sh @@ -24,7 +24,7 @@ echo "Start CHAOS YDB cluster!" for i in $(seq 1 5) do - echo "docker stop/start iteration $i" + echo "[$(date)]: docker stop/start iteration $i" get_random_container @@ -36,7 +36,7 @@ done for i in $(seq 1 3) do - echo "docker restart iteration $i" + echo "[$(date)]: docker restart iteration $i" get_random_container @@ -47,4 +47,6 @@ done get_random_container +echo "[$(date)]: docker kill -s SIGKILL ${nodeForChaos}" + sh -c "docker kill -s SIGKILL ${nodeForChaos}" diff --git a/slo/playground/configs/ydb.yaml b/slo/playground/configs/ydb.yaml index 103db1e5..6f749b89 100644 --- a/slo/playground/configs/ydb.yaml +++ b/slo/playground/configs/ydb.yaml @@ -15,6 +15,11 @@ blob_storage_config: - node_id: 1 path: SectorMap:1:64 pdisk_category: SSD +# enable grpc server logs +#log_config: +# entry: +# - component: GRPC_SERVER +# level: 8 channel_profile_config: profile: - channel: diff --git a/slo/src/Internal/Internal.csproj b/slo/src/Internal/Internal.csproj index b99bd6bb..f387a90a 100644 --- a/slo/src/Internal/Internal.csproj +++ b/slo/src/Internal/Internal.csproj @@ -10,10 +10,13 @@ + + PreserveNewest + - + diff --git a/slo/src/Internal/SloTableContext.cs b/slo/src/Internal/SloTableContext.cs index a9d05187..0318bb7e 100644 --- a/slo/src/Internal/SloTableContext.cs +++ b/slo/src/Internal/SloTableContext.cs @@ -2,6 +2,7 @@ using System.Security.Cryptography; using System.Threading.RateLimiting; using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; using Prometheus; using Ydb.Sdk; @@ -13,9 +14,10 @@ public interface ISloContext public static readonly ILoggerFactory Factory = LoggerFactory.Create(builder => { - builder.AddConsole().SetMinimumLevel(LogLevel.Information); - builder.AddFilter("Ydb.Sdk.Ado", LogLevel.Debug); - builder.AddFilter("Ydb.Sdk.Services.Query", LogLevel.Debug); + builder.AddNLog() + .SetMinimumLevel(LogLevel.Information) + .AddFilter("Ydb.Sdk.Ado", LogLevel.Debug) + .AddFilter("Ydb.Sdk.Services.Query", LogLevel.Debug); }); diff --git a/slo/src/Internal/nlog.config b/slo/src/Internal/nlog.config new file mode 100644 index 00000000..e228ebf0 --- /dev/null +++ b/slo/src/Internal/nlog.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file From b7bd34888e220d0d771b0d5ca29ea9b87963a1da Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Fri, 20 Jun 2025 16:11:44 +0300 Subject: [PATCH 2/3] fix linter --- slo/src/Internal/nlog.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slo/src/Internal/nlog.config b/slo/src/Internal/nlog.config index e228ebf0..b3aed425 100644 --- a/slo/src/Internal/nlog.config +++ b/slo/src/Internal/nlog.config @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - From 455d0b93aa5df0bf74dbe4616e9d91f0b9b257be Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Fri, 20 Jun 2025 16:25:11 +0300 Subject: [PATCH 3/3] fix log level --- slo/src/Internal/SloTableContext.cs | 11 +---------- slo/src/Internal/nlog.config | 2 ++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/slo/src/Internal/SloTableContext.cs b/slo/src/Internal/SloTableContext.cs index 0318bb7e..c7f1013c 100644 --- a/slo/src/Internal/SloTableContext.cs +++ b/slo/src/Internal/SloTableContext.cs @@ -10,16 +10,7 @@ namespace Internal; public interface ISloContext { - // ReSharper disable once StaticMemberInGenericType - public static readonly ILoggerFactory Factory = - LoggerFactory.Create(builder => - { - builder.AddNLog() - .SetMinimumLevel(LogLevel.Information) - .AddFilter("Ydb.Sdk.Ado", LogLevel.Debug) - .AddFilter("Ydb.Sdk.Services.Query", LogLevel.Debug); - }); - + public static readonly ILoggerFactory Factory = LoggerFactory.Create(builder => builder.AddNLog()); public Task Create(CreateConfig createConfig); diff --git a/slo/src/Internal/nlog.config b/slo/src/Internal/nlog.config index b3aed425..29a2bb26 100644 --- a/slo/src/Internal/nlog.config +++ b/slo/src/Internal/nlog.config @@ -11,5 +11,7 @@ + + \ No newline at end of file