Skip to content

Commit 406e658

Browse files
Igor DrozdovJohn Cai
authored and
GitLab
committed
Merge branch 'jc/upgrade-gitaly-to-v18' into 'main'
Upgrade Gitaly to v18 See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1373 Merged-by: Igor Drozdov <idrozdov@gitlab.com> Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com> Approved-by: Igor Drozdov <idrozdov@gitlab.com> Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com> Co-authored-by: John Cai <jcai@gitlab.com>
2 parents dbff560 + 370a093 commit 406e658

15 files changed

Lines changed: 339 additions & 298 deletions

File tree

‎client/testserver/gitalyserver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212

1313
"github.com/stretchr/testify/require"
14-
"gitlab.com/gitlab-org/gitaly/v16/client"
15-
pb "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
14+
"gitlab.com/gitlab-org/gitaly/v18/client"
15+
pb "gitlab.com/gitlab-org/gitaly/v18/proto/go/gitalypb"
1616
"gitlab.com/gitlab-org/labkit/log"
1717
"google.golang.org/grpc"
1818
"google.golang.org/grpc/credentials/insecure"

‎cmd/gitlab-sshd/acceptance_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/pires/go-proxyproto"
2828
"github.com/stretchr/testify/assert"
2929
"github.com/stretchr/testify/require"
30-
gitalyClient "gitlab.com/gitlab-org/gitaly/v16/client"
31-
pb "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
32-
"gitlab.com/gitlab-org/gitaly/v16/streamio"
30+
gitalyClient "gitlab.com/gitlab-org/gitaly/v18/client"
31+
pb "gitlab.com/gitlab-org/gitaly/v18/proto/go/gitalypb"
32+
"gitlab.com/gitlab-org/gitaly/v18/streamio"
3333
"golang.org/x/crypto/ssh"
3434
"google.golang.org/grpc"
3535

@@ -108,7 +108,7 @@ func ensureGitalyRepository(t *testing.T) (*grpc.ClientConn, *pb.Repository) {
108108
t.Skip("GITALY_CONNECTION_INFO is not set")
109109
}
110110

111-
conn, err := gitalyClient.Dial(gitalyConnInfo.Address, gitalyClient.DefaultDialOpts)
111+
conn, err := gitalyClient.Dial(gitalyConnInfo.Address)
112112
require.NoError(t, err)
113113

114114
repository := pb.NewRepositoryServiceClient(conn)

‎go.mod‎

Lines changed: 66 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module gitlab.com/gitlab-org/gitlab-shell/v14
22

3-
go 1.23.0
3+
go 1.24.0
44

55
toolchain go1.24.5
66

@@ -15,57 +15,57 @@ require (
1515
github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
1616
github.com/otiai10/copy v1.14.1
1717
github.com/pires/go-proxyproto v0.8.0
18-
github.com/prometheus/client_golang v1.22.0
19-
github.com/sirupsen/logrus v1.9.3
20-
github.com/stretchr/testify v1.10.0
21-
// This v16.11.0-rc1 changes has some fixes for dns bug for
22-
// v16.11.10, see https://gitlab.com/gitlab-org/gitaly/-/issues/6694.
23-
// Please do not override. Once v16.11.1 is released, this comment
24-
// can be removed.
25-
gitlab.com/gitlab-org/gitaly/v16 v16.11.0-rc1.0.20250408053233-c6d43513e93c
18+
github.com/prometheus/client_golang v1.23.2
19+
github.com/sirupsen/logrus v1.9.4
20+
github.com/stretchr/testify v1.11.1
21+
gitlab.com/gitlab-org/gitaly/v18 v18.9.0-rc4
2622
gitlab.com/gitlab-org/labkit v1.36.0
27-
golang.org/x/crypto v0.41.0
28-
golang.org/x/sync v0.16.0
29-
google.golang.org/grpc v1.72.0
30-
google.golang.org/protobuf v1.36.10
23+
golang.org/x/crypto v0.47.0
24+
golang.org/x/sync v0.19.0
25+
google.golang.org/grpc v1.77.0
26+
google.golang.org/protobuf v1.36.11
3127
gopkg.in/yaml.v3 v3.0.1
3228
)
3329

