Skip to content
This repository was archived by the owner on Jun 14, 2023. It is now read-only.

Commit 520133d

Browse files
mrproliumrproliu
authored
Using skywalking goapi as protocol (#98)
1 parent 9094186 commit 520133d

21 files changed

+224
-1593
lines changed

‎Makefile

+2-14
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,14 @@ deps:
2929
test:
3030
go test -v -race -cover -coverprofile=coverage.txt -covermode=atomic `go list ./... | grep -v github.com/SkyAPM/go2sky/reporter/grpc | grep -v github.com/SkyAPM/go2sky/test`
3131

32-
.PHONY: proto-gen
33-
proto-gen:
34-
cd $(GRPC_PATH) && \
35-
protoc common/*.proto --go_out=plugins=grpc:$(GOPATH)/src && \
36-
cp ${GOPATH}/src/github.com/SkyAPM/go2sky/reporter/grpc/common/*.go common/
37-
cd $(GRPC_PATH) && \
38-
protoc language-agent/*.proto --go_out=plugins=grpc:$(GOPATH)/src && \
39-
cp ${GOPATH}/src/github.com/SkyAPM/go2sky/reporter/grpc/language-agent/*.go language-agent/
40-
cd $(GRPC_PATH) && \
41-
protoc management/*.proto --go_out=plugins=grpc:$(GOPATH)/src && \
42-
cp ${GOPATH}/src/github.com/SkyAPM/go2sky/reporter/grpc/management/*.go management/
43-
4432
.PHONY: mock-gen
4533
mock-gen:
4634
cd $(GRPC_PATH)/language-agent && \
4735
mkdir -p mock_trace && \
48-
mockgen github.com/SkyAPM/go2sky/reporter/grpc/language-agent TraceSegmentReportServiceClient > mock_trace/Tracing.mock.go
36+
mockgen skywalking.apache.org/repo/goapi/collect/language/agent/v3 TraceSegmentReportServiceClient > mock_trace/Tracing.mock.go
4937
cd $(GRPC_PATH)/management && \
5038
mkdir -p mock_management && \
51-
mockgen github.com/SkyAPM/go2sky/reporter/grpc/management ManagementServiceClient > mock_management/Management.mock.go
39+
mockgen skywalking.apache.org/repo/goapi/collect/management/v3 ManagementServiceClient > mock_management/Management.mock.go
5240

5341
LINTER := bin/golangci-lint
5442
$(LINTER):

‎go.mod

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ module github.com/SkyAPM/go2sky
33
go 1.12
44

55
require (
6-
github.com/golang/mock v1.2.0
7-
github.com/golang/protobuf v1.3.2
8-
github.com/google/uuid v1.1.1
6+
github.com/golang/mock v1.5.0
7+
github.com/google/uuid v1.1.2
98
github.com/pkg/errors v0.8.1
109
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 // indirect
11-
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 // indirect
1210
golang.org/x/text v0.3.1-0.20181010134911-4d1c5fb19474 // indirect
13-
google.golang.org/grpc v1.27.0
11+
google.golang.org/grpc v1.36.1
12+
skywalking.apache.org/repo/goapi v0.0.0-20210401062122-a049ca15c62d
1413
)

‎go.sum

+102-17
Large diffs are not rendered by default.

‎noop.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package go2sky
2020
import (
2121
"time"
2222

23-
v3 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent"
23+
agentv3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
2424
)
2525

2626
type NoopSpan struct {
@@ -36,7 +36,7 @@ func (*NoopSpan) GetOperationName() string {
3636
func (*NoopSpan) SetPeer(string) {
3737
}
3838

39-
func (*NoopSpan) SetSpanLayer(v3.SpanLayer) {
39+
func (*NoopSpan) SetSpanLayer(agentv3.SpanLayer) {
4040
}
4141

4242
func (*NoopSpan) SetComponent(int32) {

‎noop_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25-
v3 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent"
25+
agentv3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
2626
)
2727

2828
type createFunc func() (Span, context.Context, error)
@@ -92,7 +92,7 @@ func TestNoopMethod(t *testing.T) {
9292
n := NoopSpan{}
9393
n.SetOperationName("aa")
9494
n.SetPeer("localhost:1111")
95-
n.SetSpanLayer(v3.SpanLayer_Database)
95+
n.SetSpanLayer(agentv3.SpanLayer_Database)
9696
n.SetComponent(2)
9797
n.Tag("key", "value")
9898
n.Log(time.Now(), "key", "value")

‎plugins/http/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/SkyAPM/go2sky"
26-
v3 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent"
26+
agentv3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
2727
)
2828

2929
const componentIDGOHttpClient = 5005
@@ -105,7 +105,7 @@ func (t *transport) RoundTrip(req *http.Request) (res *http.Response, err error)
105105
}
106106
span.Tag(go2sky.TagHTTPMethod, req.Method)
107107
span.Tag(go2sky.TagURL, req.URL.String())
108-
span.SetSpanLayer(v3.SpanLayer_Http)
108+
span.SetSpanLayer(agentv3.SpanLayer_Http)
109109
res, err = t.delegated.RoundTrip(req)
110110
if err != nil {
111111
span.Error(time.Now(), err.Error())

‎plugins/http/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/SkyAPM/go2sky"
2727
"github.com/SkyAPM/go2sky/internal/tool"
28-
v3 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent"
28+
agentv3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
2929
)
3030

3131
const (
@@ -95,7 +95,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
9595
}
9696
span.Tag(go2sky.TagHTTPMethod, r.Method)
9797
span.Tag(go2sky.TagURL, fmt.Sprintf("%s%s", r.Host, r.URL.Path))
98-
span.SetSpanLayer(v3.SpanLayer_Http)
98+
span.SetSpanLayer(agentv3.SpanLayer_Http)
9999

100100
rww := &responseWriterWrapper{w: w, statusCode: 200}
101101
defer func() {

‎reporter/grpc.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626

2727
"github.com/SkyAPM/go2sky"
2828
"github.com/SkyAPM/go2sky/internal/tool"
29-
"github.com/SkyAPM/go2sky/reporter/grpc/common"
30-
agentv3 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent"
31-
managementv3 "github.com/SkyAPM/go2sky/reporter/grpc/management"
3229
"google.golang.org/grpc"
3330
"google.golang.org/grpc/connectivity"
3431
"google.golang.org/grpc/credentials"
3532
"google.golang.org/grpc/metadata"
33+
commonv3 "skywalking.apache.org/repo/goapi/collect/common/v3"
34+
agentv3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
35+
managementv3 "skywalking.apache.org/repo/goapi/collect/management/v3"
3636
)
3737

3838
const (
@@ -263,7 +263,7 @@ func (r *gRPCReporter) reportInstanceProperties() (err error) {
263263
props := buildOSInfo()
264264
if r.instanceProps != nil {
265265
for k, v := range r.instanceProps {
266-
props = append(props, &common.KeyStringValuePair{
266+
props = append(props, &commonv3.KeyStringValuePair{
267267
Key: k,
268268
Value: v,
269269
})
@@ -311,29 +311,29 @@ func (r *gRPCReporter) check() {
311311
}()
312312
}
313313

314-
func buildOSInfo() (props []*common.KeyStringValuePair) {
314+
func buildOSInfo() (props []*commonv3.KeyStringValuePair) {
315315
processNo := tool.ProcessNo()
316316
if processNo != "" {
317-
kv := &common.KeyStringValuePair{
317+
kv := &commonv3.KeyStringValuePair{
318318
Key: "Process No.",
319319
Value: processNo,
320320
}
321321
props = append(props, kv)
322322
}
323323

324-
hostname := &common.KeyStringValuePair{
324+
hostname := &commonv3.KeyStringValuePair{
325325
Key: "hostname",
326326
Value: tool.HostName(),
327327
}
328328
props = append(props, hostname)
329329

330-
language := &common.KeyStringValuePair{
330+
language := &commonv3.KeyStringValuePair{
331331
Key: "language",
332332
Value: "go",
333333
}
334334
props = append(props, language)
335335

336-
osName := &common.KeyStringValuePair{
336+
osName := &commonv3.KeyStringValuePair{
337337
Key: "OS Name",
338338
Value: tool.OSName(),
339339
}
@@ -342,7 +342,7 @@ func buildOSInfo() (props []*common.KeyStringValuePair) {
342342
ipv4s := tool.AllIPV4()
343343
if len(ipv4s) > 0 {
344344
for _, ipv4 := range ipv4s {
345-
kv := &common.KeyStringValuePair{
345+
kv := &commonv3.KeyStringValuePair{
346346
Key: "ipv4",
347347
Value: ipv4,
348348
}

0 commit comments

Comments
 (0)