Skip to content

Commit 40fd06a

Browse files
tigrannajaryantigrannajaryan
authored
[testbed] Add metric correctness test for STEF format (#40086)
Added STEF format to TestHarness_MetricsGoldenData. I had to fix TestNewInProcessPipeline to use a dynamic port for own telemetry to avoid attempts to listen on the same port (see for example failure here https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/15260552200/job/42917558219?pr=40086)
1 parent cb115af commit 40fd06a

File tree

9 files changed

+69
-2
lines changed

9 files changed

+69
-2
lines changed

‎cmd/opampsupervisor/go.mod

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ require (
9292
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.127.0 // indirect
9393
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.127.0 // indirect
9494
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.127.0 // indirect
95+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stefexporter v0.127.0 // indirect
9596
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.127.0 // indirect
9697
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.127.0 // indirect
9798
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.127.0 // indirect
@@ -107,6 +108,7 @@ require (
107108
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.127.0 // indirect
108109
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.127.0 // indirect
109110
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.127.0 // indirect
111+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stefreceiver v0.127.0 // indirect
110112
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.127.0 // indirect
111113
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.127.0 // indirect
112114
github.com/openzipkin/zipkin-go v0.4.3 // indirect
@@ -122,6 +124,10 @@ require (
122124
github.com/soheilhy/cmux v0.1.5 // indirect
123125
github.com/spf13/cobra v1.9.1 // indirect
124126
github.com/spf13/pflag v1.0.6 // indirect
127+
github.com/splunk/stef/go/grpc v0.0.6 // indirect
128+
github.com/splunk/stef/go/otel v0.0.6 // indirect
129+
github.com/splunk/stef/go/pdata v0.0.6 // indirect
130+
github.com/splunk/stef/go/pkg v0.0.6 // indirect
125131
github.com/tklauser/go-sysconf v0.3.14 // indirect
126132
github.com/tklauser/numcpus v0.8.0 // indirect
127133
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -210,12 +216,14 @@ require (
210216
golang.org/x/crypto v0.38.0 // indirect
211217
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
212218
golang.org/x/net v0.40.0 // indirect
219+
golang.org/x/sync v0.14.0 // indirect
213220
golang.org/x/text v0.25.0 // indirect
214221
gonum.org/v1/gonum v0.16.0 // indirect
215222
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
216223
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
217224
google.golang.org/grpc v1.72.2 // indirect
218225
gopkg.in/yaml.v2 v2.4.0 // indirect
226+
modernc.org/b/v2 v2.1.0 // indirect
219227
sigs.k8s.io/yaml v1.4.0 // indirect
220228
)
221229

‎cmd/opampsupervisor/go.sum

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

‎exporter/elasticsearchexporter/integrationtest/go.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ require (
104104
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.127.0 // indirect
105105
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.127.0 // indirect
106106
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.127.0 // indirect
107+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stefexporter v0.127.0 // indirect
107108
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.127.0 // indirect
108109
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.127.0 // indirect
109110
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.127.0 // indirect
@@ -118,6 +119,7 @@ require (
118119
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.127.0 // indirect
119120
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.127.0 // indirect
120121
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.127.0 // indirect
122+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stefreceiver v0.127.0 // indirect
121123
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.127.0 // indirect
122124
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.127.0 // indirect
123125
github.com/openzipkin/zipkin-go v0.4.3 // indirect
@@ -134,6 +136,10 @@ require (
134136
github.com/soheilhy/cmux v0.1.5 // indirect
135137
github.com/spf13/cobra v1.9.1 // indirect
136138
github.com/spf13/pflag v1.0.6 // indirect
139+
github.com/splunk/stef/go/grpc v0.0.6 // indirect
140+
github.com/splunk/stef/go/otel v0.0.6 // indirect
141+
github.com/splunk/stef/go/pdata v0.0.6 // indirect
142+
github.com/splunk/stef/go/pkg v0.0.6 // indirect
137143
github.com/tklauser/go-sysconf v0.3.14 // indirect
138144
github.com/tklauser/numcpus v0.8.0 // indirect
139145
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -237,6 +243,7 @@ require (
237243
gopkg.in/yaml.v2 v2.4.0 // indirect
238244
gopkg.in/yaml.v3 v3.0.1 // indirect
239245
howett.net/plist v1.0.1 // indirect
246+
modernc.org/b/v2 v2.1.0 // indirect
240247
sigs.k8s.io/yaml v1.4.0 // indirect
241248
)
242249

‎exporter/elasticsearchexporter/integrationtest/go.sum

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

‎testbed/correctnesstests/metrics/testdata/generated_pict_pairs_metrics_pipeline.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Receiver Exporter
22
otlp otlp
3+
stef stef

‎testbed/correctnesstests/metrics/testdata/pict_input_metrics_pipeline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Receiver: otlp
2-
Exporter: otlp
1+
Receiver: otlp, stef
2+
Exporter: otlp, stef

‎testbed/correctnesstests/utils.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ func ConstructMetricsSender(t *testing.T, receiver string) testbed.MetricDataSen
204204
switch receiver {
205205
case "otlp":
206206
sender = testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t))
207+
case "stef":
208+
sender = datasenders.NewStefDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t))
207209
case "opencensus":
208210
sender = datasenders.NewOCMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t))
209211
case "prometheus":
@@ -222,6 +224,8 @@ func ConstructReceiver(t *testing.T, exporter string) testbed.DataReceiver {
222224
receiver = testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t))
223225
case "opencensus":
224226
receiver = datareceivers.NewOCDataReceiver(testutil.GetAvailablePort(t))
227+
case "stef":
228+
receiver = datareceivers.NewStefDataReceiver(testutil.GetAvailablePort(t))
225229
case "jaeger":
226230
receiver = datareceivers.NewJaegerDataReceiver(testutil.GetAvailablePort(t))
227231
case "zipkin":

‎testbed/testbed/components.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ import (
2222
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector"
2323
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
2424
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter"
25+
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stefexporter"
2526
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter"
2627
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter"
2728
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver"
2829
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver"
30+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stefreceiver"
2931
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver"
3032
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
3133
)
@@ -46,6 +48,7 @@ func Components() (
4648
jaegerreceiver.NewFactory(),
4749
opencensusreceiver.NewFactory(),
4850
otlpreceiver.NewFactory(),
51+
stefreceiver.NewFactory(),
4952
syslogreceiver.NewFactory(),
5053
zipkinreceiver.NewFactory(),
5154
)
@@ -56,6 +59,7 @@ func Components() (
5659
opencensusexporter.NewFactory(),
5760
otlpexporter.NewFactory(),
5861
otlphttpexporter.NewFactory(),
62+
stefexporter.NewFactory(),
5963
syslogexporter.NewFactory(),
6064
zipkinexporter.NewFactory(),
6165
)

‎testbed/testbed/in_process_collector_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,22 @@ service:
3636
receivers: [%v]
3737
processors: [batch]
3838
exporters: [%v]
39+
telemetry:
40+
metrics:
41+
readers:
42+
- pull:
43+
exporter:
44+
prometheus:
45+
host: '127.0.0.1'
46+
port: %d
3947
`
4048
config := fmt.Sprintf(
4149
format,
4250
sender.GenConfigYAMLStr(),
4351
receiver.GenConfigYAMLStr(),
4452
sender.ProtocolName(),
4553
receiver.ProtocolName(),
54+
testutil.GetAvailablePort(t),
4655
)
4756
configCleanup, cfgErr := runner.PrepareConfig(t, config)
4857
defer configCleanup()

0 commit comments

Comments
 (0)