merge v3

aphralG · aphralG · commit f436f88b6a8b · 2025-01-15T12:04:56.000Z
diff --git a/internal/command/command_service.go b/internal/command/command_service.go
@@ -328,11 +328,11 @@ func (cs *CommandService) sendResponseForQueuedConfigApplyRequests(
 			"response", newResponse,
 		)
 
-		backOffCtx, backoffCancel := context.WithTimeout(ctx, cs.agentConfig.Common.MaxElapsedTime)
+		backOffCtx, backoffCancel := context.WithTimeout(ctx, cs.agentConfig.Client.Backoff.MaxElapsedTime)
 
 		err := backoff.Retry(
 			cs.sendDataPlaneResponseCallback(ctx, newResponse),
-			backoffHelpers.Context(backOffCtx, cs.agentConfig.Common),
+			backoffHelpers.Context(backOffCtx, cs.agentConfig.Client.Backoff),
 		)
 		if err != nil {
 			slog.ErrorContext(ctx, "Failed to send data plane response", "error", err)

Original file line number	Diff line number	Diff line change
`@@ -328,11 +328,11 @@ func (cs *CommandService) sendResponseForQueuedConfigApplyRequests(`
`328`	`328`	`"response", newResponse,`
`329`	`329`	`)`
`330`	`330`
`331`		`- backOffCtx, backoffCancel := context.WithTimeout(ctx, cs.agentConfig.Common.MaxElapsedTime)`
	`331`	`+ backOffCtx, backoffCancel := context.WithTimeout(ctx, cs.agentConfig.Client.Backoff.MaxElapsedTime)`
`332`	`332`
`333`	`333`	`err := backoff.Retry(`
`334`	`334`	`cs.sendDataPlaneResponseCallback(ctx, newResponse),`
`335`		`- backoffHelpers.Context(backOffCtx, cs.agentConfig.Common),`
	`335`	`+ backoffHelpers.Context(backOffCtx, cs.agentConfig.Client.Backoff),`
`336`	`336`	`)`
`337`	`337`	`if err != nil {`
`338`	`338`	`slog.ErrorContext(ctx, "Failed to send data plane response", "error", err)`