diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index eb2e5d4..18febb6 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: - go-version: 1.20.1 + go-version: 1.24.11 - name: build env: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b85d65c..1201c6e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: - go-version: 1.20.1 + go-version: 1.24.11 - name: build env: diff --git a/go.mod b/go.mod index cb4e6ea..5157d59 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,17 @@ module github.com/vesoft-inc/k6-plugin -go 1.19 +go 1.24.0 + +toolchain go1.24.11 require ( github.com/go-echarts/go-echarts/v2 v2.2.4 github.com/kelseyhightower/envconfig v1.4.0 github.com/sirupsen/logrus v1.9.0 github.com/spf13/cobra v1.4.0 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.4 github.com/vesoft-inc/nebula-go/v3 v3.6.1 + github.com/vesoft-inc/nebula-go/v5 v5.2.1-0.20251219041427-39b1ee6affa7 go.k6.io/k6 v0.45.1 ) @@ -18,6 +21,7 @@ require ( github.com/dop251/goja v0.0.0-20230531210528-d7324b2d74f7 // indirect github.com/fatih/color v1.15.0 // indirect github.com/go-sourcemap/sourcemap v2.1.4-0.20211119122758-180fcef48034+incompatible // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -27,15 +31,19 @@ require ( github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd // indirect github.com/onsi/ginkgo v1.16.5 // indirect github.com/onsi/gomega v1.27.10 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e // indirect github.com/spf13/afero v1.1.2 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vesoft-inc/fbthrift v0.0.0-20230214024353-fa2f34755b28 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.3.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect + google.golang.org/grpc v1.66.2 // indirect + google.golang.org/protobuf v1.36.10 // indirect gopkg.in/guregu/null.v3 v3.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 53f4a74..aeae524 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,5 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic= github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -21,6 +22,7 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/go-echarts/go-echarts/v2 v2.2.4 h1:SKJpdyNIyD65XjbUZjzg6SwccTNXEgmh+PlaO23g2H0= github.com/go-echarts/go-echarts/v2 v2.2.4/go.mod h1:6TOomEztzGDVDkOSCFBq3ed7xOYfbOqhaBzD0YV771A= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= @@ -34,14 +36,17 @@ 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.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= 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.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U= github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -51,10 +56,12 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -67,9 +74,11 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mccutchen/go-httpbin v1.1.2-0.20190116014521-c5cb2f4802fa h1:lx8ZnNPwjkXSzOROz0cg69RlErRXs+L3eDkggASWKLo= +github.com/mccutchen/go-httpbin v1.1.2-0.20190116014521-c5cb2f4802fa/go.mod h1:fhpOYavp5g2K74XDl/ao2y4KvhqVtKlkg1e+0UaQv7I= github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd h1:AC3N94irbx2kWGA8f/2Ks7EQl2LxKIRQYuT9IJDwgiI= github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd/go.mod h1:9vRHVuLCjoFfE3GT06X0spdOAO+Zzo4AMjdIwUHBvAk= github.com/mstoykov/envconfig v1.4.1-0.20220114105314-765c6d8c76f1 h1:94EkGmhXrVUEal+uLwFUf4fMXPhZpM5tYxuIsxrCCbI= +github.com/mstoykov/envconfig v1.4.1-0.20220114105314-765c6d8c76f1/go.mod h1:vk/d9jpexY2Z9Bb0uB4Ndesss1Sr0Z9ZiGUrg5o9VGk= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -81,10 +90,13 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e h1:zWKUYT07mGmVBH+9UgnHXd/ekCK99C8EbDSAt5qsjXE= github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs= @@ -97,19 +109,17 @@ github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= 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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -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.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/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/vesoft-inc/fbthrift v0.0.0-20230214024353-fa2f34755b28 h1:gpoPCGeOEuk/TnoY9nLVK1FoBM5ie7zY3BPVG8q43ME= github.com/vesoft-inc/fbthrift v0.0.0-20230214024353-fa2f34755b28/go.mod h1:xu7e9za8StcJhBZmCDwK1Hyv4/Y0xFsjS+uqp10ECJg= github.com/vesoft-inc/nebula-go/v3 v3.6.1 h1:RHdt8WC+jmrRqM9r9WWzz4tzM8VrykPHe9RhtLZjSVA= github.com/vesoft-inc/nebula-go/v3 v3.6.1/go.mod h1:mjMPlpNKnHYhe1pWz4caT7x9R+wKoX7dIm6u1+Rdcws= +github.com/vesoft-inc/nebula-go/v5 v5.2.1-0.20251219041427-39b1ee6affa7 h1:sL2gD5K96GvW4AdWHRTuGbjRcVNWH2CJaos1hQDBS8U= +github.com/vesoft-inc/nebula-go/v5 v5.2.1-0.20251219041427-39b1ee6affa7/go.mod h1:KqBEXafq8wk+DytuCYMZSQR7GxatOND7/okjz5bB33U= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.k6.io/k6 v0.45.1 h1:z+iVxE7Qze2Ka8tKvnjerOsoTuQb8e27Vqd1wcG2IFI= @@ -118,7 +128,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -129,12 +140,14 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= 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.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -153,8 +166,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= @@ -164,8 +177,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -176,15 +189,18 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/pkg/nebulagraph5/client.go b/pkg/nebulagraph5/client.go new file mode 100644 index 0000000..26b7fce --- /dev/null +++ b/pkg/nebulagraph5/client.go @@ -0,0 +1,458 @@ +package nebulagraph5 + +import ( + "encoding/json" + "fmt" + "math" + "strconv" + "strings" + "sync" + "time" + + "github.com/vesoft-inc/k6-plugin/pkg/common" + + nebula "github.com/vesoft-inc/nebula-go/v5" + "github.com/vesoft-inc/nebula-go/v5/pkg/types" +) + +type ( + // GraphPool nebula connection pool + GraphPool struct { + mutex sync.Mutex + DataCh chan common.Data + OutputCh chan []string + Version string + csvStrategy csvReaderStrategy + initialized bool + pool types.Pool + clients []*GraphClient + channelBufferSize int + Hosts []string + csvReader common.ICsvReader + graphOption *common.GraphOption + maxLifeTime time.Duration + logger logger + } + + logger interface { + Infof(msg string, args ...any) + Warnf(msg string, args ...any) + Debugf(msg string, args ...any) + Errorf(msg string, args ...any) + } + + graphClientGetter func(endpoint, username, password string, timeout time.Duration) (types.Client, error) + GraphClientFactory struct{} + + // GraphClient a wrapper for nebula client, could read data from DataCh + GraphClient struct { + Session types.Client + Pool *GraphPool + DataCh chan common.Data + username string + password string + since time.Time + } + + // Response a wrapper for nebula resultSet + Response struct { + ResultSet types.Result + err error + ResponseTime int32 + } + + csvReaderStrategy int + + output struct { + timeStamp int64 + nGQL string + latency int64 + responseTime int32 + isSucceed bool + rows int32 + errorMsg string + firstRecord string + } +) + +var _ common.IGraphClient = &GraphClient{} +var _ common.IGraphClientPool = &GraphPool{} + +const ( + // AllInOne read csv sequentially + AllInOne csvReaderStrategy = iota + // Separate read csv concurrently + Separate +) + +func formatOutput(o *output) []string { + return []string{ + strconv.FormatInt(o.timeStamp, 10), + o.nGQL, + strconv.Itoa(int(o.latency)), + strconv.Itoa(int(o.responseTime)), + strconv.FormatBool(o.isSucceed), + strconv.Itoa(int(o.rows)), + o.firstRecord, + o.errorMsg, + } +} + +var outputHeader []string = []string{ + "timestamp", + "nGQL", + "latency", + "responseTime", + "isSucceed", + "rows", + "firstRecord", + "errorMsg", +} + +// NewNebulaGraph New for k6 initialization. +func NewNebulaGraph() *GraphPool { + return &GraphPool{} +} + +func NewGraphClientFactory() *GraphClientFactory { + return &GraphClientFactory{} +} + +func (gf *GraphClientFactory) GetClient() *GraphClient { + return &GraphClient{} +} + +func (gp *GraphPool) SetOption(option *common.GraphOption) error { + if gp.graphOption != nil { + return nil + } + gp.graphOption = common.MakeDefaultOption(option) + if err := common.ValidateOption(gp.graphOption); err != nil { + return err + } + bs, _ := json.Marshal(gp.graphOption) + gp.logger.Infof("testing option: %s\n", bs) + return nil +} + +// Init initializes nebula pool with address and concurrent, by default the bufferSize is 20000 +func (gp *GraphPool) Init() (common.IGraphClientPool, error) { + gp.mutex.Lock() + defer gp.mutex.Unlock() + if gp.initialized { + return gp, nil + } + if err := gp.validate(gp.graphOption.Address); err != nil { + return nil, err + } + gp.Hosts = strings.Split(gp.graphOption.Address, ",") + if gp.graphOption.Output != "" { + channelBufferSize := gp.graphOption.OutputChannelSize + gp.OutputCh = make(chan []string, channelBufferSize) + writer := common.NewCsvWriter(gp.graphOption.Output, ",", outputHeader, gp.OutputCh) + if err := writer.WriteForever(); err != nil { + return nil, err + } + } + if gp.graphOption.CsvPath != "" { + gp.csvReader = common.NewCsvReader( + gp.graphOption.CsvPath, + gp.graphOption.CsvDelimiter, + gp.graphOption.CsvWithHeader, + gp.graphOption.CsvDataLimit, + ) + gp.DataCh = make(chan common.Data, gp.graphOption.CsvChannelSize) + if err := gp.csvReader.ReadForever(gp.DataCh); err != nil { + return nil, err + } + } + + options := []nebula.PoolOptionsFn{ + nebula.WithPoolMaxOpenConns(gp.graphOption.MaxSize * 2), + nebula.WithPoolMinOpenConns(gp.graphOption.MinSize), + } + if gp.graphOption.RetryTimeoutUs <= 0 { + gp.graphOption.RetryTimeoutUs = math.MaxInt32 + } + options = append(options, nebula.WithPoolRequestTimeout(time.Duration(gp.graphOption.TimeoutUs)*time.Microsecond)) + if gp.graphOption.SslCaPemPath != "" { + options = append(options, nebula.WithPoolTLS( + gp.graphOption.SslCaPemPath, + gp.graphOption.SslClientPemPath, + gp.graphOption.SslClientKeyPath, + false, + )) + } + options = append(options, nebula.WithPoolMaxWait(1*time.Minute)) + pool, err := nebula.NewNebulaPool( + gp.graphOption.Address, + gp.graphOption.Username, + gp.graphOption.Password, + options..., + ) + if err != nil { + return nil, err + } + gp.maxLifeTime = getMaxLifeTime(gp.graphOption.ExtraOptions) + gp.pool = pool + gp.clients = make([]*GraphClient, 0) + gp.initialized = true + return gp, nil +} + +func getMaxLifeTime(extra any) time.Duration { + if extra == nil { + return 0 + } + m, ok := extra.(map[string]any) + if !ok { + return 0 + } + if v, ok := m["max_life_time"]; ok { + if f, ok := v.(int64); ok { + return time.Duration(f) * time.Second + } + } + return 0 +} + +func (gp *GraphPool) validate(address string) error { + addrs := strings.Split(address, ",") + if len(addrs) == 0 { + return fmt.Errorf("Invalid address: %s", address) + } + for _, addr := range addrs { + hostAndPort := strings.Split(addr, ":") + if len(hostAndPort) != 2 { + return fmt.Errorf("Invalid address: %s", addr) + } + } + return nil +} + +// Close closes the nebula pool +func (gp *GraphPool) Close() error { + gp.mutex.Lock() + defer gp.mutex.Unlock() + for _, client := range gp.clients { + client.Close() + } + gp.pool.Close() + return nil +} + +// GetSession gets the session from pool +func (gp *GraphPool) GetSession() (common.IGraphClient, error) { + gp.mutex.Lock() + defer gp.mutex.Unlock() + if !gp.initialized { + return nil, fmt.Errorf("GraphPool is not initialized, please call Init() first") + } + + s := &GraphClient{Pool: gp, DataCh: gp.DataCh, since: time.Now()} + gp.clients = append(gp.clients, s) + return s, nil +} + +func (gc *GraphClient) Open() error { + return nil +} + +func (gc *GraphClient) OpenAddress(address, username, password string, connectTimeout int) error { + if gc.Session != nil { + return fmt.Errorf("session already open") + } + connectTimeoutDuration := time.Duration(connectTimeout) * time.Second + client, err := nebula.NewNebulaClient(address, username, password, + nebula.WithClientConnectTimeout(connectTimeoutDuration), + ) + if err != nil { + return err + } + gc.Session = client + return nil +} + +func (gc *GraphClient) Close() error { + if gc.Session == nil { + return nil + } + gc.Session.Close() + gc.Session = nil + return nil +} + +// GetData get data from csv reader +func (gc *GraphClient) GetData() (common.Data, error) { + if gc.DataCh != nil && len(gc.DataCh) != 0 { + if d, ok := <-gc.DataCh; ok { + return d, nil + } + } + return nil, fmt.Errorf("no Data at all") +} + +// Execute executes nebula query +func (gc *GraphClient) Execute(stmt string) (common.IGraphResponse, error) { + var ( + isSucceed bool = true + errMessage string + err error + resp types.Result + rows int32 + latency int64 + ) + stmt = common.ProcessStmt(stmt) + start := time.Now() + if gc.Pool.maxLifeTime > 0 && time.Since(gc.since) > gc.Pool.maxLifeTime { + gc.Pool.logger.Debugf("the client has been used for %v, which is longer than maxLifeTime %v, so we need to recreate it", + time.Since(gc.since), gc.Pool.maxLifeTime) + if gc.Session != nil { + gc.Session.Close() + gc.Pool.pool.PutClient(gc.Session) + sess, err := gc.Pool.pool.GetClient() + if err != nil { + + return nil, err + } + gc.Session = sess + } + gc.since = time.Now() + } + resp, err = gc.executeWithRetry(stmt) + + if err != nil { + isSucceed = false + errMessage = err.Error() + } else { + rows = int32(resp.RowSize()) + latency = resp.Summary().TotalServerTimeUs() + } + var fr []string + var values []*nebula.NullValue + var anyValues []any + if rows != 0 { + // print the first row of the result + values = make([]*nebula.NullValue, 0, len(resp.Columns())) + anyValues = make([]any, 0, len(resp.Columns())) + for _ = range resp.Columns() { + value := &nebula.NullValue{} + values = append(values, value) + anyValues = append(anyValues, value) + } + + if err := resp.Scan(anyValues...); err != nil { + return nil, err + } + + for _, v := range values { + if !v.Valid || v.Data == nil { + fr = append(fr, "NULL") + } else { + fr = append(fr, v.Data.String()) + } + } + } + //TODO could add a flag to just decode the first row + if rows != 0 { + for resp.HasNext() { + if err := resp.Scan(anyValues...); err != nil { + return nil, err + } + } + } + responseTime := int32(time.Since(start) / 1000) + // output + if gc.Pool.OutputCh != nil { + o := &output{ + timeStamp: start.Unix(), + nGQL: stmt, + latency: latency, + responseTime: responseTime, + isSucceed: isSucceed, + rows: rows, + errorMsg: errMessage, + firstRecord: strings.Join(fr, "|"), + } + select { + case gc.Pool.OutputCh <- formatOutput(o): + // abandon if the output chan is full. + default: + gc.Pool.logger.Warnf("output channel is full, abandon the output: %v\n", o) + } + } + return &Response{ResultSet: resp, ResponseTime: responseTime, err: err}, nil +} + +func (gc *GraphClient) executeWithRetry(stmt string) (types.Result, error) { + var ( + err error + resp types.Result + ) + retryTimeout := time.Duration(gc.Pool.graphOption.RetryTimeoutUs) * time.Microsecond + if retryTimeout <= 0 { + retryTimeout = math.MaxInt64 + } + start := time.Now() + for i := 0; i < gc.Pool.graphOption.RetryTimes+1; i++ { + if time.Now().Sub(start) > retryTimeout { + return nil, fmt.Errorf("execute statement timeout: %s, timeout: %v", stmt, retryTimeout) + } + if i > 0 { + gc.Pool.logger.Warnf("execute statement failed, retry %d time, error: %s\n", i, err.Error()) + } + resp, err = gc.execute(stmt) + if err == nil { + return resp, nil + } else { + gc.Session.Close() + gc.Pool.pool.PutClient(gc.Session) + } + time.Sleep(time.Duration(gc.Pool.graphOption.RetryIntervalUs) * time.Microsecond) + } + return nil, err +} + +func (gc *GraphClient) execute(stmt string) (types.Result, error) { + if gc.Session == nil || gc.Session.IsClosed() { + sess, err := gc.Pool.pool.GetClient() + if err != nil { + return nil, err + } + gc.Session = sess + } + resp, err := gc.Session.Execute(stmt) + if err != nil { + return nil, fmt.Errorf("execute statement failed: %s, error: %w", stmt, err) + } + return resp, nil +} + +// GetResponseTime GetResponseTime +func (r *Response) GetResponseTime() int32 { + return r.ResponseTime +} + +// IsSucceed IsSucceed +func (r *Response) IsSucceed() bool { + if r.err != nil { + return false + } + + return true +} + +func (r *Response) GetLatency() int64 { + if r.ResultSet != nil { + return r.ResultSet.Summary().TotalServerTimeUs() + } + return 0 +} + +// GetRowSize GetRowSize +func (r *Response) GetRowSize() int32 { + if r.ResultSet != nil { + return int32(r.ResultSet.RowSize()) + } + return 0 +} diff --git a/pkg/nebulagraph5/module.go b/pkg/nebulagraph5/module.go new file mode 100644 index 0000000..6c76151 --- /dev/null +++ b/pkg/nebulagraph5/module.go @@ -0,0 +1,60 @@ +package nebulagraph5 + +import ( + "github.com/sirupsen/logrus" + "go.k6.io/k6/js/modules" +) + +var _ modules.Module = &K6Module{} + +// refer: https://k6.io/docs/extensions/get-started/create/javascript-extensions/#use-the-advanced-module-api +// K6Module is a module for k6, using the advanced module API +type K6Module struct { + pool *GraphPool +} + +type K6NebulaInstance struct { + vu modules.VU + pool *GraphPool +} + +type loggerWrapper struct { + log logrus.FieldLogger +} + +func (l *loggerWrapper) Infof(msg string, args ...any) { + l.log.Infof(msg, args...) +} + +func (l *loggerWrapper) Warnf(msg string, args ...any) { + l.log.Warnf(msg, args...) +} + +func (l *loggerWrapper) Debugf(msg string, args ...any) { + l.log.Debugf(msg, args...) +} + +func (l *loggerWrapper) Errorf(msg string, args ...any) { + l.log.Errorf(msg, args...) +} + +func NewModule() *K6Module { + return &K6Module{ + pool: NewNebulaGraph(), + } +} + +func (m *K6Module) NewModuleInstance(vu modules.VU) modules.Instance { + return &K6NebulaInstance{ + vu: vu, + pool: m.pool, + } +} + +func (i *K6NebulaInstance) Exports() modules.Exports { + logger := i.vu.InitEnv().Logger + i.pool.logger = &loggerWrapper{log: logger} + return modules.Exports{ + Default: i.pool, + } +} diff --git a/register.go b/register.go index 38e9eb4..03e7c15 100644 --- a/register.go +++ b/register.go @@ -3,12 +3,14 @@ package k6plugin import ( "github.com/vesoft-inc/k6-plugin/pkg/aggcsv" "github.com/vesoft-inc/k6-plugin/pkg/nebulagraph" + "github.com/vesoft-inc/k6-plugin/pkg/nebulagraph5" "go.k6.io/k6/js/modules" "go.k6.io/k6/output" ) func init() { modules.Register("k6/x/nebulagraph", nebulagraph.NewModule()) + modules.Register("k6/x/nebulagraph5", nebulagraph5.NewModule()) output.RegisterExtension("aggcsv", func(p output.Params) (output.Output, error) { return aggcsv.New(p) })