Fix log level value reported by Agent to Fleet (#4838)

pchila · web-flow · commit a206cf71981f · 2024-06-13T12:04:31.000+02:00
* Fix log level value reported by Agent to Fleet

* fixup! Fix log level value reported by Agent to Fleet

* fixup! fixup! Fix log level value reported by Agent to Fleet

* add asserts on metadata.Elastic.Agent

* Fix Fleet log level integration test
diff --git a/internal/pkg/agent/application/gateway/fleet/fleet_gateway.go b/internal/pkg/agent/application/gateway/fleet/fleet_gateway.go
@@ -329,6 +329,10 @@ func (f *FleetGateway) execute(ctx context.Context) (*fleetapi.CheckinResponse,
 	// convert components into checkin components structure
 	components := f.convertToCheckinComponents(state.Components)
 
+	f.log.Debugf("correcting agent loglevel from %s to %s using coordinator state", ecsMeta.Elastic.Agent.LogLevel, state.LogLevel.String())
+	// Fix loglevel with the current log level used by coordinator
+	ecsMeta.Elastic.Agent.LogLevel = state.LogLevel.String()
+
 	// checkin
 	cmd := fleetapi.NewCheckinCmd(f.agentInfo, f.client)
 	req := &fleetapi.CheckinRequest{
diff --git a/internal/pkg/agent/application/info/agent_metadata_test.go b/internal/pkg/agent/application/info/agent_metadata_test.go
@@ -29,6 +29,10 @@ func TestECSMetadata(t *testing.T) {
 	metadata, err := agentInfo.ECSMetadata(l)
 	require.NoError(t, err)
 
+	if assert.NotNil(t, metadata.Elastic, "metadata.Elastic must not be nil") {
+		assert.NotNil(t, metadata.Elastic.Agent, "metadata.Elastic.Agent must not be nil")
+	}
+
 	sysInfo, err := sysinfo.Host()
 	require.NoError(t, err)
 
diff --git a/pkg/testing/fixture.go b/pkg/testing/fixture.go
@@ -665,6 +665,16 @@ func (f *Fixture) PrepareAgentCommand(ctx context.Context, args []string, opts .
 		return nil, fmt.Errorf("failed to prepare before exec: %w", err)
 	}
 
+	// prepare a client if it's not already set
+	if f.c == nil {
+		cAddr, err := control.AddressFromPath(f.operatingSystem, f.workDir)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get control protcol address: %w", err)
+		}
+		agentClient := client.New(client.WithAddress(cAddr))
+		f.setClient(agentClient)
+	}
+
 	// #nosec G204 -- Not so many ways to support variadic arguments to the elastic-agent command :(
 	cmd := exec.CommandContext(ctx, f.binaryPath(), args...)
 	for _, o := range opts {
diff --git a/testing/integration/log_level_test.go b/testing/integration/log_level_test.go
