Merge branch 'ydb-platform:main' into linq2db-examples-dev

Author: poma12390

.github/workflows/lint.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Restore
         run: dotnet restore ${{ matrix.source-dir }}${{ matrix.solutionFile }}
       - name: Install ReSharper
-        run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
+        run: dotnet tool install -g JetBrains.ReSharper.GlobalTools --version 2025.2.1
       - name: format all files with auto-formatter
         run: bash ./.github/scripts/format-all-dotnet-code.sh ${{ matrix.source-dir }} ${{ matrix.solutionFile }}
       - name: Check repository diff
@@ -63,6 +63,7 @@ jobs:
             **.cshtml
           minimumReportSeverity: WARNING
           dotnetVersion: ${{ steps.setup-dotnet.outputs.dotnet-version }}
+          version: 2025.2.1
           ignoreIssueType: | 
             UnusedField.Compiler,
             UnusedVariable.Compiler,

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
   ydb-sdk-tests:
     strategy:
       matrix:
-        ydb-version: [ 'latest', '25.1' ]
+        ydb-version: [ 'latest', 'trunk' ]
         dotnet-version: [ 8.0.x, 9.0.x ]
     runs-on: ubuntu-22.04
     services:
@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ydb-version: [ 'latest', '25.1' ]
+        ydb-version: [ 'latest', 'trunk' ]
         dotnet-version: [ 8.0.x, 9.0.x ]
     services:
       ydb:
@@ -139,4 +139,4 @@ jobs:
           dotnet add package Microsoft.EntityFrameworkCore.Design
           dotnet ef migrations add InitialCreate
           dotnet ef database update
-          dotnet run
+          dotnet run

examples/EntityFrameworkCore.Ydb.Yandex.Cloud/Program.cs

