From f7402e0e815986b34f0f331d73149eca2ac973e0 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 3 Aug 2022 14:54:29 +0800 Subject: [PATCH 1/2] Upgrade go2sky version to 1.5.0 --- dubbo-go/go.mod | 2 +- dubbo-go/go.sum | 4 ++-- gear/go.mod | 2 +- gear/go.sum | 4 ++-- gin/v2/go.mod | 2 +- gin/v2/go.sum | 4 ++-- gin/v3/go.mod | 2 +- gin/v3/go.sum | 4 ++-- go-restful/go.mod | 2 +- go-restful/go.sum | 4 ++-- gorm/go.mod | 2 +- gorm/go.sum | 4 ++-- kafkareporter/go.mod | 2 +- kafkareporter/go.sum | 4 ++-- kratos/go.mod | 2 +- kratos/go.sum | 4 ++-- logrus/go.mod | 2 +- logrus/go.sum | 4 ++-- micro/go.mod | 2 +- micro/go.sum | 4 ++-- resty/go.mod | 2 +- resty/go.sum | 4 ++-- sql/go.mod | 2 +- sql/go.sum | 4 ++-- tools/release/main.go | 2 +- zap/go.mod | 2 +- zap/go.sum | 4 ++-- 27 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dubbo-go/go.mod b/dubbo-go/go.mod index d32d398..ff0420a 100644 --- a/dubbo-go/go.mod +++ b/dubbo-go/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( dubbo.apache.org/dubbo-go/v3 v3.0.2 - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/apache/dubbo-go-hessian2 v1.11.0 github.com/dubbogo/gost v1.11.25 skywalking.apache.org/repo/goapi v0.0.0-20220401015832-2c9eee9481eb diff --git a/dubbo-go/go.sum b/dubbo-go/go.sum index 34b422e..fb7993e 100644 --- a/dubbo-go/go.sum +++ b/dubbo-go/go.sum @@ -49,8 +49,8 @@ github.com/RoaringBitmap/roaring v1.1.0 h1:b10lZrZXaY6Q6EKIRrmOF519FIyQQ5anPgGr3 github.com/RoaringBitmap/roaring v1.1.0/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= diff --git a/gear/go.mod b/gear/go.mod index 23dafd3..5080a09 100644 --- a/gear/go.mod +++ b/gear/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/gear go 1.12 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/teambition/gear v1.21.2 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v2 v2.2.4 // indirect diff --git a/gear/go.sum b/gear/go.sum index 1f76eaa..3bb109c 100644 --- a/gear/go.sum +++ b/gear/go.sum @@ -3,8 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/GitbookIO/mimedb v0.0.0-20180329142916-39fdfdb4def4/go.mod h1:0JA2lIXs/dl3RUgHP5ivwjl3f0g+X2BQz3zWnq8IJa4= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/gin/v2/go.mod b/gin/v2/go.mod index 7485ad3..77e7288 100644 --- a/gin/v2/go.mod +++ b/gin/v2/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/gin/v2 go 1.12 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.3.0 github.com/json-iterator/go v1.1.10 // indirect diff --git a/gin/v2/go.sum b/gin/v2/go.sum index cc5ea9e..56a1610 100644 --- a/gin/v2/go.sum +++ b/gin/v2/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/gin/v3/go.mod b/gin/v3/go.mod index 59db609..88944de 100644 --- a/gin/v3/go.mod +++ b/gin/v3/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/gin/v3 go 1.12 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/gin-gonic/gin v1.5.0 github.com/kr/pretty v0.1.0 // indirect github.com/mattn/go-isatty v0.0.12 // indirect diff --git a/gin/v3/go.sum b/gin/v3/go.sum index 24a4926..9ecb151 100644 --- a/gin/v3/go.sum +++ b/gin/v3/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/go-restful/go.mod b/go-restful/go.mod index 1000f93..8e2f0e0 100644 --- a/go-restful/go.mod +++ b/go-restful/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/go-restful go 1.13 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/emicklei/go-restful/v3 v3.0.0 github.com/json-iterator/go v1.1.10 // indirect github.com/kr/pretty v0.1.0 // indirect diff --git a/go-restful/go.sum b/go-restful/go.sum index 85aa8cf..9c97a72 100644 --- a/go-restful/go.sum +++ b/go-restful/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/gorm/go.mod b/gorm/go.mod index db15e6a..51c26a8 100644 --- a/gorm/go.mod +++ b/gorm/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/gorm go 1.16 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 gorm.io/gorm v1.22.3 skywalking.apache.org/repo/goapi v0.0.0-20220401015832-2c9eee9481eb ) diff --git a/gorm/go.sum b/gorm/go.sum index bb8f1b5..2ad2114 100644 --- a/gorm/go.sum +++ b/gorm/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/kafkareporter/go.mod b/kafkareporter/go.mod index d6d436f..de45c1e 100644 --- a/kafkareporter/go.mod +++ b/kafkareporter/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/Shopify/sarama v1.29.1 - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 google.golang.org/protobuf v1.28.0 skywalking.apache.org/repo/goapi v0.0.0-20220401015832-2c9eee9481eb ) diff --git a/kafkareporter/go.sum b/kafkareporter/go.sum index 072090e..8c7fae1 100644 --- a/kafkareporter/go.sum +++ b/kafkareporter/go.sum @@ -6,8 +6,8 @@ github.com/Shopify/sarama v1.29.1 h1:wBAacXbYVLmWieEA/0X/JagDdCZ8NVFOfS6l6+2u5S0 github.com/Shopify/sarama v1.29.1/go.mod h1:mdtqvCSg8JOxk8PmpTNGyo6wzd4BMm4QXSfDnTXmgkE= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/kratos/go.mod b/kratos/go.mod index 9c7a6e2..97b9765 100644 --- a/kratos/go.mod +++ b/kratos/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/kratos go 1.16 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/go-kratos/examples v0.0.0-20220322052600-90fbf436a900 github.com/go-kratos/kratos/v2 v2.2.1 skywalking.apache.org/repo/goapi v0.0.0-20220401015832-2c9eee9481eb diff --git a/kratos/go.sum b/kratos/go.sum index e16d1e4..8848dd4 100644 --- a/kratos/go.sum +++ b/kratos/go.sum @@ -58,8 +58,8 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= diff --git a/logrus/go.mod b/logrus/go.mod index 1131c76..536cd5f 100644 --- a/logrus/go.mod +++ b/logrus/go.mod @@ -3,6 +3,6 @@ module github.com/SkyAPM/go2sky-plugins/logrus go 1.12 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/sirupsen/logrus v1.8.1 ) diff --git a/logrus/go.sum b/logrus/go.sum index 98c03bd..d75dd6b 100644 --- a/logrus/go.sum +++ b/logrus/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/micro/go.mod b/micro/go.mod index 0d3c272..8358238 100644 --- a/micro/go.mod +++ b/micro/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/micro go 1.14 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/asim/go-micro/v3 v3.5.0 skywalking.apache.org/repo/goapi v0.0.0-20220401015832-2c9eee9481eb ) diff --git a/micro/go.sum b/micro/go.sum index 7465cf4..b83354f 100644 --- a/micro/go.sum +++ b/micro/go.sum @@ -41,8 +41,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.0/go.mod h1:zpDJeKyp9ScW4NNrbdr+Eyxvry3ilGPewKoXw3XGN1k= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= diff --git a/resty/go.mod b/resty/go.mod index dd1645a..e4571b3 100644 --- a/resty/go.mod +++ b/resty/go.mod @@ -3,6 +3,6 @@ module github.com/SkyAPM/go2sky-plugins/resty go 1.12 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/go-resty/resty/v2 v2.2.0 ) diff --git a/resty/go.sum b/resty/go.sum index d1b755c..5bd3453 100644 --- a/resty/go.sum +++ b/resty/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/sql/go.mod b/sql/go.mod index 9927858..92274f6 100644 --- a/sql/go.mod +++ b/sql/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/sql go 1.16 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 github.com/go-sql-driver/mysql v1.6.0 skywalking.apache.org/repo/goapi v0.0.0-20220401015832-2c9eee9481eb ) diff --git a/sql/go.sum b/sql/go.sum index da127e2..36e5c60 100644 --- a/sql/go.sum +++ b/sql/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/tools/release/main.go b/tools/release/main.go index e56f60b..212e5bb 100644 --- a/tools/release/main.go +++ b/tools/release/main.go @@ -24,7 +24,7 @@ import ( ) const ( - go2sky = "github.com/SkyAPM/go2sky@v1.4.1" + go2sky = "github.com/SkyAPM/go2sky@v1.5.0" ) func main() { diff --git a/zap/go.mod b/zap/go.mod index e19a14e..5293fdf 100644 --- a/zap/go.mod +++ b/zap/go.mod @@ -3,7 +3,7 @@ module github.com/SkyAPM/go2sky-plugins/zap go 1.12 require ( - github.com/SkyAPM/go2sky v1.4.1 + github.com/SkyAPM/go2sky v1.5.0 go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f ) diff --git a/zap/go.sum b/zap/go.sum index 3b29184..38f19aa 100644 --- a/zap/go.sum +++ b/zap/go.sum @@ -3,8 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SkyAPM/go2sky v1.4.1 h1:FV0jUB8UeC5CW0Z12j8xgrK0LoVV85Z92ShQU0G3Xfo= -github.com/SkyAPM/go2sky v1.4.1/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= +github.com/SkyAPM/go2sky v1.5.0 h1:TzhKL9IyVCegCUdcqRI7R7g+rQCYNnF6QAzp6IhDy08= +github.com/SkyAPM/go2sky v1.5.0/go.mod h1:cebzbFtq5oc9VrgJy0Sv7oePj/TjIlXPdj2ntHdCXd0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= From caa2c28c98df37af5d53ca7a85d63cac90a6dc5c Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 3 Aug 2022 15:08:57 +0800 Subject: [PATCH 2/2] del GOPROXY env --- kratos/test/docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kratos/test/docker-compose.yml b/kratos/test/docker-compose.yml index 68a5aa6..3177506 100644 --- a/kratos/test/docker-compose.yml +++ b/kratos/test/docker-compose.yml @@ -36,8 +36,6 @@ services: ports: - 8000 - 9000 - environment: - GOPROXY: "https://goproxy.cn" healthcheck: test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/8000"] interval: 5s @@ -57,8 +55,6 @@ services: - 8080 networks: - e2e - environment: - GOPROXY: "https://goproxy.cn" healthcheck: test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/8000"] interval: 5s