fixed attributes

Author: darkcoderrises

dgraph/cmd/zero/oracle.go

@@ -401,7 +401,7 @@ func (s *Server) commit(ctx context.Context, src *api.TxnContext) error {
 	defer s.orc.doneUntil.Done(src.CommitTs)
 	span.SetAttributes(attribute.Int64("commitTs", int64(src.CommitTs)))
 	span.SetAttributes(attribute.Int64("nodeId", int64(s.Node.Id)))
-	span.SetAttributes(attribute.String("txnContext", fmt.Sprintf("%+v", src)))
+	span.AddEvent(fmt.Sprintf("TXN Context: %+v", src))
 
 	if err := s.orc.commit(src); err != nil {
 		span.SetAttributes(attribute.Bool("abort", true))
@@ -505,7 +505,7 @@ func (s *Server) Timestamps(ctx context.Context, num *pb.Num) (*pb.AssignedIds,
 
 	num.Type = pb.Num_TXN_TS
 	reply, err := s.lease(ctx, num)
-	span.AddEvent(fmt.Sprintf("Response: %+v, Error: %+v", reply, err))
+	span.AddEvent(fmt.Sprintf("Response: %+v, Error: %v", reply, err))
 
 	switch err {
 	case nil:

dgraph/cmd/zero/tablet.go

@@ -170,7 +170,7 @@ func (s *Server) movePredicate(predicate string, srcGroup, dstGroup uint32) erro
 		DestGid:   dstGroup,
 		TxnTs:     ids.StartId,
 	}
-	span.SetAttributes(attribute.String("move_predicate_payload", fmt.Sprintf("%+v", in)))
+	span.AddEvent(fmt.Sprintf("Move Predicate payload: %+v", in))
 	glog.Infof("Starting move: %+v", in)
 	if _, err := wc.MovePredicate(ctx, in); err != nil {
 		return errors.Wrapf(err, "while calling MovePredicate")
@@ -186,14 +186,14 @@ func (s *Server) movePredicate(predicate string, srcGroup, dstGroup uint32) erro
 		MoveTs:            in.TxnTs,
 	}
 	msg = fmt.Sprintf("Move at Alpha done. Now proposing: %+v", p)
-	span.SetAttributes(attribute.String("zero_proposal", fmt.Sprintf("%+v", p)))
+	span.AddEvent(fmt.Sprintf("Zero proposal: %+v", p))
 	glog.Info(msg)
 	if err := s.Node.proposeAndWait(ctx, p); err != nil {
 		return errors.Wrapf(err, "while proposing tablet reassignment. Proposal: %+v", p)
 	}
 	msg = fmt.Sprintf("Predicate move done for: [%v] from group %d to %d\n",
 		predicate, srcGroup, dstGroup)
-	span.SetAttributes(attribute.String("predicate_move_done", msg))
+	span.AddEvent(msg)
 	glog.Info(msg)
 
 	// Now that the move has happened, we can delete the predicate from the source group. But before
@@ -207,11 +207,11 @@ func (s *Server) movePredicate(predicate string, srcGroup, dstGroup uint32) erro
 	if _, err := wc.MovePredicate(ctx, in); err != nil {
 		msg = fmt.Sprintf("While deleting predicate [%v] in group %d. Error: %v",
 			in.Predicate, in.SourceGid, err)
-		span.SetAttributes(attribute.String("predicate_delete_error", msg))
+		span.AddEvent(msg)
 		glog.Warningf(msg)
 	} else {
 		msg = fmt.Sprintf("Deleted predicate %v in group %d", in.Predicate, in.SourceGid)
-		span.SetAttributes(attribute.String("predicate_deleted", msg))
+		span.AddEvent(msg)
 		glog.V(1).Infof(msg)
 	}
 	return nil

dgraph/cmd/zero/zero.go

@@ -8,6 +8,7 @@ package zero
 import (
 	"context"
 	"crypto/tls"
+	"fmt"
 	"math"
 	"sync"
 	"time"
@@ -442,14 +443,14 @@ func (s *Server) Inform(ctx context.Context, req *pb.TabletRequest) (*pb.TabletR
 	}
 
 	if err := s.Node.proposeAndWait(ctx, &proposal); err != nil && err != errTabletAlreadyServed {
-		span.SetAttributes(attribute.String("error", err.Error()))
+		span.AddEvent(fmt.Sprintf("Error proposing tablet: %+v. Error: %v", proposal, err))
 		return nil, err
 	}
 
 	for _, t := range unknownTablets {
 		tab := s.ServingTablet(t.Predicate)
 		x.AssertTrue(tab != nil)
-		span.SetAttributes(attribute.String("tablet_predicate_served", t.Predicate))
+		span.AddEvent(fmt.Sprintf("Tablet served: %+v", tab))
 		tablets = append(tablets, tab)
 	}
 
@@ -697,7 +698,7 @@ func (s *Server) ShouldServe(
 	}
 	proposal.Tablet = tablet
 	if err := s.Node.proposeAndWait(ctx, &proposal); err != nil && err != errTabletAlreadyServed {
-		span.SetAttributes(attribute.String("error", err.Error()))
+		span.AddEvent(fmt.Sprintf("Error proposing tablet: %+v. Error: %v", proposal, err))
 		return tablet, err
 	}
 	tab = s.ServingTablet(tablet.Predicate)

worker/sort.go

@@ -8,6 +8,7 @@ package worker
 import (
 	"context"
 	"encoding/hex"
+	"fmt"
 	"sort"
 	"strings"
 	"time"
@@ -533,9 +534,7 @@ func processSort(ctx context.Context, ts *pb.SortMessage) (*pb.SortResult, error
 		// wait for other goroutine to get cancelled
 		<-resCh
 	} else {
-		span.SetAttributes(
-			attribute.String("processSortError", r.err.Error()),
-		)
+		span.AddEvent(fmt.Sprintf("Error processing sort: %+v", r.err))
 		r = <-resCh
 	}