fix: return error from info.Metadata in FleetGateway execute (#7629) (#7656)

mergify[bot] · pkoutsovasilis · web-flow · commit ed2d88e928c0 · 2025-04-01T12:31:53.000+03:00
(cherry picked from commit 856f285) Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
diff --git a/changelog/fragments/1743421027-Fix-panic-during-shutdown-in-fleetgateway.yaml b/changelog/fragments/1743421027-Fix-panic-during-shutdown-in-fleetgateway.yaml
@@ -0,0 +1,5 @@
+kind: bug-fix
+summary: Fix panic during shutdown in fleetgateway
+component: elastic-agent
+pr: https://github.com/elastic/elastic-agent/pull/7629
+issue: https://github.com/elastic/elastic-agent/issues/7309
diff --git a/internal/pkg/agent/application/gateway/fleet/fleet_gateway.go b/internal/pkg/agent/application/gateway/fleet/fleet_gateway.go
@@ -334,6 +334,7 @@ func (f *FleetGateway) execute(ctx context.Context) (*fleetapi.CheckinResponse,
 	ecsMeta, err := info.Metadata(ctx, f.log)
 	if err != nil {
 		f.log.Error(errors.New("failed to load metadata", err))
+		return nil, 0, err
 	}
 
 	// retrieve ack token from the store

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ func (f FleetGateway) execute(ctx context.Context) (fleetapi.CheckinResponse,`
`334`	`334`	`ecsMeta, err := info.Metadata(ctx, f.log)`
`335`	`335`	`if err != nil {`
`336`	`336`	`f.log.Error(errors.New("failed to load metadata", err))`
	`337`	`+ return nil, 0, err`
`337`	`338`	`}`
`338`	`339`
`339`	`340`	`// retrieve ack token from the store`