Skip to content

Commit 17bc13e

Browse files
ajaysundarkajaysundark
authored
Merge branch 'etcd-io:main' into bump-etcd-golang-toolchain-1.23.5
2 parents 1799f99 + ecd7cfc commit 17bc13e

33 files changed

+330
-194
lines changed

‎CHANGELOG/CHANGELOG-3.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/
1313
- Fix [runtime panic that occurs when KeepAlive is called with a Context implemented by an uncomparable type](https://github.com/etcd-io/etcd/pull/18936)
1414

1515
### Dependencies
16-
- Compile binaries using [go 1.22.10](https://github.com/etcd-io/etcd/pull/19005)
17-
16+
- Compile binaries using [go 1.22.11](https://github.com/etcd-io/etcd/pull/19212)
17+
1818
<hr>
1919

2020
## v3.4.35 (2024-11-12)

‎CHANGELOG/CHANGELOG-3.5.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
2020

2121
### Dependencies
2222
- Bump [golang-jwt/jwt to 4.5.1 to address GO-2024-3250](https://github.com/etcd-io/etcd/pull/18899).
23-
- Compile binaries using [go 1.22.10](https://github.com/etcd-io/etcd/pull/19004).
23+
- Compile binaries using [go 1.22.11](https://github.com/etcd-io/etcd/pull/19211).
2424

2525
<hr>
2626

‎api/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
github.com/golang/protobuf v1.5.4
1111
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
1212
github.com/stretchr/testify v1.10.0
13-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb
14-
google.golang.org/grpc v1.69.2
15-
google.golang.org/protobuf v1.36.1
13+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d
14+
google.golang.org/grpc v1.69.4
15+
google.golang.org/protobuf v1.36.2
1616
)
1717

1818
require (
@@ -24,7 +24,7 @@ require (
2424
golang.org/x/net v0.34.0 // indirect
2525
golang.org/x/sys v0.29.0 // indirect
2626
golang.org/x/text v0.21.0 // indirect
27-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
27+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
2828
gopkg.in/yaml.v3 v3.0.1 // indirect
2929
)
3030

‎api/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
7373
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7474
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7575
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
76-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb h1:B7GIB7sr443wZ/EAEl7VZjmh1V6qzkt5V+RYcUYtS1U=
77-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:E5//3O5ZIG2l71Xnt+P/CYUY8Bxs8E7WMoZ9tlcMbAY=
78-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb h1:3oy2tynMOP1QbTC0MsNNAV+Se8M2Bd0A5+x1QHyw+pI=
79-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
80-
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
81-
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
82-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
83-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
76+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
77+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
78+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
79+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
80+
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
81+
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
82+
google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
83+
google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
8484
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
8585
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
8686
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎client/v3/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
1414
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
1515
go.uber.org/zap v1.27.0
16-
google.golang.org/grpc v1.69.2
16+
google.golang.org/grpc v1.69.4
1717
sigs.k8s.io/yaml v1.4.0
1818
)
1919

@@ -37,9 +37,9 @@ require (
3737
golang.org/x/net v0.34.0 // indirect
3838
golang.org/x/sys v0.29.0 // indirect
3939
golang.org/x/text v0.21.0 // indirect
40-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
41-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
42-
google.golang.org/protobuf v1.36.1 // indirect
40+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
41+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
42+
google.golang.org/protobuf v1.36.2 // indirect
4343
gopkg.in/yaml.v3 v3.0.1 // indirect
4444
)
4545

‎client/v3/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
105105
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
106106
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
107107
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
108-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb h1:B7GIB7sr443wZ/EAEl7VZjmh1V6qzkt5V+RYcUYtS1U=
109-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:E5//3O5ZIG2l71Xnt+P/CYUY8Bxs8E7WMoZ9tlcMbAY=
110-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb h1:3oy2tynMOP1QbTC0MsNNAV+Se8M2Bd0A5+x1QHyw+pI=
111-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
112-
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
113-
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
114-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
115-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
108+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
109+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
112+
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
113+
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
114+
google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
115+
google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
116116
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
117117
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
118118
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎client/v3/snapshot/v3_snapshot.go

+29-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package snapshot
1717
import (
1818
"context"
1919
"crypto/sha256"
20+
"errors"
2021
"fmt"
2122
"io"
2223
"os"
@@ -54,38 +55,58 @@ func SaveWithVersion(ctx context.Context, lg *zap.Logger, cfg clientv3.Config, d
5455
if err != nil {
5556
return "", err
5657
}
57-
defer cli.Close()
58+
defer func() {
59+
err = cli.Close()
60+
if err != nil {
61+
lg.Error("Failed to close client", zap.Error(err))
62+
}
63+
}()
5864

5965
partpath := dbPath + ".part"
60-
defer os.RemoveAll(partpath)
66+
defer func() {
67+
err = os.RemoveAll(partpath)
68+
if err != nil {
69+
lg.Error("Failed to cleanup .part file", zap.Error(err))
70+
}
71+
}()
6172

62-
var f *os.File
63-
f, err = os.OpenFile(partpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fileutil.PrivateFileMode)
73+
f, err := os.OpenFile(partpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fileutil.PrivateFileMode)
6474
if err != nil {
6575
return "", fmt.Errorf("could not open %s (%w)", partpath, err)
6676
}
77+
defer func() {
78+
err = f.Close()
79+
if err != nil && !errors.Is(err, os.ErrClosed) {
80+
lg.Error("Could not close file descriptor", zap.Error(err))
81+
}
82+
}()
6783
lg.Info("created temporary db file", zap.String("path", partpath))
6884

6985
start := time.Now()
7086
resp, err := cli.SnapshotWithVersion(ctx)
7187
if err != nil {
7288
return "", err
7389
}
74-
defer resp.Snapshot.Close()
90+
defer func() {
91+
err = resp.Snapshot.Close()
92+
if err != nil {
93+
lg.Error("Could not close snapshot stream", zap.Error(err))
94+
}
95+
}()
7596
lg.Info("fetching snapshot", zap.String("endpoint", cfg.Endpoints[0]))
7697
var size int64
7798
size, err = io.Copy(f, resp.Snapshot)
7899
if err != nil {
79-
return resp.Version, err
100+
return resp.Version, fmt.Errorf("could not write snapshot: %w", err)
80101
}
81102
if !hasChecksum(size) {
82103
return resp.Version, fmt.Errorf("sha256 checksum not found [bytes: %d]", size)
83104
}
84105
if err = fileutil.Fsync(f); err != nil {
85-
return resp.Version, err
106+
return resp.Version, fmt.Errorf("could not fsync snapshot: %w", err)
86107
}
87108
if err = f.Close(); err != nil {
88-
return resp.Version, err
109+
return resp.Version, fmt.Errorf("could not close file descriptor: %w", err)
89110
}
90111
lg.Info("fetched snapshot",
91112
zap.String("endpoint", cfg.Endpoints[0]),

‎etcdctl/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
1919
go.uber.org/zap v1.27.0
2020
golang.org/x/time v0.9.0
21-
google.golang.org/grpc v1.69.2
21+
google.golang.org/grpc v1.69.4
2222
)
2323

2424
require (
@@ -41,9 +41,9 @@ require (
4141
golang.org/x/net v0.34.0 // indirect
4242
golang.org/x/sys v0.29.0 // indirect
4343
golang.org/x/text v0.21.0 // indirect
44-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
45-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
46-
google.golang.org/protobuf v1.36.1 // indirect
44+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
45+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
46+
google.golang.org/protobuf v1.36.2 // indirect
4747
gopkg.in/yaml.v3 v3.0.1 // indirect
4848
)
4949

‎etcdctl/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
135135
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
136136
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
137137
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
138-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb h1:B7GIB7sr443wZ/EAEl7VZjmh1V6qzkt5V+RYcUYtS1U=
139-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:E5//3O5ZIG2l71Xnt+P/CYUY8Bxs8E7WMoZ9tlcMbAY=
140-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb h1:3oy2tynMOP1QbTC0MsNNAV+Se8M2Bd0A5+x1QHyw+pI=
141-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
142-
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
143-
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
144-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
145-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
138+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
139+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
140+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
142+
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
143+
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
144+
google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
145+
google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
146146
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
147147
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
148148
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎etcdutl/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ require (
7979
go.opentelemetry.io/otel/metric v1.33.0 // indirect
8080
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
8181
go.opentelemetry.io/otel/trace v1.33.0 // indirect
82-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
82+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8383
go.uber.org/multierr v1.11.0 // indirect
8484
golang.org/x/crypto v0.32.0 // indirect
8585
golang.org/x/net v0.34.0 // indirect
8686
golang.org/x/sys v0.29.0 // indirect
8787
golang.org/x/text v0.21.0 // indirect
8888
golang.org/x/time v0.9.0 // indirect
89-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
90-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
91-
google.golang.org/grpc v1.69.2 // indirect
92-
google.golang.org/protobuf v1.36.1 // indirect
89+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
91+
google.golang.org/grpc v1.69.4 // indirect
92+
google.golang.org/protobuf v1.36.2 // indirect
9393
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9494
gopkg.in/yaml.v3 v3.0.1 // indirect
9595
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect

‎etcdutl/go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4Jjx
118118
go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
119119
go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
120120
go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
121-
go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
122-
go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
121+
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
122+
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
123123
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
124124
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
125125
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -165,14 +165,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
165165
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
166166
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
167167
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
168-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb h1:B7GIB7sr443wZ/EAEl7VZjmh1V6qzkt5V+RYcUYtS1U=
169-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:E5//3O5ZIG2l71Xnt+P/CYUY8Bxs8E7WMoZ9tlcMbAY=
170-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb h1:3oy2tynMOP1QbTC0MsNNAV+Se8M2Bd0A5+x1QHyw+pI=
171-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
172-
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
173-
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
174-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
175-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
168+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
169+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
171+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
172+
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
173+
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
174+
google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
175+
google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
176176
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
177177
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
178178
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ require (
3636
go.etcd.io/raft/v3 v3.6.0-beta.0
3737
go.uber.org/zap v1.27.0
3838
golang.org/x/time v0.9.0
39-
google.golang.org/grpc v1.69.2
40-
google.golang.org/protobuf v1.36.1
39+
google.golang.org/grpc v1.69.4
40+
google.golang.org/protobuf v1.36.2
4141
)
4242

4343
require (
@@ -89,14 +89,14 @@ require (
8989
go.opentelemetry.io/otel/metric v1.33.0 // indirect
9090
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
9191
go.opentelemetry.io/otel/trace v1.33.0 // indirect
92-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
92+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
9393
go.uber.org/multierr v1.11.0 // indirect
9494
golang.org/x/crypto v0.32.0 // indirect
9595
golang.org/x/net v0.34.0 // indirect
9696
golang.org/x/sys v0.29.0 // indirect
9797
golang.org/x/text v0.21.0 // indirect
98-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
99-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
98+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
99+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
100100
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
101101
gopkg.in/yaml.v3 v3.0.1 // indirect
102102
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect

0 commit comments

Comments
 (0)