@@ -9,7 +9,7 @@ require (
99 github.com/genjidb/genji v0.13.0
1010 github.com/genjidb/genji/engine/badgerengine v0.13.0
1111 github.com/gin-contrib/pprof v1.3.0
12- github.com/gin-gonic/gin v1.9.1
12+ github.com/gin-gonic/gin v1.10.0
1313 github.com/goccy/go-graphviz v0.0.9
1414 github.com/golang/mock v1.6.0
1515 github.com/golang/protobuf v1.5.3
@@ -24,6 +24,7 @@ require (
2424 github.com/prometheus/client_golang v1.14.0
2525 github.com/prometheus/common v0.39.0
2626 github.com/spf13/pflag v1.0.5
27+ <<<<<<< HEAD
2728 github.com/stretchr/testify v1.8.3
2829 github.com/valyala/gozstd v1.16.0
2930 github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
@@ -36,6 +37,20 @@ require (
3637 go.uber.org/zap v1.24.0
3738 golang.org/x/net v0.17.0
3839 google.golang.org/grpc v1.58.3
40+ =======
41+ github.com/stretchr/testify v1.10.0
42+ github.com/valyala/gozstd v1.16.0
43+ github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
44+ go.etcd.io/etcd/api/v3 v3.5.12
45+ go.etcd.io/etcd/client/pkg/v3 v3.5.12
46+ go.etcd.io/etcd/client/v3 v3.5.12
47+ go.etcd.io/etcd/tests/v3 v3.5.12
48+ go.uber.org/atomic v1.11.0
49+ go.uber.org/goleak v1.3.0
50+ go.uber.org/zap v1.27.0
51+ golang.org/x/net v0.33.0
52+ google.golang.org/grpc v1.62.1
53+ >>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
3954)
4055
4156require (
@@ -49,11 +64,22 @@ require (
4964 github.com/benbjohnson/clock v1.3.0 // indirect
5065 github.com/beorn7/perks v1.0.1 // indirect
5166 github.com/buger/jsonparser v1.1.1 // indirect
67+ <<<<<<< HEAD
5268 github.com/bytedance/sonic v1.9.1 // indirect
5369 github.com/cenkalti/backoff/v4 v4.1.1 // indirect
5470 github.com/cespare/xxhash v1.1.0 // indirect
5571 github.com/cespare/xxhash/v2 v2.2.0 // indirect
5672 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
73+ =======
74+ github.com/bytedance/sonic v1.12.6 // indirect
75+ github.com/bytedance/sonic/loader v0.2.1 // indirect
76+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
77+ github.com/cespare/xxhash v1.1.0 // indirect
78+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
79+ github.com/cloudfoundry/gosigar v1.3.6 // indirect
80+ github.com/cloudwego/base64x v0.1.4 // indirect
81+ github.com/cloudwego/iasm v0.2.0 // indirect
82+ >>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
5783 github.com/cockroachdb/errors v1.8.1 // indirect
5884 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
5985 github.com/cockroachdb/redact v1.0.8 // indirect
@@ -68,6 +94,7 @@ require (
6894 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
6995 github.com/dustin/go-humanize v1.0.0 // indirect
7096 github.com/fogleman/gg v1.3.0 // indirect
97+ <<<<<<< HEAD
7198 github.com/gabriel-vasile/mimetype v1.4.2 // indirect
7299 github.com/gin-contrib/sse v0.1.0 // indirect
73100 github.com/go-ole/go-ole v1.2.6 // indirect
@@ -76,6 +103,18 @@ require (
76103 github.com/go-playground/validator/v10 v10.14.0 // indirect
77104 github.com/go-resty/resty/v2 v2.6.0 // indirect
78105 github.com/goccy/go-json v0.10.2 // indirect
106+ =======
107+ github.com/gabriel-vasile/mimetype v1.4.7 // indirect
108+ github.com/gin-contrib/sse v1.0.0 // indirect
109+ github.com/go-logr/logr v1.4.1 // indirect
110+ github.com/go-logr/stdr v1.2.2 // indirect
111+ github.com/go-ole/go-ole v1.3.0 // indirect
112+ github.com/go-playground/locales v0.14.1 // indirect
113+ github.com/go-playground/universal-translator v0.18.1 // indirect
114+ github.com/go-playground/validator/v10 v10.23.0 // indirect
115+ github.com/go-resty/resty/v2 v2.11.0 // indirect
116+ github.com/goccy/go-json v0.10.4 // indirect
117+ >>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
79118 github.com/gogo/protobuf v1.3.2 // indirect
80119 github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
81120 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
@@ -93,6 +132,7 @@ require (
93132 github.com/joomcode/errorx v1.0.1 // indirect
94133 github.com/jpillora/backoff v1.0.0 // indirect
95134 github.com/json-iterator/go v1.1.12 // indirect
135+ <<<<<<< HEAD
96136 github.com/klauspost/compress v1.15.13 // indirect
97137 github.com/klauspost/cpuid/v2 v2.2.4 // indirect
98138 github.com/kr/pretty v0.3.0 // indirect
@@ -101,11 +141,21 @@ require (
101141 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
102142 github.com/mattn/go-isatty v0.0.19 // indirect
103143 github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
144+ =======
145+ github.com/klauspost/compress v1.17.4 // indirect
146+ github.com/klauspost/cpuid/v2 v2.2.9 // indirect
147+ github.com/kr/pretty v0.3.1 // indirect
148+ github.com/kr/text v0.2.0 // indirect
149+ github.com/leodido/go-urn v1.4.0 // indirect
150+ github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
151+ github.com/mattn/go-isatty v0.0.20 // indirect
152+ >>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
104153 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
105154 github.com/modern-go/reflect2 v1.0.2 // indirect
106155 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
107156 github.com/opentracing/basictracer-go v1.0.0 // indirect
108157 github.com/opentracing/opentracing-go v1.2.0 // indirect
158+ <<<<<<< HEAD
109159 github.com/pelletier/go-toml/v2 v2.0.8 // indirect
110160 github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32 // indirect
111161 github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3 // indirect
@@ -118,6 +168,24 @@ require (
118168 github.com/rogpeppe/go-internal v1.8.0 // indirect
119169 github.com/shirou/gopsutil/v3 v3.22.12 // indirect
120170 github.com/sirupsen/logrus v1.9.0 // indirect
171+ =======
172+ github.com/pelletier/go-toml/v2 v2.2.3 // indirect
173+ github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
174+ github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f // indirect
175+ github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
176+ github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5 // indirect
177+ github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e // indirect
178+ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
179+ github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
180+ github.com/prometheus/client_model v0.6.0 // indirect
181+ github.com/prometheus/procfs v0.13.0 // indirect
182+ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
183+ github.com/rogpeppe/go-internal v1.11.0 // indirect
184+ github.com/sasha-s/go-deadlock v0.3.1 // indirect
185+ github.com/shirou/gopsutil/v3 v3.24.2 // indirect
186+ github.com/shoenig/go-m1cpu v0.1.6 // indirect
187+ github.com/sirupsen/logrus v1.9.3 // indirect
188+ >>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
121189 github.com/soheilhy/cmux v0.1.5 // indirect
122190 github.com/stathat/consistent v1.0.0 // indirect
123191 github.com/stretchr/objx v0.5.0 // indirect
@@ -132,7 +200,7 @@ require (
132200 github.com/twmb/murmur3 v1.1.3 // indirect
133201 github.com/uber/jaeger-client-go v2.28.0+incompatible // indirect
134202 github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
135- github.com/ugorji/go/codec v1.2.11 // indirect
203+ github.com/ugorji/go/codec v1.2.12 // indirect
136204 github.com/valyala/bytebufferpool v1.0.0 // indirect
137205 github.com/valyala/fastjson v1.6.3 // indirect
138206 github.com/valyala/fastrand v1.1.0 // indirect
@@ -149,6 +217,7 @@ require (
149217 go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
150218 go.etcd.io/etcd/server/v3 v3.5.7 // indirect
151219 go.opencensus.io v0.24.0 // indirect
220+ <<<<<<< HEAD
152221 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
153222 go.opentelemetry.io/otel v1.0.1 // indirect
154223 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
@@ -172,6 +241,32 @@ require (
172241 google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
173242 google.golang.org/protobuf v1.31.0 // indirect
174243 gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
244+ =======
245+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
246+ go.opentelemetry.io/otel v1.22.0 // indirect
247+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
248+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
249+ go.opentelemetry.io/otel/metric v1.22.0 // indirect
250+ go.opentelemetry.io/otel/sdk v1.22.0 // indirect
251+ go.opentelemetry.io/otel/trace v1.22.0 // indirect
252+ go.opentelemetry.io/proto/otlp v1.1.0 // indirect
253+ go.uber.org/multierr v1.11.0 // indirect
254+ golang.org/x/arch v0.12.0 // indirect
255+ golang.org/x/crypto v0.31.0 // indirect
256+ golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
257+ golang.org/x/image v0.5.0 // indirect
258+ golang.org/x/oauth2 v0.18.0 // indirect
259+ golang.org/x/sync v0.10.0 // indirect
260+ golang.org/x/sys v0.28.0 // indirect
261+ golang.org/x/text v0.21.0 // indirect
262+ golang.org/x/time v0.5.0 // indirect
263+ google.golang.org/appengine v1.6.8 // indirect
264+ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
265+ google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
266+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 // indirect
267+ google.golang.org/protobuf v1.36.1 // indirect
268+ gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
269+ >>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
175270 gopkg.in/yaml.v2 v2.4.0 // indirect
176271 gopkg.in/yaml.v3 v3.0.1 // indirect
177272 sigs.k8s.io/yaml v1.3.0 // indirect
0 commit comments