Add opentracing to sync and cleaner services

users-sync/attrsync/sync.go

@@ -2,6 +2,7 @@ package attrsync
 
 import (
 	"context"
+	"github.com/opentracing/opentracing-go"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -118,8 +119,10 @@ func (c *AttributeSyncer) sync() {
 			cancel()
 			return
 		}
+		span, syncCtx := opentracing.StartSpanFromContext(ctx, "Sync")
+		span.LogKV("userFilter", userFilter)
 
-		err := c.syncUsers(ctx, userFilter)
+		err := c.syncUsers(syncCtx, userFilter)
 		if err != nil {
 			c.log.WithField("error", err).Errorln("Error syncing users")
 		}
@@ -139,14 +142,16 @@ func (c *AttributeSyncer) syncUsers(ctx context.Context, userFilter filter.User)
 			break
 		}
 
+		span, pageCtx := opentracing.StartSpanFromContext(ctx, "SyncUsersPage")
+		span.LogKV("count", len(users), "page", page)
 		c.log.WithFields(map[string]interface{}{
 			"filter": userFilter,
 			"count":  len(users),
 			"page":   page,
 		}).Debugf("Syncing attributes for users")
 
 		for _, user := range users {
-			ctxWithID := commonUser.InjectUserID(ctx, user.ID)
+			ctxWithID := commonUser.InjectUserID(pageCtx, user.ID)
 			instrument.CollectedRequest(
 				ctxWithID,
 				"syncUser",

users-sync/cleaner/org.go

@@ -2,6 +2,7 @@ package cleaner
 
 import (
 	"context"
+	"github.com/opentracing/opentracing-go"
 	"github.com/weaveworks/common/logging"
 	"net/http"
 	"time"
@@ -121,20 +122,25 @@ func (c *OrgCleaner) Trigger() {
 }
 
 func (c *OrgCleaner) findAndClean(ctx context.Context) {
+	_, ctx = opentracing.StartSpanFromContext(ctx, "FindAndClean")
 	findAndCleanTotal.Inc()
 	ids, err := c.db.FindUncleanedOrgIDs(ctx)
 	if err != nil {
 		c.log.Warnf("cannot find uncleaned org IDs, error: %s\n", err)
 		errorFindUncleanedOrgIDsTotal.Inc()
 		return
 	}
+
 	uncleanedOrgs.Set(float64(len(ids)))
 	for _, id := range ids {
 		c.clean(ctx, id)
 	}
 }
 
 func (c *OrgCleaner) clean(ctx context.Context, id string) {
+	span, ctx := opentracing.StartSpanFromContext(ctx, "Clean")
+	span.LogKV("OrgId", id)
+
 	done := c.runCleanupJobs(ctx, id)
 	if done {
 		if err := c.db.SetOrganizationCleanup(ctx, id, true); err != nil {