Merge branch 'ydb-platform:master' into master

Author: kupriyanovkk

.github/workflows/check-codegen.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
@@ -32,7 +32,7 @@ jobs:
     - name: Build
       run: |
         go install ./internal/cmd/gtrace
-        go install go.uber.org/mock/mockgen@892b665398ecece7c7a900d2a2f2fa3dac07e4c4        
+        go install go.uber.org/mock/mockgen@v0.4.0
 
     - name: Clean and re-generate *_gtrace.go files
       run: |

.github/workflows/publish.yml

@@ -70,7 +70,7 @@ jobs:
             TAG="v$MAJOR.$MINOR.$PATCH";
           fi;
           git tag $TAG
-          git push --tags && git push
+          git push && git push --tags
           CHANGELOG="$CHANGELOG
           
           Full Changelog: [$LAST_TAG...$TAG](https://github.com/ydb-platform/ydb-go-sdk/compare/$LAST_TAG...$TAG)"

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
         os: [ubuntu, windows, macOS]
     env:
       OS: ${{ matrix.os }}-latest
@@ -44,8 +44,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.20.x, 1.21.x]
-        ydb-version: [22.5, 23.1, 23.2, 23.3]
+        go-version: [1.21.x, 1.22.x]
+        ydb-version: [22.5, 23.1, 23.2, 23.3, 24.1]
     services:
       ydb:
         image: cr.yandex/yc/yandex-docker-local-ydb:${{ matrix.ydb-version }}

.golangci.yml

@@ -112,6 +112,10 @@ linters-settings:
     # if it's called for subdir of a project it can't find external interfaces. All text editor integrations
     # with golangci-lint call it on a directory with the changed file.
     check-exported: false
+  gomoddirectives:
+    replace-local: true
+    replace-allow-list:
+      - xorm.io/xorm
   gocritic:
     disabled-checks:
       - whyNoLint # https://github.com/go-critic/go-critic/issues/1063
@@ -231,7 +235,6 @@ linters:
     - goerr113
     - golint
     - gomnd
-    - gomoddirectives
     - ifshort
     - interfacebloat
     - ireturn

CHANGELOG.md

@@ -1,8 +1,17 @@
+## v3.56.1
+* Fixed fixenv usage (related to tests only)
+
+## v3.56.0
+* Fixed handle of operational errors in topic streams
+* The minimum version of Go in `ydb-go-sdk` has been raised to `go1.21`
 * Fixed topic writer infinite reconnections in some cases
 * Refactored nil on err `internal/grpcwrapper/rawydb/issues.go`, when golangci-lint nilerr enabled
 * Refactored nil on err `internal/grpcwrapper/rawtopic/describe_topic.go`, when golangci-lint nilerr enabled
 * The names of internal errors fixed for `errname` linter
 
+## v3.55.3
+* Fixed handle of operational errors in topic streams (backported fix only)
+
 ## v3.55.2
 * Fixed init info in topic writer, when autoseq num turned off.
 

examples/go.mod

@@ -1,6 +1,6 @@
 module examples
 
-go 1.20
+go 1.21
 
 require (
 	github.com/google/uuid v1.3.0

go.mod

@@ -1,6 +1,6 @@
 module github.com/ydb-platform/ydb-go-sdk/v3
 
-go 1.20
+go 1.21
 
 require (
 	github.com/golang-jwt/jwt/v4 v4.4.1
@@ -15,7 +15,7 @@ require (
 
 // requires for tests only
 require (
-	github.com/rekby/fixenv v0.3.2
+	github.com/rekby/fixenv v0.6.1
 	github.com/stretchr/testify v1.7.1
 	go.uber.org/mock v0.3.1-0.20231011042131-892b665398ec // indirect
 )

go.sum

@@ -60,6 +60,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rekby/fixenv v0.3.2 h1:6AOdQ9Boaa/lOQJTY8GDmQRIhg3S3SD0mIEPkuDSkoQ=
 github.com/rekby/fixenv v0.3.2/go.mod h1:/b5LRc06BYJtslRtHKxsPWFT/ySpHV+rWvzTg+XWk4c=
+github.com/rekby/fixenv v0.6.1 h1:jUFiSPpajT4WY2cYuc++7Y1zWrnCxnovGCIX72PZniM=
+github.com/rekby/fixenv v0.6.1/go.mod h1:/b5LRc06BYJtslRtHKxsPWFT/ySpHV+rWvzTg+XWk4c=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=

internal/background/worker_test.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"runtime"
 	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
 )
 
@@ -75,7 +75,7 @@ func TestWorkerClose(t *testing.T) {
 		w := NewWorker(ctx)
 
 		started := make(empty.Chan)
-		stopped := xatomic.Bool{}
+		stopped := atomic.Bool{}
 		w.Start("test", func(innerCtx context.Context) {
 			close(started)
 			<-innerCtx.Done()
@@ -101,12 +101,12 @@ func TestWorkerConcurrentStartAndClose(t *testing.T) {
 
 		parallel := runtime.GOMAXPROCS(0)
 
-		var counter xatomic.Int64
+		var counter atomic.Int64
 
 		ctx := xtest.Context(t)
 		w := NewWorker(ctx)
 
-		stopNewStarts := xatomic.Bool{}
+		stopNewStarts := atomic.Bool{}
 		var wgStarters sync.WaitGroup
 		for i := 0; i < parallel; i++ {
 			wgStarters.Add(1)

internal/conn/conn.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
@@ -16,7 +17,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/response"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
@@ -54,7 +54,7 @@ type conn struct {
 	done              chan struct{}
 	endpoint          endpoint.Endpoint // ro access
 	closed            bool
-	state             xatomic.Uint32
+	state             atomic.Uint32
 	lastUsage         time.Time
 	onClose           []func(*conn)
 	onTransportErrors []func(ctx context.Context, cc Conn, cause error)
@@ -555,7 +555,7 @@ func getContextMark(ctx context.Context) *modificationMark {
 }
 
 type modificationMark struct {
-	dirty xatomic.Bool
+	dirty atomic.Bool
 }
 
 func (m *modificationMark) canRetry() bool {