Skip to content

[cmd/opampsupervisor] Fix leaks in e2e tests #32477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2024
Merged

[cmd/opampsupervisor] Fix leaks in e2e tests #32477

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e77550
[cmd/opampsupervisor] Fix leaks in e2e tests
haoqixu Apr 17, 2024
78d3574
chore: move TestMain into package_test.go
haoqixu Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/opampsupervisor/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,17 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
semconv "go.opentelemetry.io/collector/semconv/v1.21.0"
"go.uber.org/goleak"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor"
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config"
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
}

var _ clientTypes.Logger = testLogger{}

type testLogger struct {
Expand Down Expand Up @@ -513,6 +518,7 @@ func TestSupervisorOpAMPConnectionSettings(t *testing.T) {
},
},
})
waitForSupervisorConnection(newServer.supervisorConnected, true)

require.Eventually(t, func() bool {
return connectedToNewServer.Load() == true
Expand Down