Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ftr/Transfer tracing context for dubbo protocol #344

Merged
merged 5 commits into from
Jan 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions protocol/dubbo/dubbo_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
)

import (
"github.com/opentracing/opentracing-go"
perrors "github.com/pkg/errors"
)

Expand Down Expand Up @@ -72,6 +73,10 @@ func (di *DubboInvoker) Invoke(ctx context.Context, invocation protocol.Invocati
inv.SetAttachments(k, v)
}
}

// put the ctx into attachment
di.appendCtx(ctx, inv)

url := di.GetUrl()
// async
async, err := strconv.ParseBool(inv.AttachmentsByKey(constant.ASYNC_KEY, "false"))
Expand Down Expand Up @@ -112,3 +117,17 @@ func (di *DubboInvoker) Destroy() {
}
})
}

// Finally, I made the decision that I don't provide a general way to transfer the whole context
// because it could be misused. If the context contains to many key-value pairs, the performance will be much lower.
func (di *DubboInvoker) appendCtx(ctx context.Context, inv *invocation_impl.RPCInvocation) {
// inject opentracing ctx
currentSpan := opentracing.SpanFromContext(ctx)
if currentSpan != nil {
carrier := opentracing.TextMapCarrier(inv.Attachments())
err := opentracing.GlobalTracer().Inject(currentSpan.Context(), opentracing.TextMap, carrier)
if err != nil {
logger.Errorf("Could not inject the span context into attachments: %v", err)
}
}
}
6 changes: 6 additions & 0 deletions protocol/dubbo/dubbo_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
)

import (
"github.com/opentracing/opentracing-go"
"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -81,6 +82,11 @@ func TestDubboInvoker_Invoke(t *testing.T) {
res = invoker.Invoke(context.Background(), inv)
assert.EqualError(t, res.Error(), "request need @response")

// testing appendCtx
span, ctx := opentracing.StartSpanFromContext(context.Background(), "TestOperation")
invoker.Invoke(ctx, inv)
span.Finish()

// destroy
lock.Lock()
proto.Destroy()
Expand Down
29 changes: 24 additions & 5 deletions protocol/dubbo/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
import (
"github.com/apache/dubbo-go-hessian2"
"github.com/dubbogo/getty"
"github.com/opentracing/opentracing-go"
perrors "github.com/pkg/errors"
)

Expand Down Expand Up @@ -63,9 +64,9 @@ func (s *rpcSession) GetReqNum() int32 {
return atomic.LoadInt32(&s.reqNum)
}

////////////////////////////////////////////
// //////////////////////////////////////////
// RpcClientHandler
////////////////////////////////////////////
// //////////////////////////////////////////

// RpcClientHandler ...
type RpcClientHandler struct {
Expand Down Expand Up @@ -157,9 +158,9 @@ func (h *RpcClientHandler) OnCron(session getty.Session) {
h.conn.pool.rpcClient.heartbeat(session)
}

////////////////////////////////////////////
// //////////////////////////////////////////
// RpcServerHandler
////////////////////////////////////////////
// //////////////////////////////////////////

// RpcServerHandler ...
type RpcServerHandler struct {
Expand Down Expand Up @@ -284,7 +285,10 @@ func (h *RpcServerHandler) OnMessage(session getty.Session, pkg interface{}) {

args := p.Body.(map[string]interface{})["args"].([]interface{})
inv := invocation.NewRPCInvocation(p.Service.Method, args, attachments)
result := invoker.Invoke(context.Background(), inv)

ctx := rebuildCtx(inv)

result := invoker.Invoke(ctx, inv)
if err := result.Error(); err != nil {
p.Header.ResponseStatus = hessian.Response_OK
p.Body = hessian.NewResponse(nil, err, result.Attachments())
Expand Down Expand Up @@ -327,6 +331,21 @@ func (h *RpcServerHandler) OnCron(session getty.Session) {
}
}

// rebuildCtx rebuild the context by attachment.
// Once we decided to transfer more context's key-value, we should change this.
// now we only support rebuild the tracing context
func rebuildCtx(inv *invocation.RPCInvocation) context.Context {
ctx := context.Background()

// actually, if user do not use any opentracing framework, the err will not be nil.
spanCtx, err := opentracing.GlobalTracer().Extract(opentracing.TextMap,
opentracing.TextMapCarrier(inv.Attachments()))
if err == nil {
ctx = context.WithValue(ctx, constant.TRACING_REMOTE_SPAN_CTX, spanCtx)
}
return ctx
}

func reply(session getty.Session, req *DubboPackage, tp hessian.PackageType) {
resp := &DubboPackage{
Header: hessian.DubboHeader{
Expand Down
58 changes: 58 additions & 0 deletions protocol/dubbo/listener_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package dubbo

import (
"testing"
)

import (
"github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/mocktracer"
"github.com/stretchr/testify/assert"
)

import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/protocol/invocation"
)

// test rebuild the ctx
func TestRebuildCtx(t *testing.T) {
opentracing.SetGlobalTracer(mocktracer.New())
attach := make(map[string]string, 10)
attach[constant.VERSION_KEY] = "1.0"
attach[constant.GROUP_KEY] = "MyGroup"
inv := invocation.NewRPCInvocation("MethodName", []interface{}{"OK", "Hello"}, attach)

// attachment doesn't contains any tracing key-value pair,
ctx := rebuildCtx(inv)
assert.NotNil(t, ctx)
assert.Nil(t, ctx.Value(constant.TRACING_REMOTE_SPAN_CTX))

span, ctx := opentracing.StartSpanFromContext(ctx, "Test-Client")

opentracing.GlobalTracer().Inject(span.Context(), opentracing.TextMap,
opentracing.TextMapCarrier(inv.Attachments()))
// rebuild the context success
inv = invocation.NewRPCInvocation("MethodName", []interface{}{"OK", "Hello"}, attach)
ctx = rebuildCtx(inv)
span.Finish()
assert.NotNil(t, ctx)
assert.NotNil(t, ctx.Value(constant.TRACING_REMOTE_SPAN_CTX))
}