Update to latest Testbed from core (#56)

Updated Testbed dependency to latest commit in the core Collector repo.
open-telemetry · Dec 11, 2019 · 549afe2 · 549afe2
1 parent efda196
commit 549afe2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/testbed/go.mod b/testbed/go.mod
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/testbed
 go 1.12
 
 require (
-	github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191209163440-5d463fe48816
-	github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191209163440-5d463fe48816
+	github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191211145602-94066e4c70c1
+	github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191211145602-94066e4c70c1
 	github.com/stretchr/testify v1.4.0
 )
diff --git a/testbed/go.sum b/testbed/go.sum
@@ -4,6 +4,7 @@ cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSR
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 h1:xdP25yLqNGSnpfDmEChwA9ZuKLdiyL0jqJKPm/Ypfag=
 contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM=
+contrib.go.opencensus.io/exporter/ocagent v0.6.0 h1:Z1n6UAyr0QwM284yUuh5Zd8JlvxUGAhFZcgMJkMPrGM=
 contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs=
 contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A=
 contrib.go.opencensus.io/resource v0.1.2/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA=
@@ -369,10 +370,14 @@ github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191205212659-419ed6
 github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191205212659-419ed61e5bac/go.mod h1:WxiK9mcisb/hM6M6+2BRV/VIU2c8VzlCRJED2S1MWns=
 github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191209163440-5d463fe48816 h1:jVHc4z0F+QFSVWwpyE5aq4qXMseHEDZFLVueVsFze6M=
 github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191209163440-5d463fe48816/go.mod h1:WxiK9mcisb/hM6M6+2BRV/VIU2c8VzlCRJED2S1MWns=
+github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191211145602-94066e4c70c1 h1:hpxbVMM+AK4T5xxugQGO6NF7h/Inj3F+BdRiYeiBRb8=
+github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191211145602-94066e4c70c1/go.mod h1:WxiK9mcisb/hM6M6+2BRV/VIU2c8VzlCRJED2S1MWns=
 github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191206193345-8739948139e0 h1:E0PePrVOI/qnjZLH46e5fDMZGiJpyQIZxC86wAIFp9w=
 github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191206193345-8739948139e0/go.mod h1:bd5+hmcMPWQNXGrgUmfxTESLvlGpvRBUNaRX/TxTfuk=
 github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191209163440-5d463fe48816 h1:vGnpaKTVNqf8Vdrw/vQBAGVM1pkb8I98YIvqWPFuw1I=
 github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191209163440-5d463fe48816/go.mod h1:bd5+hmcMPWQNXGrgUmfxTESLvlGpvRBUNaRX/TxTfuk=
+github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191211145602-94066e4c70c1 h1:T/EY2fKzuUDkDcVZ7Nr9ZJPqcvyfoomC+3UIHuV2Liw=
+github.com/open-telemetry/opentelemetry-collector/testbed v0.0.0-20191211145602-94066e4c70c1/go.mod h1:0x5LWC/8hyS8Q8fCi0elhTYf9S94RzRX6ZgL7EiYvlQ=
 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

diff --git a/testbed/tests/results/BASELINE.md b/testbed/tests/results/BASELINE.md
@@ -1,8 +1,6 @@
 # Test Results
-Started: Mon, 09 Dec 2019 12:08:37 -0500
+Started: Wed, 11 Dec 2019 10:08:16 -0500
 
-Test                                    |Result|Duration|CPU Avg%|CPU Max%|RAM Avg MiB|RAM Max MiB|Sent Spans|Received Spans
-----------------------------------------|------|-------:|-------:|-------:|----------:|----------:|---------:|-------------:
-Test10kSPS/JaegerRx                     |PASS  |     15s|    44.9|    49.5|         21|         26|    150020|        150020
-
-Total duration: 15s
+Test                                    |Result|Duration|CPU Avg%|CPU Max%|RAM Avg MiB|RAM Max MiB|Sent Items|Received Items|
+----------------------------------------|------|-------:|-------:|-------:|----------:|----------:|---------:|-------------:|
+Trace10kSPS/JaegerReceiver              |PASS  |     16s|    49.4|    55.2|         20|         25|    149600|        149600|
diff --git a/testbed/tests/perf_test.go → testbed/tests/trace_test.go b/testbed/tests/perf_test.go → testbed/tests/trace_test.go
@@ -22,25 +22,29 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-collector/testbed/testbed"
 	scenarios "github.com/open-telemetry/opentelemetry-collector/testbed/tests"
-	"github.com/open-telemetry/opentelemetry-collector/testutils"
 )
 
 // TestMain is used to initiate setup, execution and tear down of testbed.
 func TestMain(m *testing.M) {
 	testbed.DoTestMain(m)
 }
 
-func Test10kSPS(t *testing.T) {
+func TestTrace10kSPS(t *testing.T) {
 	tests := []struct {
 		name     string
 		receiver testbed.Receiver
 	}{
-		{"JaegerRx", testbed.NewJaegerReceiver(int(testutils.GetAvailablePort(t)))},
+		{"JaegerReceiver", testbed.NewJaegerReceiver(testbed.GetAvailablePort(t))},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			scenarios.Scenario10kSPS(t, testbed.NewJaegerExporter(int(testutils.GetAvailablePort(t))), test.receiver)
+			scenarios.Scenario10kItemsPerSecond(
+				t,
+				testbed.NewJaegerExporter(testbed.GetAvailablePort(t)),
+				test.receiver,
+				testbed.LoadOptions{},
+			)
 		})
 	}
 }