Skip to content

Commit c995625

Browse files
songy23songy23
authored
[chore][testbed] clean up SAPM tests (#40843)
#### Description Clean up SAPM tests in testbed. Both sapmreceiver and sapmexporter have been deprecated, and the sapm tests have been flaky on mainline. #### Link to tracking issue #40483
1 parent bd22578 commit c995625

File tree

9 files changed

+5
-216
lines changed

9 files changed

+5
-216
lines changed

‎cmd/opampsupervisor/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslo
253253

254254
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => ../../pkg/batchperresourceattr
255255

256-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../../exporter/sapmexporter
257-
258256
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin
259257

260258
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../../exporter/splunkhecexporter
@@ -281,8 +279,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/share
281279

282280
replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed => ../../testbed
283281

284-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver => ../../receiver/sapmreceiver
285-
286282
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../../receiver/datadogreceiver
287283

288284
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver

‎exporter/elasticsearchexporter/integrationtest/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperre
309309

310310
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../../../receiver/datadogreceiver
311311

312-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../../sapmexporter
313-
314312
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter => ../../carbonexporter
315313

316314
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../../splunkhecexporter
@@ -325,8 +323,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splun
325323

326324
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => ../../../pkg/translator/prometheus
327325

328-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver => ../../../receiver/sapmreceiver
329-
330326
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../../pkg/resourcetotelemetry
331327

332328
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../prometheusremotewriteexporter

‎internal/tidylist/tidylist.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,24 @@ internal/exp/metrics
2222
processor/deltatocumulativeprocessor
2323
receiver/prometheusreceiver
2424
exporter/prometheusexporter
25+
internal/gopsutilenv
2526
internal/splunk
2627
pkg/batchperresourceattr
27-
pkg/core/xidutils
28-
pkg/translator/jaeger
29-
exporter/sapmexporter
30-
internal/gopsutilenv
3128
pkg/experimentalmetricmetadata
3229
pkg/translator/signalfx
3330
exporter/signalfxexporter
3431
exporter/stefexporter
3532
exporter/syslogexporter
33+
pkg/core/xidutils
3634
pkg/translator/zipkin
3735
receiver/zipkinreceiver
3836
exporter/zipkinexporter
3937
extension/storage
4038
pkg/stanza
39+
pkg/translator/jaeger
4140
receiver/carbonreceiver
4241
receiver/datadogreceiver
4342
receiver/jaegerreceiver
44-
receiver/sapmreceiver
4543
receiver/signalfxreceiver
4644
exporter/splunkhecexporter
4745
extension/ackextension
@@ -145,6 +143,7 @@ receiver/otelarrowreceiver
145143
exporter/pulsarexporter
146144
internal/rabbitmq
147145
exporter/rabbitmqexporter
146+
exporter/sapmexporter
148147
exporter/sematextexporter
149148
exporter/sentryexporter
150149
extension/sumologicextension
@@ -300,6 +299,7 @@ receiver/receivercreator
300299
receiver/redisreceiver
301300
receiver/riakreceiver
302301
receiver/saphanareceiver
302+
receiver/sapmreceiver
303303
receiver/simpleprometheusreceiver/examples/federation/prom-counter
304304
receiver/simpleprometheusreceiver
305305
receiver/skywalkingreceiver

‎testbed/datareceivers/sapm.go

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎testbed/datasenders/sapm.go

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎testbed/go.mod

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.128.0
1111
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.128.0
1212
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.128.0
13-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.128.0
1413
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.128.0
1514
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stefexporter v0.128.0
1615
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.128.0
@@ -26,7 +25,6 @@ require (
2625
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.128.0
2726
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.128.0
2827
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.128.0
29-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.128.0
3028
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.128.0
3129
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.128.0
3230
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stefreceiver v0.128.0
@@ -200,7 +198,6 @@ require (
200198
github.com/iancoleman/strcase v0.3.0 // indirect
201199
github.com/inconshreveable/mousetrap v1.1.0 // indirect
202200
github.com/ionos-cloud/sdk-go/v6 v6.3.3 // indirect
203-
github.com/jaegertracing/jaeger v1.66.0 // indirect
204201
github.com/jmespath/go-jmespath v0.4.0 // indirect
205202
github.com/jonboulle/clockwork v0.5.0 // indirect
206203
github.com/josharian/intern v1.0.0 // indirect
@@ -279,7 +276,6 @@ require (
279276
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
280277
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
281278
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
282-
github.com/signalfx/sapm-proto v0.17.0 // indirect
283279
github.com/soheilhy/cmux v0.1.5 // indirect
284280
github.com/spf13/cobra v1.9.1 // indirect
285281
github.com/spf13/pflag v1.0.6 // indirect
@@ -407,8 +403,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prome
407403

408404
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../exporter/prometheusremotewriteexporter
409405

410-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../exporter/sapmexporter
411-
412406
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter => ../exporter/signalfxexporter
413407

414408
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../exporter/splunkhecexporter
@@ -447,8 +441,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/openc
447441

448442
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../receiver/prometheusreceiver
449443

450-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver => ../receiver/sapmreceiver
451-
452444
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver => ../receiver/signalfxreceiver
453445

454446
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver => ../receiver/splunkhecreceiver

‎testbed/go.sum

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎testbed/stabilitytests/trace_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,6 @@ func TestStabilityTracesOpenCensus(t *testing.T) {
5656
)
5757
}
5858

59-
func TestStabilityTracesSAPM(t *testing.T) {
60-
scenarios.Scenario10kItemsPerSecond(
61-
t,
62-
datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), ""),
63-
datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), ""),
64-
testbed.ResourceSpec{
65-
ExpectedMaxCPU: 40,
66-
ExpectedMaxRAM: 100,
67-
ResourceCheckPeriod: resourceCheckPeriod,
68-
},
69-
contribPerfResultsSummary,
70-
processorsConfig,
71-
nil,
72-
nil,
73-
)
74-
}
75-
7659
func TestStabilityTracesOTLP(t *testing.T) {
7760
scenarios.Scenario10kItemsPerSecond(
7861
t,

‎testbed/tests/trace_test.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -92,33 +92,6 @@ func TestTrace10kSPS(t *testing.T) {
9292
ExpectedMaxRAM: 220,
9393
},
9494
},
95-
{
96-
"SAPM",
97-
datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), ""),
98-
datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), ""),
99-
testbed.ResourceSpec{
100-
ExpectedMaxCPU: 32,
101-
ExpectedMaxRAM: 100,
102-
},
103-
},
104-
{
105-
"SAPM-gzip",
106-
datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), "gzip"),
107-
datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), "gzip"),
108-
testbed.ResourceSpec{
109-
ExpectedMaxCPU: 35,
110-
ExpectedMaxRAM: 110,
111-
},
112-
},
113-
{
114-
"SAPM-zstd",
115-
datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), "zstd"),
116-
datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), "zstd"),
117-
testbed.ResourceSpec{
118-
ExpectedMaxCPU: 32,
119-
ExpectedMaxRAM: 300,
120-
},
121-
},
12295
{
12396
"Zipkin",
12497
datasenders.NewZipkinDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)),

0 commit comments

Comments
 (0)