Skip to content

Commit fe4d20e

Browse files
matthewmcneelymatthewmcneely
authored
chore: update go version and new deps (#9668)
**Description** This PR updates our go build to 1.26.1 This marks the first Dgraph build with the new "greentea" garbage collector. **Checklist** - [x] The PR title follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) syntax, leading with `fix:`, `feat:`, `chore:`, `ci:`, etc.
1 parent c51b717 commit fe4d20e

8 files changed

Lines changed: 177 additions & 192 deletions

File tree

‎.trunk/trunk.yaml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ cli:
88
plugins:
99
sources:
1010
- id: trunk
11-
ref: v1.7.2
11+
ref: v1.7.6
1212
uri: https://github.com/trunk-io/plugins
1313

1414
# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
1515
runtimes:
1616
enabled:
17-
- [email protected]
1817
- [email protected]
1918
- [email protected]
19+
- [email protected]
2020

2121
# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
2222
lint:
@@ -26,25 +26,26 @@ lint:
2626
- contrib/**
2727
- protos/pb/pb.pb.go
2828
enabled:
29-
- [email protected]
30-
- [email protected]
29+
- [email protected]
30+
- [email protected]
31+
- [email protected]
3132
- [email protected]
32-
- [email protected].7
33-
- [email protected].467
33+
- [email protected].11
34+
- [email protected].513
3435
- [email protected]
3536
- git-diff-check
3637
- [email protected]
37-
- hadolint@2.12.1-beta
38-
- markdownlint@0.45.0
39-
- osv-scanner@2.2.2
40-
- oxipng@9.1.5
41-
- prettier@3.6.2
42-
- renovate@41.91.3
38+
- hadolint@2.14.0
39+
- markdownlint@0.48.0
40+
- osv-scanner@2.3.5
41+
- oxipng@10.1.0
42+
- prettier@3.8.1
43+
- renovate@43.95.0
4344
- [email protected]
4445
- [email protected]
45-
- tflint@0.59.1
46-
- trufflehog@3.90.5
47-
- yamllint@1.37.1
46+
- tflint@0.61.0
47+
- trufflehog@3.94.1
48+
- yamllint@1.38.0
4849
actions:
4950
enabled:
5051
- trunk-announce

‎chunker/rdf_state.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func lexText(l *lex.Lexer) lex.StateFn {
147147
// Assumes that caller has consumed initial '<'
148148
func lexIRIRef(l *lex.Lexer, styp lex.ItemType, sfn lex.StateFn) lex.StateFn {
149149
if err := lex.IRIRef(l, styp); err != nil {
150-
return l.Errorf(err.Error())
150+
return l.Errorf("%s", err.Error())
151151
}
152152
return sfn
153153
}
@@ -384,7 +384,7 @@ forLoop:
384384
return nil
385385
case r == quote:
386386
if err := l.LexQuotedString(); err != nil {
387-
return l.Errorf(err.Error())
387+
return l.Errorf("%s", err.Error())
388388
}
389389
l.Emit(itemText)
390390
default:

‎dql/state.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func lexContent(l *lex.Lexer, leftRune, rightRune rune, returnTo lex.StateFn) le
131131
return l.Errorf("Matching brackets not found")
132132
case quote:
133133
if err := l.LexQuotedString(); err != nil {
134-
return l.Errorf(err.Error())
134+
return l.Errorf("%s", err.Error())
135135
}
136136
case leftRune:
137137
depth++
@@ -291,7 +291,7 @@ func lexFuncOrArg(l *lex.Lexer) lex.StateFn {
291291
{
292292
empty = false
293293
if err := l.LexQuotedString(); err != nil {
294-
return l.Errorf(err.Error())
294+
return l.Errorf("%s", err.Error())
295295
}
296296
l.Emit(itemName)
297297
}
@@ -452,7 +452,7 @@ func lexQuery(l *lex.Lexer) lex.StateFn {
452452

453453
func lexIRIRef(l *lex.Lexer) lex.StateFn {
454454
if err := lex.IRIRef(l, itemName); err != nil {
455-
return l.Errorf(err.Error())
455+
return l.Errorf("%s", err.Error())
456456
}
457457
return l.Mode
458458
}

‎go.mod‎

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
module github.com/dgraph-io/dgraph/v25
22

3-
go 1.25.7
3+
go 1.26.1
44

55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.2
77
github.com/HdrHistogram/hdrhistogram-go v1.2.0
8-
github.com/IBM/sarama v1.46.3
8+
github.com/IBM/sarama v1.47.0
99
github.com/Masterminds/semver/v3 v3.4.0
1010
github.com/blevesearch/bleve/v2 v2.5.7
11-
github.com/dgraph-io/badger/v4 v4.9.0
11+
github.com/dgraph-io/badger/v4 v4.9.1
1212
github.com/dgraph-io/dgo/v250 v250.0.0
1313
github.com/dgraph-io/gqlgen v0.13.2
1414
github.com/dgraph-io/gqlparser/v2 v2.2.2
1515
github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15
16-
github.com/dgraph-io/ristretto/v2 v2.3.0
16+
github.com/dgraph-io/ristretto/v2 v2.4.0
1717
github.com/dgraph-io/simdjson-go v0.3.0
1818
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da
1919
github.com/dgryski/go-groupvarint v0.0.0-20230630160417-2bfb7969fb3c
@@ -22,19 +22,19 @@ require (
2222
github.com/dustin/go-humanize v1.0.1
2323
github.com/go-jose/go-jose/v4 v4.1.3
2424
github.com/go-sql-driver/mysql v1.9.3
25-
github.com/golang-jwt/jwt/v5 v5.3.0
26-
github.com/golang/geo v0.0.0-20251229110840-fd652594c94c
25+
github.com/golang-jwt/jwt/v5 v5.3.1
26+
github.com/golang/geo v0.0.0-20260302211937-87f5a40ea07a
2727
github.com/golang/glog v1.2.5
2828
github.com/golang/snappy v1.0.0
2929
github.com/google/codesearch v1.2.0
3030
github.com/google/go-cmp v0.7.0
3131
github.com/google/uuid v1.6.0
3232
github.com/gorilla/websocket v1.5.3
3333
github.com/graph-gophers/graphql-go v1.8.0
34-
github.com/hashicorp/vault/api v1.22.0
35-
github.com/klauspost/compress v1.18.2
36-
github.com/mark3labs/mcp-go v0.43.2
37-
github.com/minio/minio-go/v7 v7.0.98
34+
github.com/hashicorp/vault/api v1.23.0
35+
github.com/klauspost/compress v1.18.5
36+
github.com/mark3labs/mcp-go v0.46.0
37+
github.com/minio/minio-go/v7 v7.0.99
3838
github.com/paulmach/go.geojson v1.5.0
3939
github.com/pkg/errors v0.9.1
4040
github.com/pkg/profile v1.7.0
@@ -48,44 +48,42 @@ require (
4848
github.com/twpayne/go-geom v1.6.1
4949
github.com/viterin/vek v0.4.3
5050
github.com/xdg/scram v1.0.5
51-
go.etcd.io/etcd/raft/v3 v3.5.26
51+
go.etcd.io/etcd/raft/v3 v3.5.28
5252
go.opencensus.io v0.24.0
53-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0
54-
go.opentelemetry.io/contrib/zpages v0.64.0
55-
go.opentelemetry.io/otel v1.40.0
56-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0
57-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0
58-
go.opentelemetry.io/otel/sdk v1.40.0
59-
go.opentelemetry.io/otel/trace v1.40.0
53+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0
54+
go.opentelemetry.io/contrib/zpages v0.67.0
55+
go.opentelemetry.io/otel v1.42.0
56+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0
57+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0
58+
go.opentelemetry.io/otel/sdk v1.42.0
59+
go.opentelemetry.io/otel/trace v1.42.0
6060
go.uber.org/zap v1.27.1
61-
golang.org/x/crypto v0.47.0
62-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
63-
golang.org/x/mod v0.32.0
64-
golang.org/x/net v0.49.0
65-
golang.org/x/sync v0.19.0
66-
golang.org/x/sys v0.40.0
67-
golang.org/x/term v0.39.0
68-
golang.org/x/text v0.33.0
69-
golang.org/x/tools v0.41.0
70-
google.golang.org/grpc v1.78.0
61+
golang.org/x/crypto v0.49.0
62+
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90
63+
golang.org/x/mod v0.34.0
64+
golang.org/x/net v0.52.0
65+
golang.org/x/sync v0.20.0
66+
golang.org/x/sys v0.42.0
67+
golang.org/x/term v0.41.0
68+
golang.org/x/text v0.35.0
69+
golang.org/x/tools v0.43.0
70+
google.golang.org/grpc v1.79.3
7171
google.golang.org/protobuf v1.36.11
7272
gopkg.in/yaml.v3 v3.0.1
7373
)
7474

7575
require (
76-
filippo.io/edwards25519 v1.1.1 // indirect
76+
filippo.io/edwards25519 v1.2.0 // indirect
7777
github.com/Microsoft/go-winio v0.6.2 // indirect
7878
github.com/agnivade/levenshtein v1.2.1 // indirect
79-
github.com/bahlo/generic-list-go v0.2.0 // indirect
8079
github.com/beorn7/perks v1.0.1 // indirect
8180
github.com/bits-and-blooms/bitset v1.24.4 // indirect
82-
github.com/blevesearch/bleve_index_api v1.3.0 // indirect
83-
github.com/blevesearch/geo v0.2.4 // indirect
81+
github.com/blevesearch/bleve_index_api v1.3.5 // indirect
82+
github.com/blevesearch/geo v0.2.5 // indirect
8483
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
8584
github.com/blevesearch/segment v0.9.1 // indirect
8685
github.com/blevesearch/snowballstem v0.9.0 // indirect
8786
github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
88-
github.com/buger/jsonparser v1.1.1 // indirect
8987
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
9088
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
9189
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -97,7 +95,6 @@ require (
9795
github.com/distribution/reference v0.6.0 // indirect
9896
github.com/docker/go-units v0.5.0 // indirect
9997
github.com/eapache/go-resiliency v1.7.0 // indirect
100-
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
10198
github.com/eapache/queue v1.1.0 // indirect
10299
github.com/felixge/fgprof v0.9.5 // indirect
103100
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -110,8 +107,9 @@ require (
110107
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
111108
github.com/golang/protobuf v1.5.4 // indirect
112109
github.com/google/flatbuffers v25.12.19+incompatible // indirect
113-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
114-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
110+
github.com/google/jsonschema-go v0.4.2 // indirect
111+
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
112+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
115113
github.com/hashicorp/errwrap v1.1.0 // indirect
116114
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
117115
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -123,7 +121,6 @@ require (
123121
github.com/hashicorp/go-uuid v1.0.3 // indirect
124122
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
125123
github.com/inconshreveable/mousetrap v1.1.0 // indirect
126-
github.com/invopop/jsonschema v0.13.0 // indirect
127124
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
128125
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
129126
github.com/jcmturner/gofork v1.7.6 // indirect
@@ -132,7 +129,6 @@ require (
132129
github.com/json-iterator/go v1.1.12 // indirect
133130
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
134131
github.com/klauspost/crc32 v1.3.0 // indirect
135-
github.com/mailru/easyjson v0.9.1 // indirect
136132
github.com/minio/crc64nvme v1.1.1 // indirect
137133
github.com/minio/md5-simd v1.1.2 // indirect
138134
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -146,14 +142,14 @@ require (
146142
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
147143
github.com/opencontainers/go-digest v1.0.0 // indirect
148144
github.com/opencontainers/image-spec v1.1.1 // indirect
149-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
145+
github.com/pelletier/go-toml/v2 v2.3.0 // indirect
150146
github.com/philhofer/fwd v1.2.0 // indirect
151-
github.com/pierrec/lz4/v4 v4.1.23 // indirect
147+
github.com/pierrec/lz4/v4 v4.1.26 // indirect
152148
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
153149
github.com/prometheus/client_model v0.6.2 // indirect
154150
github.com/prometheus/common v0.67.5 // indirect
155-
github.com/prometheus/procfs v0.19.2 // indirect
156-
github.com/prometheus/statsd_exporter v0.28.0 // indirect
151+
github.com/prometheus/procfs v0.20.1 // indirect
152+
github.com/prometheus/statsd_exporter v0.29.0 // indirect
157153
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
158154
github.com/rs/xid v1.6.0 // indirect
159155
github.com/ryanuber/go-glob v1.0.0 // indirect
@@ -162,19 +158,17 @@ require (
162158
github.com/subosito/gotenv v1.6.0 // indirect
163159
github.com/tinylib/msgp v1.6.3 // indirect
164160
github.com/viterin/partial v1.1.0 // indirect
165-
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
166161
github.com/xdg/stringprep v1.0.3 // indirect
167162
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
168163
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
169-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
170-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
171-
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
164+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
165+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
166+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
172167
go.uber.org/multierr v1.11.0 // indirect
173-
go.yaml.in/yaml/v2 v2.4.3 // indirect
168+
go.yaml.in/yaml/v2 v2.4.4 // indirect
174169
go.yaml.in/yaml/v3 v3.0.4 // indirect
175-
golang.org/x/time v0.14.0 // indirect
176-
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
177-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect
178-
gopkg.in/yaml.v2 v2.4.0 // indirect
170+
golang.org/x/time v0.15.0 // indirect
171+
google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7 // indirect
172+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
179173
gotest.tools/v3 v3.5.2 // indirect
180174
)

0 commit comments

Comments
 (0)