3430
require (
35-
cloud.google.com/go v0.115.1 // indirect
36-
cloud.google.com/go/auth v0.9.3 // indirect
37-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
38-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
39-
cloud.google.com/go/monitoring v1.21.0 // indirect
31+
cloud.google.com/go v0.123.0 // indirect
32+
cloud.google.com/go/auth v0.17.0 // indirect
33+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
34+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
35+
cloud.google.com/go/monitoring v1.24.2 // indirect
4036
cloud.google.com/go/profiler v0.1.0 // indirect
41-
cloud.google.com/go/trace v1.11.0 // indirect
37+
cloud.google.com/go/trace v1.11.6 // indirect
4238
contrib.go.opencensus.io/exporter/stackdriver v0.13.14 // indirect
4339
github.com/DataDog/datadog-go v4.4.0+incompatible // indirect
44-
github.com/DataDog/sketches-go v1.0.0 // indirect
40+
github.com/DataDog/sketches-go v1.4.7 // indirect
41+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.31.0 // indirect
42+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
4543
github.com/Microsoft/go-winio v0.6.2 // indirect
46-
github.com/aws/aws-sdk-go v1.55.5 // indirect
44+
github.com/aws/aws-sdk-go v1.55.6 // indirect
4745
github.com/beorn7/perks v1.0.1 // indirect
46+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4847
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4948
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5049
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
51-
github.com/dgraph-io/badger/v4 v4.6.0 // indirect
52-
github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
50+
github.com/dgraph-io/badger/v4 v4.9.0 // indirect
51+
github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect
5352
github.com/dustin/go-humanize v1.0.1 // indirect
5453
github.com/felixge/httpsnoop v1.0.4 // indirect
55-
github.com/go-logr/logr v1.4.2 // indirect
54+
github.com/go-logr/logr v1.4.3 // indirect
5655
github.com/go-logr/stdr v1.2.2 // indirect
57-
github.com/go-ole/go-ole v1.2.6 // indirect
56+
github.com/go-ole/go-ole v1.3.0 // indirect
5857
github.com/gogo/protobuf v1.3.2 // indirect
5958
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6059
github.com/golang/protobuf v1.5.4 // indirect
6160
github.com/google/flatbuffers v25.2.10+incompatible // indirect
62-
github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da // indirect
63-
github.com/google/s2a-go v0.1.8 // indirect
61+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
62+
github.com/google/s2a-go v0.1.9 // indirect
6463
github.com/google/uuid v1.6.0 // indirect
65-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
66-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
64+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
65+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
6766
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
68-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
67+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
68+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
6969
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7070
github.com/hashicorp/yamux v0.1.2-0.20220728231024-8f49b6f63f18 // indirect
7171
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -75,47 +75,56 @@ require (
7575
github.com/lightstep/lightstep-tracer-go v0.25.0 // indirect
7676
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
7777
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
78-
github.com/oklog/ulid/v2 v2.0.2 // indirect
78+
github.com/oklog/ulid/v2 v2.1.1 // indirect
7979
github.com/onsi/ginkgo v1.16.5 // indirect
80-
github.com/onsi/gomega v1.20.1 // indirect
8180
github.com/opentracing/opentracing-go v1.2.0 // indirect
8281
github.com/otiai10/mint v1.6.3 // indirect
83-
github.com/philhofer/fwd v1.1.1 // indirect
82+
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
8483
github.com/pkg/errors v0.9.1 // indirect
8584
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
86-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
87-
github.com/prometheus/client_model v0.6.1 // indirect
88-
github.com/prometheus/common v0.63.0 // indirect
89-
github.com/prometheus/procfs v0.15.1 // indirect
85+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
86+
github.com/prometheus/client_model v0.6.2 // indirect
87+
github.com/prometheus/common v0.67.5 // indirect
88+
github.com/prometheus/procfs v0.16.1 // indirect
9089
github.com/prometheus/prometheus v0.54.0 // indirect
9190
github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a // indirect
92-
github.com/shirou/gopsutil/v3 v3.22.8 // indirect
93-
github.com/tinylib/msgp v1.1.2 // indirect
94-
github.com/tklauser/go-sysconf v0.3.10 // indirect
95-
github.com/tklauser/numcpus v0.4.0 // indirect
91+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
92+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
93+
github.com/tinylib/msgp v1.3.0 // indirect
94+
github.com/tklauser/go-sysconf v0.3.15 // indirect
95+
github.com/tklauser/numcpus v0.10.0 // indirect
9696
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
9797
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
98-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
98+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
9999
gitlab.com/gitlab-org/go/reopen v1.0.0 // indirect
100100
go.etcd.io/raft/v3 v3.6.0 // indirect
101101
go.opencensus.io v0.24.0 // indirect
102-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
103-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
104-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
105-
go.opentelemetry.io/otel v1.34.0 // indirect
106-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
107-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
102+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
103+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
105+
go.opentelemetry.io/contrib/propagators/jaeger v1.39.0 // indirect
106+
go.opentelemetry.io/contrib/propagators/ot v1.39.0 // indirect
107+
go.opentelemetry.io/otel v1.39.0 // indirect
108+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
109+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
110+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
111+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
112+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
113+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
114+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
108115
go.uber.org/atomic v1.11.0 // indirect
109-
golang.org/x/net v0.42.0 // indirect
110-
golang.org/x/oauth2 v0.26.0 // indirect
111-
golang.org/x/sys v0.35.0 // indirect
112-
golang.org/x/text v0.28.0 // indirect
113-
golang.org/x/time v0.11.0 // indirect
116+
go.uber.org/multierr v1.11.0 // indirect
117+
go.yaml.in/yaml/v2 v2.4.3 // indirect
118+
golang.org/x/net v0.48.0 // indirect
119+
golang.org/x/oauth2 v0.34.0 // indirect
120+
golang.org/x/sys v0.40.0 // indirect
121+
golang.org/x/text v0.33.0 // indirect
122+
golang.org/x/time v0.14.0 // indirect
114123
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
115-
google.golang.org/api v0.197.0 // indirect
116-
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
117-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
118-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
124+
google.golang.org/api v0.256.0 // indirect
125+
google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 // indirect
126+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
119128
gopkg.in/DataDog/dd-trace-go.v1 v1.32.0 // indirect
120129
)
121130

0 commit comments

Comments
 (0)