You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by li...@apache.org on 2021/01/17 12:25:15 UTC
[skywalking-satellite] branch fix-gen-tool-version created (now
068d8fe)
This is an automated email from the ASF dual-hosted git repository.
liujiapeng pushed a change to branch fix-gen-tool-version
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git.
at 068d8fe fix grpc&proto gen version
This branch includes the following new commits:
new 068d8fe fix grpc&proto gen version
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-satellite] 01/01: fix grpc&proto gen version
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujiapeng pushed a commit to branch fix-gen-tool-version
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
commit 068d8fe2c10e34e35df9d817319f8c61c4009437
Author: Evan <ev...@outlook.com>
AuthorDate: Sun Jan 17 20:24:54 2021 +0800
fix grpc&proto gen version
---
go.mod | 2 +-
go.sum | 18 ++++++++++++++----
protocol/gen-codes/skywalking/network/go.mod | 4 ++--
protocol/gen-codes/skywalking/network/go.sum | 8 ++++----
.../network/language/agent/v3/BrowserPerf_grpc.pb.go | 10 +++++++---
.../network/language/agent/v3/CLRMetric_grpc.pb.go | 8 ++++++--
.../network/language/agent/v3/JVMMetric_grpc.pb.go | 8 ++++++--
.../network/language/agent/v3/Meter_grpc.pb.go | 10 +++++++---
.../network/language/agent/v3/Tracing_grpc.pb.go | 10 +++++++---
.../network/language/profile/v3/Profile_grpc.pb.go | 10 +++++++---
.../skywalking/network/logging/v3/Logging_grpc.pb.go | 10 +++++++---
.../network/management/v3/Management_grpc.pb.go | 8 ++++++--
.../network/servicemesh/v3/service-mesh_grpc.pb.go | 10 +++++++---
tools/protocol_gen.sh | 4 ++--
14 files changed, 83 insertions(+), 37 deletions(-)
diff --git a/go.mod b/go.mod
index c1699e7..1008ef1 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
github.com/sirupsen/logrus v1.7.0
github.com/spf13/viper v1.7.1
github.com/urfave/cli/v2 v2.3.0
- google.golang.org/grpc v1.34.0
+ google.golang.org/grpc v1.35.0
google.golang.org/protobuf v1.25.0
skywalking/network v1.0.0
)
diff --git a/go.sum b/go.sum
index ccf7d3d..b4f00e9 100644
--- a/go.sum
+++ b/go.sum
@@ -53,7 +53,7 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -86,13 +86,15 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
+github.com/frankban/quicktest v1.10.2 h1:19ARM85nVi4xH7xPXuc5eM/udya5ieh7b/Sv+d844Tk=
github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -225,10 +227,12 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
@@ -265,6 +269,7 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+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/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
@@ -383,6 +388,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
@@ -540,6 +546,7 @@ 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 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -578,8 +585,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
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=
@@ -596,6 +603,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@@ -607,6 +615,7 @@ gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hr
gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo=
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM=
gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q=
+gopkg.in/jcmturner/goidentity.v3 v3.0.0 h1:1duIyWiTaYvVx3YX2CYtpJbUFd7/UuPYCfgXtQ3VTbI=
gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
gopkg.in/jcmturner/gokrb5.v7 v7.5.0 h1:a9tsXlIDD9SKxotJMK3niV7rPZAJeX2aD/0yg3qlIrg=
gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM=
@@ -625,6 +634,7 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/protocol/gen-codes/skywalking/network/go.mod b/protocol/gen-codes/skywalking/network/go.mod
index a6555ad..0797ac0 100644
--- a/protocol/gen-codes/skywalking/network/go.mod
+++ b/protocol/gen-codes/skywalking/network/go.mod
@@ -1,9 +1,9 @@
module skywalking/network
-go 1.14
+go 1.15
require (
github.com/golang/protobuf v1.4.3
- google.golang.org/grpc v1.34.0
+ google.golang.org/grpc v1.35.0
google.golang.org/protobuf v1.25.0
)
diff --git a/protocol/gen-codes/skywalking/network/go.sum b/protocol/gen-codes/skywalking/network/go.sum
index 2c6c370..8f0da6e 100644
--- a/protocol/gen-codes/skywalking/network/go.sum
+++ b/protocol/gen-codes/skywalking/network/go.sum
@@ -2,11 +2,11 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -67,8 +67,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
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=
diff --git a/protocol/gen-codes/skywalking/network/language/agent/v3/BrowserPerf_grpc.pb.go b/protocol/gen-codes/skywalking/network/language/agent/v3/BrowserPerf_grpc.pb.go
index b47b11b..428f1ae 100644
--- a/protocol/gen-codes/skywalking/network/language/agent/v3/BrowserPerf_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/language/agent/v3/BrowserPerf_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// BrowserPerfServiceClient is the client API for BrowserPerfService service.
@@ -42,7 +43,7 @@ func (c *browserPerfServiceClient) CollectPerfData(ctx context.Context, in *Brow
}
func (c *browserPerfServiceClient) CollectErrorLogs(ctx context.Context, opts ...grpc.CallOption) (BrowserPerfService_CollectErrorLogsClient, error) {
- stream, err := c.cc.NewStream(ctx, &_BrowserPerfService_serviceDesc.Streams[0], "/skywalking.v3.BrowserPerfService/collectErrorLogs", opts...)
+ stream, err := c.cc.NewStream(ctx, &BrowserPerfService_ServiceDesc.Streams[0], "/skywalking.v3.BrowserPerfService/collectErrorLogs", opts...)
if err != nil {
return nil, err
}
@@ -106,7 +107,7 @@ type UnsafeBrowserPerfServiceServer interface {
}
func RegisterBrowserPerfServiceServer(s grpc.ServiceRegistrar, srv BrowserPerfServiceServer) {
- s.RegisterService(&_BrowserPerfService_serviceDesc, srv)
+ s.RegisterService(&BrowserPerfService_ServiceDesc, srv)
}
func _BrowserPerfService_CollectPerfData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -153,7 +154,10 @@ func (x *browserPerfServiceCollectErrorLogsServer) Recv() (*BrowserErrorLog, err
return m, nil
}
-var _BrowserPerfService_serviceDesc = grpc.ServiceDesc{
+// BrowserPerfService_ServiceDesc is the grpc.ServiceDesc for BrowserPerfService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var BrowserPerfService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.BrowserPerfService",
HandlerType: (*BrowserPerfServiceServer)(nil),
Methods: []grpc.MethodDesc{
diff --git a/protocol/gen-codes/skywalking/network/language/agent/v3/CLRMetric_grpc.pb.go b/protocol/gen-codes/skywalking/network/language/agent/v3/CLRMetric_grpc.pb.go
index eced7ef..18ac4a3 100644
--- a/protocol/gen-codes/skywalking/network/language/agent/v3/CLRMetric_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/language/agent/v3/CLRMetric_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// CLRMetricReportServiceClient is the client API for CLRMetricReportService service.
@@ -64,7 +65,7 @@ type UnsafeCLRMetricReportServiceServer interface {
}
func RegisterCLRMetricReportServiceServer(s grpc.ServiceRegistrar, srv CLRMetricReportServiceServer) {
- s.RegisterService(&_CLRMetricReportService_serviceDesc, srv)
+ s.RegisterService(&CLRMetricReportService_ServiceDesc, srv)
}
func _CLRMetricReportService_Collect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -85,7 +86,10 @@ func _CLRMetricReportService_Collect_Handler(srv interface{}, ctx context.Contex
return interceptor(ctx, in, info, handler)
}
-var _CLRMetricReportService_serviceDesc = grpc.ServiceDesc{
+// CLRMetricReportService_ServiceDesc is the grpc.ServiceDesc for CLRMetricReportService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var CLRMetricReportService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.CLRMetricReportService",
HandlerType: (*CLRMetricReportServiceServer)(nil),
Methods: []grpc.MethodDesc{
diff --git a/protocol/gen-codes/skywalking/network/language/agent/v3/JVMMetric_grpc.pb.go b/protocol/gen-codes/skywalking/network/language/agent/v3/JVMMetric_grpc.pb.go
index 3b6b0d4..7ee6b52 100644
--- a/protocol/gen-codes/skywalking/network/language/agent/v3/JVMMetric_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/language/agent/v3/JVMMetric_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// JVMMetricReportServiceClient is the client API for JVMMetricReportService service.
@@ -64,7 +65,7 @@ type UnsafeJVMMetricReportServiceServer interface {
}
func RegisterJVMMetricReportServiceServer(s grpc.ServiceRegistrar, srv JVMMetricReportServiceServer) {
- s.RegisterService(&_JVMMetricReportService_serviceDesc, srv)
+ s.RegisterService(&JVMMetricReportService_ServiceDesc, srv)
}
func _JVMMetricReportService_Collect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -85,7 +86,10 @@ func _JVMMetricReportService_Collect_Handler(srv interface{}, ctx context.Contex
return interceptor(ctx, in, info, handler)
}
-var _JVMMetricReportService_serviceDesc = grpc.ServiceDesc{
+// JVMMetricReportService_ServiceDesc is the grpc.ServiceDesc for JVMMetricReportService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var JVMMetricReportService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.JVMMetricReportService",
HandlerType: (*JVMMetricReportServiceServer)(nil),
Methods: []grpc.MethodDesc{
diff --git a/protocol/gen-codes/skywalking/network/language/agent/v3/Meter_grpc.pb.go b/protocol/gen-codes/skywalking/network/language/agent/v3/Meter_grpc.pb.go
index 3770721..29d86a9 100644
--- a/protocol/gen-codes/skywalking/network/language/agent/v3/Meter_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/language/agent/v3/Meter_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// MeterReportServiceClient is the client API for MeterReportService service.
@@ -31,7 +32,7 @@ func NewMeterReportServiceClient(cc grpc.ClientConnInterface) MeterReportService
}
func (c *meterReportServiceClient) Collect(ctx context.Context, opts ...grpc.CallOption) (MeterReportService_CollectClient, error) {
- stream, err := c.cc.NewStream(ctx, &_MeterReportService_serviceDesc.Streams[0], "/skywalking.v3.MeterReportService/collect", opts...)
+ stream, err := c.cc.NewStream(ctx, &MeterReportService_ServiceDesc.Streams[0], "/skywalking.v3.MeterReportService/collect", opts...)
if err != nil {
return nil, err
}
@@ -90,7 +91,7 @@ type UnsafeMeterReportServiceServer interface {
}
func RegisterMeterReportServiceServer(s grpc.ServiceRegistrar, srv MeterReportServiceServer) {
- s.RegisterService(&_MeterReportService_serviceDesc, srv)
+ s.RegisterService(&MeterReportService_ServiceDesc, srv)
}
func _MeterReportService_Collect_Handler(srv interface{}, stream grpc.ServerStream) error {
@@ -119,7 +120,10 @@ func (x *meterReportServiceCollectServer) Recv() (*MeterData, error) {
return m, nil
}
-var _MeterReportService_serviceDesc = grpc.ServiceDesc{
+// MeterReportService_ServiceDesc is the grpc.ServiceDesc for MeterReportService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var MeterReportService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.MeterReportService",
HandlerType: (*MeterReportServiceServer)(nil),
Methods: []grpc.MethodDesc{},
diff --git a/protocol/gen-codes/skywalking/network/language/agent/v3/Tracing_grpc.pb.go b/protocol/gen-codes/skywalking/network/language/agent/v3/Tracing_grpc.pb.go
index fdaba9d..b6c5534 100644
--- a/protocol/gen-codes/skywalking/network/language/agent/v3/Tracing_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/language/agent/v3/Tracing_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// TraceSegmentReportServiceClient is the client API for TraceSegmentReportService service.
@@ -38,7 +39,7 @@ func NewTraceSegmentReportServiceClient(cc grpc.ClientConnInterface) TraceSegmen
}
func (c *traceSegmentReportServiceClient) Collect(ctx context.Context, opts ...grpc.CallOption) (TraceSegmentReportService_CollectClient, error) {
- stream, err := c.cc.NewStream(ctx, &_TraceSegmentReportService_serviceDesc.Streams[0], "/skywalking.v3.TraceSegmentReportService/collect", opts...)
+ stream, err := c.cc.NewStream(ctx, &TraceSegmentReportService_ServiceDesc.Streams[0], "/skywalking.v3.TraceSegmentReportService/collect", opts...)
if err != nil {
return nil, err
}
@@ -117,7 +118,7 @@ type UnsafeTraceSegmentReportServiceServer interface {
}
func RegisterTraceSegmentReportServiceServer(s grpc.ServiceRegistrar, srv TraceSegmentReportServiceServer) {
- s.RegisterService(&_TraceSegmentReportService_serviceDesc, srv)
+ s.RegisterService(&TraceSegmentReportService_ServiceDesc, srv)
}
func _TraceSegmentReportService_Collect_Handler(srv interface{}, stream grpc.ServerStream) error {
@@ -164,7 +165,10 @@ func _TraceSegmentReportService_CollectInSync_Handler(srv interface{}, ctx conte
return interceptor(ctx, in, info, handler)
}
-var _TraceSegmentReportService_serviceDesc = grpc.ServiceDesc{
+// TraceSegmentReportService_ServiceDesc is the grpc.ServiceDesc for TraceSegmentReportService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var TraceSegmentReportService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.TraceSegmentReportService",
HandlerType: (*TraceSegmentReportServiceServer)(nil),
Methods: []grpc.MethodDesc{
diff --git a/protocol/gen-codes/skywalking/network/language/profile/v3/Profile_grpc.pb.go b/protocol/gen-codes/skywalking/network/language/profile/v3/Profile_grpc.pb.go
index dcddb35..3864da1 100644
--- a/protocol/gen-codes/skywalking/network/language/profile/v3/Profile_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/language/profile/v3/Profile_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// ProfileTaskClient is the client API for ProfileTask service.
@@ -44,7 +45,7 @@ func (c *profileTaskClient) GetProfileTaskCommands(ctx context.Context, in *Prof
}
func (c *profileTaskClient) CollectSnapshot(ctx context.Context, opts ...grpc.CallOption) (ProfileTask_CollectSnapshotClient, error) {
- stream, err := c.cc.NewStream(ctx, &_ProfileTask_serviceDesc.Streams[0], "/skywalking.v3.ProfileTask/collectSnapshot", opts...)
+ stream, err := c.cc.NewStream(ctx, &ProfileTask_ServiceDesc.Streams[0], "/skywalking.v3.ProfileTask/collectSnapshot", opts...)
if err != nil {
return nil, err
}
@@ -122,7 +123,7 @@ type UnsafeProfileTaskServer interface {
}
func RegisterProfileTaskServer(s grpc.ServiceRegistrar, srv ProfileTaskServer) {
- s.RegisterService(&_ProfileTask_serviceDesc, srv)
+ s.RegisterService(&ProfileTask_ServiceDesc, srv)
}
func _ProfileTask_GetProfileTaskCommands_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -187,7 +188,10 @@ func _ProfileTask_ReportTaskFinish_Handler(srv interface{}, ctx context.Context,
return interceptor(ctx, in, info, handler)
}
-var _ProfileTask_serviceDesc = grpc.ServiceDesc{
+// ProfileTask_ServiceDesc is the grpc.ServiceDesc for ProfileTask service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var ProfileTask_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.ProfileTask",
HandlerType: (*ProfileTaskServer)(nil),
Methods: []grpc.MethodDesc{
diff --git a/protocol/gen-codes/skywalking/network/logging/v3/Logging_grpc.pb.go b/protocol/gen-codes/skywalking/network/logging/v3/Logging_grpc.pb.go
index 0acf76f..12167aa 100644
--- a/protocol/gen-codes/skywalking/network/logging/v3/Logging_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/logging/v3/Logging_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// LogReportServiceClient is the client API for LogReportService service.
@@ -33,7 +34,7 @@ func NewLogReportServiceClient(cc grpc.ClientConnInterface) LogReportServiceClie
}
func (c *logReportServiceClient) Collect(ctx context.Context, opts ...grpc.CallOption) (LogReportService_CollectClient, error) {
- stream, err := c.cc.NewStream(ctx, &_LogReportService_serviceDesc.Streams[0], "/skywalking.v3.LogReportService/collect", opts...)
+ stream, err := c.cc.NewStream(ctx, &LogReportService_ServiceDesc.Streams[0], "/skywalking.v3.LogReportService/collect", opts...)
if err != nil {
return nil, err
}
@@ -94,7 +95,7 @@ type UnsafeLogReportServiceServer interface {
}
func RegisterLogReportServiceServer(s grpc.ServiceRegistrar, srv LogReportServiceServer) {
- s.RegisterService(&_LogReportService_serviceDesc, srv)
+ s.RegisterService(&LogReportService_ServiceDesc, srv)
}
func _LogReportService_Collect_Handler(srv interface{}, stream grpc.ServerStream) error {
@@ -123,7 +124,10 @@ func (x *logReportServiceCollectServer) Recv() (*LogData, error) {
return m, nil
}
-var _LogReportService_serviceDesc = grpc.ServiceDesc{
+// LogReportService_ServiceDesc is the grpc.ServiceDesc for LogReportService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var LogReportService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.LogReportService",
HandlerType: (*LogReportServiceServer)(nil),
Methods: []grpc.MethodDesc{},
diff --git a/protocol/gen-codes/skywalking/network/management/v3/Management_grpc.pb.go b/protocol/gen-codes/skywalking/network/management/v3/Management_grpc.pb.go
index 3ca2f2d..bc63c0f 100644
--- a/protocol/gen-codes/skywalking/network/management/v3/Management_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/management/v3/Management_grpc.pb.go
@@ -12,6 +12,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// ManagementServiceClient is the client API for ManagementService service.
@@ -85,7 +86,7 @@ type UnsafeManagementServiceServer interface {
}
func RegisterManagementServiceServer(s grpc.ServiceRegistrar, srv ManagementServiceServer) {
- s.RegisterService(&_ManagementService_serviceDesc, srv)
+ s.RegisterService(&ManagementService_ServiceDesc, srv)
}
func _ManagementService_ReportInstanceProperties_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -124,7 +125,10 @@ func _ManagementService_KeepAlive_Handler(srv interface{}, ctx context.Context,
return interceptor(ctx, in, info, handler)
}
-var _ManagementService_serviceDesc = grpc.ServiceDesc{
+// ManagementService_ServiceDesc is the grpc.ServiceDesc for ManagementService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var ManagementService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.ManagementService",
HandlerType: (*ManagementServiceServer)(nil),
Methods: []grpc.MethodDesc{
diff --git a/protocol/gen-codes/skywalking/network/servicemesh/v3/service-mesh_grpc.pb.go b/protocol/gen-codes/skywalking/network/servicemesh/v3/service-mesh_grpc.pb.go
index 8ea3a1f..d413879 100644
--- a/protocol/gen-codes/skywalking/network/servicemesh/v3/service-mesh_grpc.pb.go
+++ b/protocol/gen-codes/skywalking/network/servicemesh/v3/service-mesh_grpc.pb.go
@@ -11,6 +11,7 @@ import (
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7
// ServiceMeshMetricServiceClient is the client API for ServiceMeshMetricService service.
@@ -29,7 +30,7 @@ func NewServiceMeshMetricServiceClient(cc grpc.ClientConnInterface) ServiceMeshM
}
func (c *serviceMeshMetricServiceClient) Collect(ctx context.Context, opts ...grpc.CallOption) (ServiceMeshMetricService_CollectClient, error) {
- stream, err := c.cc.NewStream(ctx, &_ServiceMeshMetricService_serviceDesc.Streams[0], "/skywalking.v3.ServiceMeshMetricService/collect", opts...)
+ stream, err := c.cc.NewStream(ctx, &ServiceMeshMetricService_ServiceDesc.Streams[0], "/skywalking.v3.ServiceMeshMetricService/collect", opts...)
if err != nil {
return nil, err
}
@@ -88,7 +89,7 @@ type UnsafeServiceMeshMetricServiceServer interface {
}
func RegisterServiceMeshMetricServiceServer(s grpc.ServiceRegistrar, srv ServiceMeshMetricServiceServer) {
- s.RegisterService(&_ServiceMeshMetricService_serviceDesc, srv)
+ s.RegisterService(&ServiceMeshMetricService_ServiceDesc, srv)
}
func _ServiceMeshMetricService_Collect_Handler(srv interface{}, stream grpc.ServerStream) error {
@@ -117,7 +118,10 @@ func (x *serviceMeshMetricServiceCollectServer) Recv() (*ServiceMeshMetric, erro
return m, nil
}
-var _ServiceMeshMetricService_serviceDesc = grpc.ServiceDesc{
+// ServiceMeshMetricService_ServiceDesc is the grpc.ServiceDesc for ServiceMeshMetricService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var ServiceMeshMetricService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "skywalking.v3.ServiceMeshMetricService",
HandlerType: (*ServiceMeshMetricServiceServer)(nil),
Methods: []grpc.MethodDesc{},
diff --git a/tools/protocol_gen.sh b/tools/protocol_gen.sh
index a83ca39..b2bb131 100755
--- a/tools/protocol_gen.sh
+++ b/tools/protocol_gen.sh
@@ -28,8 +28,8 @@ export GEN_CODE_PATH=protocol/gen-codes
export COLLECT_PROTOCOL_MODULE=skywalking/network
-go install google.golang.org/protobuf/cmd/protoc-gen-go
-go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
+go get -u google.golang.org/protobuf/cmd/protoc-gen-go@v1.25.0
+go get -u google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
# generate codes by merged proto files
rm -rf $GEN_CODE_PATH && rm -rf $PROTO_HOME