Skip to content

Commit be0715a

Browse files
committed
[testbed] Add batcher performance tests
# Conflicts: # cmd/oteltestbedcol/builder-config.yaml # Conflicts: # cmd/oteltestbedcol/builder-config.yaml
1 parent 75b86ee commit be0715a

File tree

10 files changed

+321
-7
lines changed

10 files changed

+321
-7
lines changed

.chloggen/test_testbed-batcher.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: testbed
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add batcher performance tests
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [36206]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

cmd/oteltestbedcol/builder-config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ processors:
3333
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.0
3434
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.115.0
3535
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.115.0
36+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.115.0
37+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.115.0
3638

3739
receivers:
3840
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
@@ -100,6 +102,8 @@ replaces:
100102
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../../exporter/sapmexporter
101103
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ../../receiver/syslogreceiver
102104
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor => ../../processor/resourceprocessor
105+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor => ../../processor/transformprocessor
106+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor => ../../processor/filterprocessor
103107
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter => ../../exporter/carbonexporter
104108
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => ../../pkg/translator/prometheus
105109
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden

testbed/stabilitytests/metric_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestStabilityMetricsOTLP(t *testing.T) {
2626
contribPerfResultsSummary,
2727
nil,
2828
nil,
29+
nil,
2930
)
3031
}
3132

@@ -42,6 +43,7 @@ func TestStabilityMetricsOpenCensus(t *testing.T) {
4243
contribPerfResultsSummary,
4344
nil,
4445
nil,
46+
nil,
4547
)
4648
}
4749

@@ -58,6 +60,7 @@ func TestStabilityMetricsCarbon(t *testing.T) {
5860
contribPerfResultsSummary,
5961
nil,
6062
nil,
63+
nil,
6164
)
6265
}
6366

@@ -74,5 +77,6 @@ func TestStabilityMetricsSignalFx(t *testing.T) {
7477
contribPerfResultsSummary,
7578
nil,
7679
nil,
80+
nil,
7781
)
7882
}

testbed/stabilitytests/trace_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func TestStabilityTracesOpenCensus(t *testing.T) {
5252
contribPerfResultsSummary,
5353
processorsConfig,
5454
nil,
55+
nil,
5556
)
5657
}
5758

@@ -68,6 +69,7 @@ func TestStabilityTracesSAPM(t *testing.T) {
6869
contribPerfResultsSummary,
6970
processorsConfig,
7071
nil,
72+
nil,
7173
)
7274
}
7375

@@ -84,6 +86,7 @@ func TestStabilityTracesOTLP(t *testing.T) {
8486
contribPerfResultsSummary,
8587
processorsConfig,
8688
nil,
89+
nil,
8790
)
8891
}
8992

@@ -100,6 +103,7 @@ func TestStabilityTracesJaegerGRPC(t *testing.T) {
100103
contribPerfResultsSummary,
101104
processorsConfig,
102105
nil,
106+
nil,
103107
)
104108
}
105109

@@ -116,6 +120,7 @@ func TestStabilityTracesZipkin(t *testing.T) {
116120
contribPerfResultsSummary,
117121
processorsConfig,
118122
nil,
123+
nil,
119124
)
120125
}
121126

@@ -132,5 +137,6 @@ func TestStabilityTracesDatadog(t *testing.T) {
132137
contribPerfResultsSummary,
133138
processorsConfig,
134139
nil,
140+
nil,
135141
)
136142
}

testbed/testbed/receivers.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ type BaseOTLPDataReceiver struct {
5656
retry string
5757
sendingQueue string
5858
timeout string
59+
batcher string
5960
}
6061

6162
func (bor *BaseOTLPDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, lc consumer.Logs) error {
@@ -104,6 +105,11 @@ func (bor *BaseOTLPDataReceiver) WithTimeout(timeout string) *BaseOTLPDataReceiv
104105
return bor
105106
}
106107

108+
func (bor *BaseOTLPDataReceiver) WithBatcher(batcher string) *BaseOTLPDataReceiver {
109+
bor.batcher = batcher
110+
return bor
111+
}
112+
107113
func (bor *BaseOTLPDataReceiver) Stop() error {
108114
// we reuse the receiver across signals. Shutting down the log receiver shuts down the metrics and traces receiver.
109115
return bor.logReceiver.Shutdown(context.Background())
@@ -125,8 +131,9 @@ func (bor *BaseOTLPDataReceiver) GenConfigYAMLStr() string {
125131
%s
126132
%s
127133
%s
134+
%s
128135
tls:
129-
insecure: true`, bor.exporterType, addr, bor.retry, bor.sendingQueue, bor.timeout)
136+
insecure: true`, bor.exporterType, addr, bor.retry, bor.sendingQueue, bor.timeout, bor.batcher)
130137
comp := "none"
131138
if bor.compression != "" {
132139
comp = bor.compression

0 commit comments

Comments
 (0)