fixed trunk stuff

Author: darkcoderrises

dgraph/cmd/zero/zero.go

@@ -443,7 +443,7 @@ func (s *Server) Inform(ctx context.Context, req *pb.TabletRequest) (*pb.TabletR
 	}
 
 	if err := s.Node.proposeAndWait(ctx, &proposal); err != nil && err != errTabletAlreadyServed {
-		span.AddEvent(fmt.Sprintf("Error proposing tablet: %+v. Error: %v", proposal, err))
+		span.AddEvent(fmt.Sprintf("Error proposing tablet: %+v. Error: %v", &proposal, err))
 		return nil, err
 	}
 
@@ -698,7 +698,7 @@ func (s *Server) ShouldServe(
 	}
 	proposal.Tablet = tablet
 	if err := s.Node.proposeAndWait(ctx, &proposal); err != nil && err != errTabletAlreadyServed {
-		span.AddEvent(fmt.Sprintf("Error proposing tablet: %+v. Error: %v", proposal, err))
+		span.AddEvent(fmt.Sprintf("Error proposing tablet: %+v. Error: %v", &proposal, err))
 		return tablet, err
 	}
 	tab = s.ServingTablet(tablet.Predicate)

x/metrics.go

@@ -440,7 +440,7 @@ var (
 	}
 )
 
-func startTracing() (*traceTel.TracerProvider, error) {
+func startTracing() {
 	headers := map[string]string{
 		"content-type": "application/json",
 	}
@@ -454,7 +454,7 @@ func startTracing() (*traceTel.TracerProvider, error) {
 		),
 	)
 	if err != nil {
-		return nil, fmt.Errorf("creating new exporter: %w", err)
+		glog.Errorf("creating new exporter: %v", err)
 	}
 
 	tracerprovider := traceTel.NewTracerProvider(
@@ -473,8 +473,6 @@ func startTracing() (*traceTel.TracerProvider, error) {
 	)
 
 	otel.SetTracerProvider(tracerprovider)
-
-	return tracerprovider, nil
 }
 
 func init() {