fixup! add span per connection attempt

Signed-off-by: Ondrej Benkovsky <ondrej.benkovsky@wandera.com>
networkservicemesh · Jul 16, 2021 · 46a845a · 46a845a
1 parent 8edc9b4
commit 46a845a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/client.go b/client.go
@@ -68,8 +68,9 @@ func (c *client) Endpoint() string {
 func (c *client) Request(ctx context.Context, r *request.Request) (*dns.Msg, error) {
 	span := ot.SpanFromContext(ctx)
 	if span != nil {
-		childSpan := span.Tracer().StartSpan("connect", ot.ChildOf(span.Context()))
+		childSpan := span.Tracer().StartSpan("request", ot.ChildOf(span.Context()))
 		otext.PeerAddress.Set(childSpan, c.addr)
+		ctx = ot.ContextWithSpan(ctx, childSpan)
 		defer childSpan.Finish()
 	}
 	start := time.Now()

diff --git a/transport.go b/transport.go
@@ -22,6 +22,7 @@ import (
 	"net"
 
 	"github.com/miekg/dns"
+	ot "github.com/opentracing/opentracing-go"
 )
 
 // Transport represent a solution to connect to remote DNS endpoint with specific network
@@ -59,6 +60,12 @@ func (t *transportImpl) Dial(ctx context.Context, network string) (*dns.Conn, er
 }
 
 func (t *transportImpl) dial(ctx context.Context, c *dns.Client) (*dns.Conn, error) {
+	span := ot.SpanFromContext(ctx)
+	if span != nil {
+		childSpan := span.Tracer().StartSpan("connect", ot.ChildOf(span.Context()))
+		ctx = ot.ContextWithSpan(ctx, childSpan)
+		defer childSpan.Finish()
+	}
 	var d net.Dialer
 	if c.Dialer == nil {
 		d = net.Dialer{Timeout: maxTimeout}