Merge pull request #3130 from jackfrancis/swallowed-contextss

k8s-ci-robot · web-flow · commit 9ae5027646fb · 2023-01-31T19:49:21.000-08:00
missing context wrapping
diff --git a/azure/scope/machinepool.go b/azure/scope/machinepool.go
@@ -547,7 +547,7 @@ func (m *MachinePoolScope) GetBootstrapData(ctx context.Context) (string, error)
 
 // GetVMImage picks an image from the AzureMachinePool configuration, or uses a default one.
 func (m *MachinePoolScope) GetVMImage(ctx context.Context) (*infrav1.Image, error) {
-	_, log, done := tele.StartSpanWithLogger(ctx, "scope.MachinePoolScope.GetVMImage")
+	ctx, log, done := tele.StartSpanWithLogger(ctx, "scope.MachinePoolScope.GetVMImage")
 	defer done()
 
 	// Use custom Marketplace image, Image ID or a Shared Image Gallery image if provided
diff --git a/controllers/azurecluster_controller.go b/controllers/azurecluster_controller.go
@@ -71,7 +71,7 @@ func NewAzureClusterReconciler(client client.Client, recorder record.EventRecord
 
 // SetupWithManager initializes this controller with a manager.
 func (acr *AzureClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options Options) error {
-	_, log, done := tele.StartSpanWithLogger(ctx,
+	ctx, log, done := tele.StartSpanWithLogger(ctx,
 		"controllers.AzureClusterReconciler.SetupWithManager",
 		tele.KVP("controller", "AzureCluster"),
 	)
diff --git a/controllers/azureidentity_controller.go b/controllers/azureidentity_controller.go
@@ -53,7 +53,7 @@ type AzureIdentityReconciler struct {
 
 // SetupWithManager initializes this controller with a manager.
 func (r *AzureIdentityReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
-	_, log, done := tele.StartSpanWithLogger(ctx,
+	ctx, log, done := tele.StartSpanWithLogger(ctx,
 		"controllers.AzureIdentityReconciler.SetupWithManager",
 		tele.KVP("controller", "AzureIdentity"),
 	)

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func NewAzureClusterReconciler(client client.Client, recorder record.EventRecord`
`71`	`71`
`72`	`72`	`// SetupWithManager initializes this controller with a manager.`
`73`	`73`	`func (acr *AzureClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options Options) error {`
`74`		`- _, log, done := tele.StartSpanWithLogger(ctx,`
	`74`	`+ ctx, log, done := tele.StartSpanWithLogger(ctx,`
`75`	`75`	`"controllers.AzureClusterReconciler.SetupWithManager",`
`76`	`76`	`tele.KVP("controller", "AzureCluster"),`
`77`	`77`	`)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ type AzureIdentityReconciler struct {`
`53`	`53`
`54`	`54`	`// SetupWithManager initializes this controller with a manager.`
`55`	`55`	`func (r *AzureIdentityReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {`
`56`		`- _, log, done := tele.StartSpanWithLogger(ctx,`
	`56`	`+ ctx, log, done := tele.StartSpanWithLogger(ctx,`
`57`	`57`	`"controllers.AzureIdentityReconciler.SetupWithManager",`
`58`	`58`	`tele.KVP("controller", "AzureIdentity"),`
`59`	`59`	`)`