[cmd/opampsupervisor] Errors during bootstrapping will fail to shut down collector

[BinaryFissionGames]

Component(s)

cmd/opampsupervisor

What happened?

Description

If collector bootstrapping fails, the Stop method will not be called for the collector command. This causes the collector to outlive the supervisor, which ends up blocking any attempts for the supervisor to start up again (collector occupies port 8888)

opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/supervisor.go

Line 308 in 011256c

if err = cmd.Stop(context.Background()); err != nil {

Solution would be to use defer statements to ensure the command is always stopped before returning from the getBootstrapInfo method.

Collector version

f8627a7

Environment information

Environment

OS: macos
Compiler(if manually compiled): go 1.22

OpenTelemetry Collector configuration

No response

Log output

No response

Additional context

No response

[github-actions]

Pinging code owners:

• cmd/opampsupervisor: @evan-bradley @atoulme @tigrannajaryan

See Adding Labels via Comments if you do not have permissions to add labels yourself.

[crobert-1]

I don't have very much experience with the area of the collector, but from your description and PR it makes sense to me. Thanks for filing and submitting a fix!