diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 366ab43f..c563a7f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,10 +23,10 @@ jobs: - name: checkout uses: actions/checkout@v3 - - name: setup go 1.20 + - name: setup go 1.22 uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.22' - name: Deps run: | diff --git a/Dockerfile b/Dockerfile index a70bf5d3..41bd9c85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine +FROM golang:1.22-alpine ENV SRC github.com/segmentio/ctlstore ARG VERSION diff --git a/go.mod b/go.mod index 3f30cf49..c8e8df65 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/segmentio/ctlstore -go 1.20 +go 1.22.0 + +toolchain go1.23.4 require ( github.com/AlekSi/pointer v1.0.0 @@ -10,7 +12,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5 github.com/fsnotify/fsnotify v1.5.1 github.com/go-sql-driver/mysql v1.4.1 - github.com/google/go-cmp v0.5.8 + github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.1.2 github.com/gorilla/mux v1.7.3 github.com/julienschmidt/httprouter v1.2.0 @@ -21,9 +23,9 @@ require ( github.com/segmentio/errors-go v1.0.0 github.com/segmentio/events/v2 v2.3.2 github.com/segmentio/go-sqlite3 v1.14.22-segment - github.com/segmentio/stats/v4 v4.6.2 - github.com/stretchr/testify v1.8.1 - golang.org/x/sync v0.6.0 + github.com/segmentio/stats/v5 v5.3.1 + github.com/stretchr/testify v1.8.4 + golang.org/x/sync v0.10.0 ) require ( @@ -45,17 +47,20 @@ require ( github.com/aws/smithy-go v1.14.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/mdlayher/genetlink v0.0.0-20190313224034-60417448a851 // indirect - github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c // indirect - github.com/mdlayher/taskstats v0.0.0-20190313225729-7cbba52ee072 // indirect + github.com/josharian/native v1.1.0 // indirect + github.com/mdlayher/genetlink v1.3.2 // indirect + github.com/mdlayher/netlink v1.7.2 // indirect + github.com/mdlayher/socket v0.5.1 // indirect + github.com/mdlayher/taskstats v0.0.0-20241218144709-977b30d474ce // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e // indirect + github.com/segmentio/fasthash v1.0.3 // indirect github.com/segmentio/go-snakecase v1.1.0 // indirect github.com/segmentio/objconv v1.0.1 // indirect - golang.org/x/mod v0.15.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/tools v0.29.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/mold.v2 v2.2.0 // indirect diff --git a/go.sum b/go.sum index a6c71331..713e806b 100644 --- a/go.sum +++ b/go.sum @@ -56,12 +56,12 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= @@ -71,6 +71,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= +github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -78,12 +80,14 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1 h1:hZD/8vBuw7x1WqRXD/WGjVjipbbo/HcDBgySYYbrUSk= github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1/go.mod h1:DK1Cjkc0E49ShgRVs5jy5ASrM15svSnem3K/hiSGD8o= -github.com/mdlayher/genetlink v0.0.0-20190313224034-60417448a851 h1:QYJTEbSDJvDBQenHYMxoiBQPgZ4QUcm75vACe3dkW7o= -github.com/mdlayher/genetlink v0.0.0-20190313224034-60417448a851/go.mod h1:EsbsAEUEs15qC1cosAwxgCWV0Qhd8TmkxnA9Kw1Vhl4= -github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c h1:qYXI+3AN4zBWsTF5drEu1akWPu2juaXPs58tZ4/GaCg= -github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/taskstats v0.0.0-20190313225729-7cbba52ee072 h1:7YEPiUVGht4ZVgzzTtfC36BHmyd5+++j+FKucC+zxXU= -github.com/mdlayher/taskstats v0.0.0-20190313225729-7cbba52ee072/go.mod h1:sGdS7A6CAETR53zkdjGkgoFlh1vSm7MtX+i8XfEsTMA= +github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw= +github.com/mdlayher/genetlink v1.3.2/go.mod h1:tcC3pkCrPUGIKKsCsp0B3AdaaKuHtaxoJRz3cc+528o= +github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= +github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= +github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos= +github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ= +github.com/mdlayher/taskstats v0.0.0-20241218144709-977b30d474ce h1:IbVlJ25doaGn30HkfShedgDsRxCHTwQY8RO53ZXf5AQ= +github.com/mdlayher/taskstats v0.0.0-20241218144709-977b30d474ce/go.mod h1:0gPvvNyurVKWZFI09u1YSPCqhSnj6QwlwEijSrHXYag= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -107,35 +111,29 @@ github.com/segmentio/errors-go v1.0.0 h1:B4mbo4hP3+XffV1GhwyAcHlvWoZtYdTyc3BOVPx github.com/segmentio/errors-go v1.0.0/go.mod h1:RDVEREUrpa4/jM8rt5KsQpu+JoXPi6i07vG7m4tX0MY= github.com/segmentio/events/v2 v2.3.2 h1:J73yVqYtnLWZD3Oqef82fYPZhfpRfQGiOvBes+OohoY= github.com/segmentio/events/v2 v2.3.2/go.mod h1:9HY7dFOCKoPQx3hUBXYim6I4hqaZWtSGWJ4IYAMxtkM= -github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e h1:uO75wNGioszjmIzcY/tvdDYKRLVvzggtAmmJkn9j4GQ= -github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e/go.mod h1:tm/wZFQ8e24NYaBGIlnO2WGCAi67re4HHuOm0sftE/M= +github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= +github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/go-snakecase v1.1.0 h1:ZJO4SNKKV0MjGOv0LHnixxN5FYv1JKBnVXEuBpwcbQI= github.com/segmentio/go-snakecase v1.1.0/go.mod h1:jk1miR5MS7Na32PZUykG89Arm+1BUSYhuGR6b7+hJto= github.com/segmentio/go-sqlite3 v1.14.22-segment h1:CMV8jocJ3GqK5ALeFatw5lXANJpusyGAbLMmRWGb61I= github.com/segmentio/go-sqlite3 v1.14.22-segment/go.mod h1:XD2URsGK8aqqwao9zj/8f/OuOEiFWP45GguwGM906mc= github.com/segmentio/objconv v1.0.1 h1:QjfLzwriJj40JibCV3MGSEiAoXixbp4ybhwfTB8RXOM= github.com/segmentio/objconv v1.0.1/go.mod h1:auayaH5k3137Cl4SoXTgrzQcuQDmvuVtZgS0fb1Ahys= -github.com/segmentio/stats/v4 v4.6.2 h1:++YfKPTOPTZxE1DvavnpeBvB3hlDIm7IM+ULFzbCxCU= -github.com/segmentio/stats/v4 v4.6.2/go.mod h1:gycE91tyiQw6xg3MT674cVi+CfQ69qHsoNNhXG0C7YQ= -github.com/segmentio/vpcinfo v0.1.10/go.mod h1:KEIWiWRE/KLh90mOzOY0QkFWT7ObUYLp978tICtquqU= +github.com/segmentio/stats/v5 v5.3.1 h1:wc3KetgSLvlfAJWJmuJ1idTDGU16t4XYpvtSCRC3WQ8= +github.com/segmentio/stats/v5 v5.3.1/go.mod h1:phiq1Eg25H3GPE1KHNWSirwrt6ArkVlvmF7eWDRPrMU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= +golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -143,16 +141,15 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -162,19 +159,20 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -199,11 +197,9 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 h1:WB265cn5OpO+hK3pikC9hpP1zI/KTwmyMFKloW9eOVc= gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/initialize.go b/initialize.go index 4d6a41a4..d617e782 100644 --- a/initialize.go +++ b/initialize.go @@ -4,7 +4,7 @@ import ( "context" "github.com/segmentio/ctlstore/pkg/globalstats" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) type Config struct { diff --git a/ldb_reader.go b/ldb_reader.go index ef70e411..f1b311d5 100644 --- a/ldb_reader.go +++ b/ldb_reader.go @@ -13,7 +13,7 @@ import ( "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/globalstats" diff --git a/ldb_rotating_reader.go b/ldb_rotating_reader.go index d32e3a45..c32805b3 100644 --- a/ldb_rotating_reader.go +++ b/ldb_rotating_reader.go @@ -8,7 +8,7 @@ import ( "github.com/segmentio/ctlstore/pkg/globalstats" "github.com/segmentio/ctlstore/pkg/ldb" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "path" "strconv" "sync/atomic" diff --git a/pkg/cmd/ctlstore/main.go b/pkg/cmd/ctlstore/main.go index 31bbb99a..e22829c2 100644 --- a/pkg/cmd/ctlstore/main.go +++ b/pkg/cmd/ctlstore/main.go @@ -18,10 +18,10 @@ import ( "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" _ "github.com/segmentio/events/v2/sigevents" - "github.com/segmentio/stats/v4" - "github.com/segmentio/stats/v4/datadog" - "github.com/segmentio/stats/v4/procstats" - "github.com/segmentio/stats/v4/prometheus" + "github.com/segmentio/stats/v5" + "github.com/segmentio/stats/v5/datadog" + "github.com/segmentio/stats/v5/procstats" + "github.com/segmentio/stats/v5/prometheus" "github.com/segmentio/ctlstore" "github.com/segmentio/ctlstore/pkg/ctldb" diff --git a/pkg/errs/errs.go b/pkg/errs/errs.go index 859b2610..a1dc99df 100644 --- a/pkg/errs/errs.go +++ b/pkg/errs/errs.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/segmentio/errors-go" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) const ( diff --git a/pkg/event/changelog.go b/pkg/event/changelog.go index eca611f8..3602c7fa 100644 --- a/pkg/event/changelog.go +++ b/pkg/event/changelog.go @@ -14,7 +14,7 @@ import ( "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) type ( diff --git a/pkg/executive/db_limiter.go b/pkg/executive/db_limiter.go index 4fcb1cff..acce9ecd 100644 --- a/pkg/executive/db_limiter.go +++ b/pkg/executive/db_limiter.go @@ -12,7 +12,7 @@ import ( "github.com/segmentio/ctlstore/pkg/schema" "github.com/segmentio/ctlstore/pkg/utils" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) const ( diff --git a/pkg/executive/dml_ledger_writer.go b/pkg/executive/dml_ledger_writer.go index 21c5b40b..6e571040 100644 --- a/pkg/executive/dml_ledger_writer.go +++ b/pkg/executive/dml_ledger_writer.go @@ -7,7 +7,7 @@ import ( "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/schema" "github.com/segmentio/ctlstore/pkg/sqlgen" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) // Writes DML entries to log table within an existing transaction. Make diff --git a/pkg/executive/executive_endpoint.go b/pkg/executive/executive_endpoint.go index f0090fe0..509ad855 100644 --- a/pkg/executive/executive_endpoint.go +++ b/pkg/executive/executive_endpoint.go @@ -10,7 +10,7 @@ import ( "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/limits" "github.com/segmentio/ctlstore/pkg/schema" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/gorilla/mux" "github.com/pkg/errors" diff --git a/pkg/executive/executive_service.go b/pkg/executive/executive_service.go index e54c4b9f..40368e2b 100644 --- a/pkg/executive/executive_service.go +++ b/pkg/executive/executive_service.go @@ -17,7 +17,7 @@ import ( "github.com/segmentio/ctlstore/pkg/limits" "github.com/segmentio/ctlstore/pkg/utils" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) type ExecutiveService interface { diff --git a/pkg/executive/table_sizer.go b/pkg/executive/table_sizer.go index a787ee91..b0808acc 100644 --- a/pkg/executive/table_sizer.go +++ b/pkg/executive/table_sizer.go @@ -13,7 +13,7 @@ import ( "github.com/segmentio/ctlstore/pkg/schema" "github.com/segmentio/ctlstore/pkg/utils" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) const ( diff --git a/pkg/globalstats/stats.go b/pkg/globalstats/stats.go index 7a895572..35f78e14 100644 --- a/pkg/globalstats/stats.go +++ b/pkg/globalstats/stats.go @@ -12,7 +12,7 @@ import ( "github.com/segmentio/ctlstore/pkg/version" "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) const ( diff --git a/pkg/globalstats/stats_test.go b/pkg/globalstats/stats_test.go index bdc2b3cd..eb3898ac 100644 --- a/pkg/globalstats/stats_test.go +++ b/pkg/globalstats/stats_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/stretchr/testify/require" ) diff --git a/pkg/ldbwriter/ldb_writer.go b/pkg/ldbwriter/ldb_writer.go index a3dfe84f..d5d751a9 100644 --- a/pkg/ldbwriter/ldb_writer.go +++ b/pkg/ldbwriter/ldb_writer.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/pkg/errors" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/ldb" diff --git a/pkg/ledger/ledger_monitor.go b/pkg/ledger/ledger_monitor.go index 4354609d..43b80eb2 100644 --- a/pkg/ledger/ledger_monitor.go +++ b/pkg/ledger/ledger_monitor.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/ecs" "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/utils" diff --git a/pkg/reflector/dml_source.go b/pkg/reflector/dml_source.go index fc3879ec..3c4cd36a 100644 --- a/pkg/reflector/dml_source.go +++ b/pkg/reflector/dml_source.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/segmentio/ctlstore/pkg/schema" "github.com/segmentio/ctlstore/pkg/sqlgen" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) const ( diff --git a/pkg/reflector/download.go b/pkg/reflector/download.go index 7e7f958f..0813db20 100644 --- a/pkg/reflector/download.go +++ b/pkg/reflector/download.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/segmentio/ctlstore/pkg/errs" ) diff --git a/pkg/reflector/reflector.go b/pkg/reflector/reflector.go index 71fdaaaa..a85bd4e1 100644 --- a/pkg/reflector/reflector.go +++ b/pkg/reflector/reflector.go @@ -28,7 +28,7 @@ import ( "github.com/segmentio/events/v2" _ "github.com/segmentio/events/v2/log" // lets events actually log - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) // Reflector represents a fully materialized reflector, which polls an diff --git a/pkg/reflector/reflector_ctl.go b/pkg/reflector/reflector_ctl.go index bfb35817..c30be76e 100644 --- a/pkg/reflector/reflector_ctl.go +++ b/pkg/reflector/reflector_ctl.go @@ -9,7 +9,7 @@ import ( "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/utils" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) const ( diff --git a/pkg/reflector/shovel.go b/pkg/reflector/shovel.go index a2b8d628..f3e7ede4 100644 --- a/pkg/reflector/shovel.go +++ b/pkg/reflector/shovel.go @@ -10,7 +10,7 @@ import ( "github.com/segmentio/ctlstore/pkg/schema" "github.com/segmentio/errors-go" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) type shovel struct { diff --git a/pkg/reflector/wal_monitor.go b/pkg/reflector/wal_monitor.go index dfa27b62..fbe1d28c 100644 --- a/pkg/reflector/wal_monitor.go +++ b/pkg/reflector/wal_monitor.go @@ -7,7 +7,7 @@ import ( "time" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/segmentio/ctlstore/pkg/errs" "github.com/segmentio/ctlstore/pkg/ldbwriter" diff --git a/pkg/schema/family_table.go b/pkg/schema/family_table.go index 614696ad..b506fb26 100644 --- a/pkg/schema/family_table.go +++ b/pkg/schema/family_table.go @@ -3,7 +3,7 @@ package schema import ( "strings" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) // FamilyTable composes a family name and a table name diff --git a/pkg/sidecar/sidecar.go b/pkg/sidecar/sidecar.go index b0ba08a3..dc42d135 100644 --- a/pkg/sidecar/sidecar.go +++ b/pkg/sidecar/sidecar.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/mux" "github.com/segmentio/ctlstore" "github.com/segmentio/errors-go" - "github.com/segmentio/stats/v4" - "github.com/segmentio/stats/v4/httpstats" + "github.com/segmentio/stats/v5" + "github.com/segmentio/stats/v5/httpstats" ) type ( diff --git a/pkg/supervisor/archived_snapshot.go b/pkg/supervisor/archived_snapshot.go index bd5ace73..0e98da1b 100644 --- a/pkg/supervisor/archived_snapshot.go +++ b/pkg/supervisor/archived_snapshot.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/pkg/errors" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" "github.com/segmentio/ctlstore/pkg/utils" ) diff --git a/pkg/supervisor/supervisor.go b/pkg/supervisor/supervisor.go index 05f1e013..61b49a79 100644 --- a/pkg/supervisor/supervisor.go +++ b/pkg/supervisor/supervisor.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/segmentio/ctlstore/pkg/reflector" "github.com/segmentio/events/v2" - "github.com/segmentio/stats/v4" + "github.com/segmentio/stats/v5" ) type Supervisor interface {