chore/enterpriseportal: tweak maybeMigrate tracing (#63448)

Fix an issue with context propagation and add a little more detail on
automigration steps

## Test plan

CI

Author: bobheadxi

cmd/enterprise-portal/internal/database/migrate.go

@@ -26,11 +26,13 @@ import (
 // maybeMigrate runs the auto-migration for the database when needed based on
 // the given version.
 func maybeMigrate(ctx context.Context, logger log.Logger, contract runtime.Contract, redisClient *redis.Client, currentVersion string) (err error) {
+	dbName := databaseName(contract.MSP)
 	ctx, span := databaseTracer.Start(
 		ctx,
 		"database.maybeMigrate",
 		trace.WithAttributes(
 			attribute.String("currentVersion", currentVersion),
+			attribute.String("database", dbName),
 		),
 	)
 	defer func() {
@@ -41,7 +43,6 @@ func maybeMigrate(ctx context.Context, logger log.Logger, contract runtime.Contr
 		span.End()
 	}()
 
-	dbName := databaseName(contract.MSP)
 	sqlDB, err := contract.PostgreSQL.OpenDatabase(ctx, dbName)
 	if err != nil {
 		return errors.Wrap(err, "open database")
@@ -78,11 +79,12 @@ func maybeMigrate(ctx context.Context, logger log.Logger, contract runtime.Contr
 		fmt.Sprintf("%s:auto-migrate", dbName),
 		15*time.Second,
 		func() error {
+			ctx := context.WithoutCancel(ctx)
 			span.AddEvent("lock.acquired")
 
 			versionKey := fmt.Sprintf("%s:db_version", dbName)
 			if shouldSkipMigration(
-				redisClient.Get(context.Background(), versionKey).Val(),
+				redisClient.Get(ctx, versionKey).Val(),
 				currentVersion,
 			) {
 				logger.Info("skipped auto-migration",
@@ -92,20 +94,22 @@ func maybeMigrate(ctx context.Context, logger log.Logger, contract runtime.Contr
 				span.SetAttributes(attribute.Bool("skipped", true))
 				return nil
 			}
+			span.SetAttributes(attribute.Bool("skipped", false))
 
 			// Create a session that ignore debug logging.
 			sess := conn.Session(&gorm.Session{
 				Logger: gormlogger.Default.LogMode(gormlogger.Warn),
 			})
 			// Auto-migrate database table definitions.
 			for _, table := range tables.All() {
+				span.AddEvent(fmt.Sprintf("automigrate.%s", table.TableName()))
 				err := sess.AutoMigrate(table)
 				if err != nil {
 					return errors.Wrapf(err, "auto migrating table for %s", errors.Safe(fmt.Sprintf("%T", table)))
 				}
 			}
 
-			return redisClient.Set(context.Background(), versionKey, currentVersion, 0).Err()
+			return redisClient.Set(ctx, versionKey, currentVersion, 0).Err()
 		},
 	)
 }

lib/managedservicesplatform/iam/database.go

@@ -78,6 +78,7 @@ func migrateAndReconcile(ctx context.Context, logger log.Logger, sqlDB *sql.DB,
 			})
 			// Auto-migrate database table definitions.
 			for _, table := range []any{&metadata{}} {
+				span.AddEvent(fmt.Sprintf("automigrate.%s", fmt.Sprintf("%T", table)))
 				err := sess.AutoMigrate(table)
 				if err != nil {
 					return errors.Wrapf(err, "auto migrating table for %s", errors.Safe(fmt.Sprintf("%T", table)))
@@ -91,7 +92,7 @@ func migrateAndReconcile(ctx context.Context, logger log.Logger, sqlDB *sql.DB,
 				assets.PostgresMigrationDir,
 			)
 			if err != nil {
-				return errors.Wrap(err, "run migrations")
+				return errors.Wrap(err, "run OpenFGA migrations")
 			}
 			return nil
 		},