@@ -12,8 +12,8 @@ await Parser.Default.ParseArguments<CmdOptions>(args).WithParsedAsync(async cmd
 
     var options = new DbContextOptionsBuilder<AppDbContext>()
         .UseYdb(cmd.ConnectionString, builder => builder
-            .WithCredentialsProvider(saProvider)
-            .WithServerCertificates(YcCerts.GetYcServerCertificates())
+            .UseCredentialsProvider(saProvider)
+            .UseServerCertificates(YcCerts.GetYcServerCertificates())
         )
         .Options;
 

examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Program.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using Dapper;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
@@ -18,18 +19,17 @@
 var stopwatch = Stopwatch.StartNew();
 stopwatch.Start();
 
-await using var dataSource = new YdbDataSource(
-    new YdbConnectionStringBuilder(connectionString)
-    {
-        CredentialsProvider = new MetadataProvider(loggerFactory: loggerFactory),
-        LoggerFactory = loggerFactory,
-        DisableDiscovery = true
-    }
-);
+await using var ydbDataSource = new YdbDataSource(new YdbConnectionStringBuilder(connectionString)
+{
+    CredentialsProvider = new MetadataProvider(loggerFactory: loggerFactory),
+    LoggerFactory = loggerFactory,
+    DisableDiscovery = true,
+    EnableImplicitSession = true
+});
 
-await using var ydbCommand = dataSource.CreateCommand();
-ydbCommand.CommandText = "SELECT 'Hello Serverless YDB from Yandex Cloud Serverless Container!'u";
-var scalar = await ydbCommand.ExecuteScalarAsync();
+await using var ydbConnection = await ydbDataSource.OpenRetryableConnectionAsync();
+var scalar = await ydbConnection.ExecuteScalarAsync<string>(
+    "SELECT 'Hello Serverless YDB from Yandex Cloud Serverless Container!'u");
 stopwatch.Stop();
 
 logger.LogInformation("Success request! [Ms: {Ms}], {Select}", stopwatch.ElapsedMilliseconds, scalar);

examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/README.md

@@ -6,23 +6,32 @@ to [Yandex Cloud Serverless Containers](https://yandex.cloud/en/docs/serverless-
 ## Getting started
 
 1. **Setup** [Yandex Container Registry](https://yandex.cloud/en/docs/container-registry/operations/registry/registry-create).
-2. **Build and Push Docker Image**
+2. **Configure YDB Connection String**. Update the `appsettings.json` file with your YDB connection details:
+   ```json
+   {
+     "ConnectionStrings": {
+       "ServerlessYDB": "UseTls=true;Host=<your-ydb-host>;Port=2135;Database=<your-database-path>"
+     }
+   }
+   ```
+   Replace `<your-ydb-host>` with your YDB endpoint host and `<your-database-path>` with your database path (e.g., `/ru-central1/b1g8ejbxxxxxxxx/etn8xxxxxxxx`).
+3. **Build and Push Docker Image**
    ```bash 
    docker build . -t cr.yandex/<container-registry-id>/ado-net-app:latest
    docker push cr.yandex/<container-registry-id>/ado-net-app:latest
    ```
    Replace <container-registry-id> with your actual Container Registry ID.
-3. **Grant Required Permissions**. To enable your Serverless Container to access both YDB and your container image in
+4. **Grant Required Permissions**. To enable your Serverless Container to access both YDB and your container image in
    the Container Registry, grant the following roles to your Service Account:
 
     - `ydb.editor` — access to YDB,
     - `container-registry.images.puller` — permission to pull images from Container Registry.
 
-4. **Create a new revision**. After pushing your image, create a new version of the Serverless Container as described in
+5. **Create a new revision**. After pushing your image, create a new version of the Serverless Container as described in
    the [official guide](https://yandex.cloud/en/docs/serverless-containers/quickstart/container#create-revision).
    Specify your image and the necessary environment variables and secrets.
 
-5. **Running the Yandex Serverless Container**.
+6. **Running the Yandex Serverless Container**.
    After the new revision has been rolled out, you can use your container (e.g., for a health check) by executing the
    following command:
    ```bash

examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container.csproj

@@ -15,7 +15,8 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
         <PackageReference Include="NLog.Extensions.Logging" Version="5.5.0"/>
         <PackageReference Include="Ydb.Sdk.Yc.Auth" Version="0.2.0"/>
-        <PackageReference Include="Ydb.Sdk" Version="0.18.0"/>
+        <PackageReference Include="Ydb.Sdk" Version="0.24.0"/>
+        <PackageReference Include="Dapper" Version="2.1.35"/>
 
         <None Update="appsettings.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

examples/Ydb.Sdk.Topic.QuickStart/Program.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.Logging;
 using Ydb.Sdk;
-using Ydb.Sdk.Services.Topic;
-using Ydb.Sdk.Services.Topic.Reader;
-using Ydb.Sdk.Services.Topic.Writer;
+using Ydb.Sdk.Topic;
+using Ydb.Sdk.Topic.Reader;
+using Ydb.Sdk.Topic.Writer;
 
 const int countMessages = 100;
 const string topicName = "topic_name";

slo/src/EF/SloTableContext.cs

@@ -12,7 +12,8 @@ public class SloTableContext : SloTableContext<PooledDbContextFactory<TableDbCon
     protected override string Job => "EF";
 
     protected override PooledDbContextFactory<TableDbContext> CreateClient(Config config) =>
-        new(new DbContextOptionsBuilder<TableDbContext>().UseYdb(config.ConnectionString).Options);
+        new(new DbContextOptionsBuilder<TableDbContext>().UseYdb(config.ConnectionString,
+            builder => builder.EnableRetryIdempotence()).Options);
 
     protected override async Task Create(
         PooledDbContextFactory<TableDbContext> client,

slo/src/Internal/SloTableContext.cs

@@ -5,7 +5,6 @@
 using NLog.Extensions.Logging;
 using Prometheus;
 using Ydb.Sdk;
-using Ydb.Sdk.Ado;
 
 namespace Internal;
 
@@ -151,11 +150,6 @@ async Task ShootingTask(RateLimiter rateLimitPolicy, string operationType, Func<
                 "Total number of successful operations, categorized by type."
             );
 
-            var operationsFailureTotal = metricFactory.CreateCounter(
-                "sdk_operations_failure_total",
-                "Total number of failed operations, categorized by type."
-            );
-
             var operationLatencySeconds = metricFactory.CreateHistogram(
                 "sdk_operation_latency_seconds",
                 "Latency of operations performed by the SDK in seconds, categorized by type and status.",
@@ -186,12 +180,6 @@ async Task ShootingTask(RateLimiter rateLimitPolicy, string operationType, Func<
                 "Current number of pending operations, categorized by type."
             );
 
-            var errorsTotal = metricFactory.CreateCounter(
-                "sdk_errors_total",
-                "Total number of errors encountered, categorized by error type.",
-                ["error_type"]
-            );
-
             var workJobs = new List<Task>();
 
             for (var i = 0; i < 10; i++)
@@ -210,23 +198,12 @@ async Task ShootingTask(RateLimiter rateLimitPolicy, string operationType, Func<
 
                         pendingOperations.Inc();
                         var sw = Stopwatch.StartNew();
-                        try
-                        {
-                            await action(client, runConfig);
-                            sw.Stop();
-                            operationsTotal.Inc();
-                            pendingOperations.Dec();
-                            operationsSuccessTotal.Inc();
-                            operationLatencySeconds.WithLabels("success").Observe(sw.Elapsed.TotalSeconds);
-                        }
-                        catch (YdbException e)
-                        {
-                            Logger.LogError(e, "Fail operation!");
-
-                            errorsTotal.WithLabels(e.Code.StatusName()).Inc();
-                            operationsFailureTotal.Inc();
-                            operationLatencySeconds.WithLabels("err").Observe(sw.Elapsed.TotalSeconds);
-                        }
+                        await action(client, runConfig);
+                        sw.Stop();
+                        operationsTotal.Inc();
+                        pendingOperations.Dec();
+                        operationsSuccessTotal.Inc();
+                        operationLatencySeconds.WithLabels("success").Observe(sw.Elapsed.TotalSeconds);
                     }
                 }, cancellationTokenSource.Token));
             }

slo/src/TopicService/SloTopicContext.cs

@@ -4,9 +4,9 @@
 using Microsoft.Extensions.Logging;
 using Ydb.Sdk;
 using Ydb.Sdk.Ado;
-using Ydb.Sdk.Services.Topic;
-using Ydb.Sdk.Services.Topic.Reader;
-using Ydb.Sdk.Services.Topic.Writer;
+using Ydb.Sdk.Topic;
+using Ydb.Sdk.Topic.Reader;
+using Ydb.Sdk.Topic.Writer;
 
 namespace TopicService;
 
@@ -332,7 +332,7 @@ int partitionId
     }
 
     private static void CheckMessage(ConcurrentDictionary<long, ConcurrentQueue<string>> localStore,
-        Ydb.Sdk.Services.Topic.Reader.Message<string> message)
+        Ydb.Sdk.Topic.Reader.Message<string> message)
     {
         if (localStore.TryGetValue(message.PartitionId, out var partition))
         {
@@ -363,7 +363,7 @@ private static string PrintLocalStore(ConcurrentDictionary<long, ConcurrentQueue
         string.Join("\n", localStore.Select(pair => pair.Key + ": " + string.Join(", ", pair.Value))) +
         "]";
 
-    private static void AssertMessage(Ydb.Sdk.Services.Topic.Reader.Message<string> message, string expectedMessageData)
+    private static void AssertMessage(Ydb.Sdk.Topic.Reader.Message<string> message, string expectedMessageData)
     {
         if (expectedMessageData == message.Data)
         {