Skip to content
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

Jump to bottom

Always find available ports in testbed #1518

Closed
wants to merge 1 commit into from
Closed

Always find available ports in testbed #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion testbed/testbed/otelcol_runner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestNewInProcessPipeline(t *testing.T) {
factories, err := defaultcomponents.Components()
assert.NoError(t, err)
sender := NewOTLPTraceDataSender(DefaultHost, GetAvailablePort(t))
receiver := NewOTLPDataReceiver(DefaultOTLPPort)
receiver := NewOTLPDataReceiver(GetAvailablePort(t))
runner := NewInProcessCollector(factories, sender.Port)

format := `
Expand Down
8 changes: 0 additions & 8 deletions testbed/testbed/receivers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ type OCDataReceiver struct {
// Ensure OCDataReceiver implements DataReceiver.
var _ DataReceiver = (*OCDataReceiver)(nil)

const DefaultOCPort = 56565

// NewOCDataReceiver creates a new OCDataReceiver that will listen on the specified port after Start
// is called.
func NewOCDataReceiver(port int) *OCDataReceiver {
Expand Down Expand Up @@ -138,8 +136,6 @@ type JaegerDataReceiver struct {
receiver component.TraceReceiver
}

const DefaultJaegerPort = 14250

func NewJaegerDataReceiver(port int) *JaegerDataReceiver {
return &JaegerDataReceiver{DataReceiverBase: DataReceiverBase{Port: port}}
}
Expand Down Expand Up @@ -187,8 +183,6 @@ type OTLPDataReceiver struct {
// Ensure OTLPDataReceiver implements DataReceiver.
var _ DataReceiver = (*OTLPDataReceiver)(nil)

const DefaultOTLPPort = 55680

// NewOTLPDataReceiver creates a new OTLPDataReceiver that will listen on the specified port after Start
// is called.
func NewOTLPDataReceiver(port int) *OTLPDataReceiver {
Expand Down Expand Up @@ -243,8 +237,6 @@ type ZipkinDataReceiver struct {
receiver component.TraceReceiver
}

const DefaultZipkinAddressPort = 9411

func NewZipkinDataReceiver(port int) *ZipkinDataReceiver {
return &ZipkinDataReceiver{DataReceiverBase: DataReceiverBase{Port: port}}
}
Expand Down
8 changes: 4 additions & 4 deletions testbed/tests/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ func TestIdleMode(t *testing.T) {
tc := testbed.NewTestCase(
t,
dataProvider,
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.DefaultJaegerPort),
testbed.NewOCDataReceiver(testbed.DefaultOCPort),
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)),
testbed.NewOCDataReceiver(testbed.GetAvailablePort(t)),
&testbed.ChildProcess{},
&testbed.PerfTestValidator{},
performanceResultsSummary,
Expand Down Expand Up @@ -64,8 +64,8 @@ func TestBallastMemory(t *testing.T) {
tc := testbed.NewTestCase(
t,
dataProvider,
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.DefaultJaegerPort),
testbed.NewOCDataReceiver(testbed.DefaultOCPort),
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)),
testbed.NewOCDataReceiver(testbed.GetAvailablePort(t)),
&testbed.ChildProcess{},
&testbed.PerfTestValidator{},
performanceResultsSummary,
Expand Down
4 changes: 2 additions & 2 deletions testbed/tests/metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ func TestMetricNoBackend10kDPSOpenCensus(t *testing.T) {
tc := testbed.NewTestCase(
t,
dataProvider,
testbed.NewOCMetricDataSender(testbed.DefaultHost, 55678),
testbed.NewOCDataReceiver(testbed.DefaultOCPort),
testbed.NewOCMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)),
testbed.NewOCDataReceiver(testbed.GetAvailablePort(t)),
&testbed.ChildProcess{},
&testbed.PerfTestValidator{},
performanceResultsSummary,
Expand Down
4 changes: 2 additions & 2 deletions testbed/tests/scenarios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ func Scenario1kSPSWithAttrs(t *testing.T, args []string, tests []TestCase, opts
tc := testbed.NewTestCase(
t,
testbed.NewPerfTestDataProvider(options),
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.DefaultJaegerPort),
testbed.NewOCDataReceiver(testbed.DefaultOCPort),
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)),
testbed.NewOCDataReceiver(testbed.GetAvailablePort(t)),
&testbed.ChildProcess{},
&testbed.PerfTestValidator{},
test.resultsSummary,
Expand Down
8 changes: 4 additions & 4 deletions testbed/tests/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ func TestTraceNoBackend10kSPS(t *testing.T) {
}{
{
"JaegerGRPC",
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.DefaultJaegerPort),
testbed.NewOCDataReceiver(testbed.DefaultOCPort),
testbed.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)),
testbed.NewOCDataReceiver(testbed.GetAvailablePort(t)),
testbed.ResourceSpec{
ExpectedMaxCPU: 70,
ExpectedMaxRAM: 198,
Expand All @@ -159,8 +159,8 @@ func TestTraceNoBackend10kSPS(t *testing.T) {
},
{
"Zipkin",
testbed.NewZipkinDataSender(testbed.DefaultHost, testbed.DefaultZipkinAddressPort),
testbed.NewOCDataReceiver(testbed.DefaultOCPort),
testbed.NewZipkinDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)),
testbed.NewOCDataReceiver(testbed.GetAvailablePort(t)),
testbed.ResourceSpec{
ExpectedMaxCPU: 120,
ExpectedMaxRAM: 198,
Expand Down