Skip to content

Commit 22d8607

Browse files
atoulmeatoulme
authored
Remove resource metrics (#5808)
* remove resource_metrics * remove resource_metrics, fully move to upstream testing
1 parent 68dfaa0 commit 22d8607

38 files changed

+18
-2885
lines changed

‎tests/README.md

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ provides a set of integration tests and associated utilities. The general testi
55
is:
66

77
1. Building the Collector (`make otelcol` or `make all`)
8-
1. Defining your expected [resource metric content](./testutils/README.md#resource-metrics) as a yaml file
9-
([see example](testutils/telemetry/testdata/metrics/resource-metrics.yaml))
8+
1. Defining [your expected golden file content as a yaml file](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/pkg/golden)
109
1. Spin up your target resources as [docker containers](./testutils/README.md#test-containers).
1110
1. Stand up an in-memory [OTLP metrics receiver and sink](./testutils/README.md#otlp-metrics-receiver-sink) capable of detecting if/when desired data are received.
1211
1. Spin up your Collector [as a subprocess](./testutils/README.md#collector-process) or [as a container](./testutils/README.md#collector-container) configured to report to this OTLP receiver.
@@ -17,51 +16,3 @@ is more useful overall.
1716
**NOTE** At this time, integration tests generally target collector containers (`SPLUNK_OTEL_COLLECTOR_IMAGE` env var),
1817
and test coverage for the subprocess is best effort only, unless the test cases explicitly maintain one.
1918
The collector process targets are generally for test development without requiring frequent rebuilds of a local docker image.
20-
21-
```go
22-
package example_test
23-
24-
import (
25-
"context"
26-
"path/filepath"
27-
"testing"
28-
"time"
29-
30-
"github.com/stretchr/testify/require"
31-
32-
"github.com/signalfx/splunk-otel-collector/tests/testutils"
33-
"github.com/signalfx/splunk-otel-collector/tests/testutils/telemetry"
34-
)
35-
36-
func TestMyExampleComponent(t *testing.T) {
37-
expectedResourceMetrics, err := telemetry.LoadResourceMetrics(
38-
filepath.Join(".", "testdata", "metrics", "my_resource_metrics.yaml"),
39-
)
40-
require.NoError(t, err)
41-
require.NotNil(t, expectedResourceMetrics)
42-
43-
// combination OTLP Receiver, consumertests.MetricsSink, and consumertests.LogsSink
44-
otlp, err := testutils.NewOTLPReceiverSink().WithEndpoint("localhost:23456").Build()
45-
require.NoError(t, err)
46-
require.NoError(t, otlp.Start())
47-
48-
defer func() {
49-
require.NoError(t, otlp.Shutdown())
50-
}()
51-
52-
myContainer := testutils.NewContainer().WithImage("someTarget").Build()
53-
err = myContainer.Start(context.Background())
54-
require.NoError(t, err)
55-
56-
// running collector subprocess that uses the provided config set to export OTLP to our test receiver
57-
myCollector, err := testutils.NewCollectorProcess().WithConfigPath(filepath.Join(".", "testdata", "config.yaml")).Build()
58-
require.NoError(t, err)
59-
err = myCollector.Start()
60-
require.NoError(t, err)
61-
defer func() {
62-
require.NoError(t, myCollector.Shutdown() )
63-
}()
64-
65-
require.NoError(t, otlp.AssertAllMetricsReceived(t, *expectedResourceMetrics, 30*time.Second))
66-
}
67-
```

‎tests/general/container_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ func TestSpecifiedContainerConfigDefaultsToCmdLineArgIfEnvVarConflict(t *testing
111111
return false
112112
}
113113
receivedOTLPMetrics := tc.OTLPReceiverSink.AllMetrics()
114-
tc.OTLPReceiverSink.Reset()
115114

116115
for _, rom := range receivedOTLPMetrics {
117116
for i := 0; i < rom.ResourceMetrics().Len(); i++ {
@@ -189,7 +188,6 @@ service:
189188
return false
190189
}
191190
receivedOTLPMetrics := tc.OTLPReceiverSink.AllMetrics()
192-
tc.OTLPReceiverSink.Reset()
193191

194192
for _, rom := range receivedOTLPMetrics {
195193
for i := 0; i < rom.ResourceMetrics().Len(); i++ {

‎tests/general/discoverymode/testdata/resource_metrics/k8s-observer-smart-agent-redis.yaml

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

‎tests/general/dry_run_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ service:
9090
return false
9191
}
9292
receivedOTLPMetrics := tc.OTLPReceiverSink.AllMetrics()
93-
tc.OTLPReceiverSink.Reset()
9493

9594
for _, rom := range receivedOTLPMetrics {
9695
for i := 0; i < rom.ResourceMetrics().Len(); i++ {

‎tests/go.mod

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,16 @@ require (
99
github.com/docker/go-connections v0.5.0
1010
github.com/go-sql-driver/mysql v1.8.1
1111
github.com/google/uuid v1.6.0
12-
github.com/knadh/koanf v1.5.0
1312
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0
1413
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.117.0
1514
github.com/shirou/gopsutil/v3 v3.24.5
1615
github.com/stretchr/testify v1.10.0
1716
github.com/testcontainers/testcontainers-go v0.35.0
1817
go.opentelemetry.io/collector/component v0.117.0
1918
go.opentelemetry.io/collector/component/componenttest v0.117.0
20-
go.opentelemetry.io/collector/config/configgrpc v0.117.0
2119
go.opentelemetry.io/collector/config/confignet v1.23.0
22-
go.opentelemetry.io/collector/config/configtls v1.23.0
2320
go.opentelemetry.io/collector/confmap v1.23.0
2421
go.opentelemetry.io/collector/consumer/consumertest v0.117.0
25-
go.opentelemetry.io/collector/exporter v0.117.0
26-
go.opentelemetry.io/collector/exporter/otlpexporter v0.117.0
2722
go.opentelemetry.io/collector/pdata v1.23.0
2823
go.opentelemetry.io/collector/receiver v0.117.0
2924
go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0
@@ -35,7 +30,6 @@ require (
3530
golang.org/x/exp v0.0.0-20230711023510-fffb14384f22
3631
golang.org/x/sys v0.29.0
3732
gopkg.in/yaml.v2 v2.4.0
38-
gopkg.in/yaml.v3 v3.0.1
3933
)
4034

4135
require (
@@ -60,9 +54,9 @@ require (
6054
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
6155
github.com/gogo/protobuf v1.3.2 // indirect
6256
github.com/golang/snappy v0.0.4 // indirect
63-
github.com/hashicorp/go-version v1.7.0 // indirect
6457
github.com/json-iterator/go v1.1.12 // indirect
6558
github.com/klauspost/compress v1.17.11 // indirect
59+
github.com/knadh/koanf v1.5.0 // indirect
6660
github.com/knadh/koanf/v2 v2.1.2 // indirect
6761
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
6862
github.com/magiconair/properties v1.8.7 // indirect
@@ -96,24 +90,19 @@ require (
9690
go.opentelemetry.io/collector/component/componentstatus v0.117.0 // indirect
9791
go.opentelemetry.io/collector/config/configauth v0.117.0 // indirect
9892
go.opentelemetry.io/collector/config/configcompression v1.23.0 // indirect
93+
go.opentelemetry.io/collector/config/configgrpc v0.117.0 // indirect
9994
go.opentelemetry.io/collector/config/confighttp v0.117.0 // indirect
10095
go.opentelemetry.io/collector/config/configopaque v1.23.0 // indirect
101-
go.opentelemetry.io/collector/config/configretry v1.23.0 // indirect
10296
go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect
97+
go.opentelemetry.io/collector/config/configtls v1.23.0 // indirect
10398
go.opentelemetry.io/collector/consumer v1.23.0 // indirect
10499
go.opentelemetry.io/collector/consumer/consumererror v0.117.0 // indirect
105-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.117.0 // indirect
106100
go.opentelemetry.io/collector/consumer/xconsumer v0.117.0 // indirect
107-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.117.0 // indirect
108-
go.opentelemetry.io/collector/exporter/xexporter v0.117.0 // indirect
109101
go.opentelemetry.io/collector/extension v0.117.0 // indirect
110102
go.opentelemetry.io/collector/extension/auth v0.117.0 // indirect
111-
go.opentelemetry.io/collector/extension/xextension v0.117.0 // indirect
112-
go.opentelemetry.io/collector/featuregate v1.23.0 // indirect
113103
go.opentelemetry.io/collector/internal/sharedcomponent v0.117.0 // indirect
114104
go.opentelemetry.io/collector/pdata/pprofile v0.117.0 // indirect
115105
go.opentelemetry.io/collector/pipeline v0.117.0 // indirect
116-
go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0 // indirect
117106
go.opentelemetry.io/collector/receiver/xreceiver v0.117.0 // indirect
118107
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
119108
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
@@ -130,4 +119,5 @@ require (
130119
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
131120
google.golang.org/grpc v1.69.2 // indirect
132121
google.golang.org/protobuf v1.36.2 // indirect
122+
gopkg.in/yaml.v3 v3.0.1 // indirect
133123
)

‎tests/go.sum

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv
168168
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
169169
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
170170
github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
171-
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
172-
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
173171
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
174172
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
175173
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -379,8 +377,6 @@ go.opentelemetry.io/collector/config/confignet v1.23.0 h1:gq90GDgQFSjAeFkDeIkstk
379377
go.opentelemetry.io/collector/config/confignet v1.23.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc=
380378
go.opentelemetry.io/collector/config/configopaque v1.23.0 h1:SEnEzOHufGc4KGOjQq8zKIQuDBmRFl9ncZ3qs1SRpJk=
381379
go.opentelemetry.io/collector/config/configopaque v1.23.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs=
382-
go.opentelemetry.io/collector/config/configretry v1.23.0 h1:0Ox2KvTZyNdgureAs3kJzsNIa6ttrx9bwlKjj/p4fGU=
383-
go.opentelemetry.io/collector/config/configretry v1.23.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro=
384380
go.opentelemetry.io/collector/config/configtelemetry v0.117.0 h1:xsMfc89VByIF2fJzWuxs/2eqy44DWfNBAysReG4TAr8=
385381
go.opentelemetry.io/collector/config/configtelemetry v0.117.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE=
386382
go.opentelemetry.io/collector/config/configtls v1.23.0 h1:52q9dAV923hHn1aoYQyKGnrRXCPvTTT3DXurtxcpZaQ=
@@ -391,34 +387,16 @@ go.opentelemetry.io/collector/consumer v1.23.0 h1:JT0nE1vikL5yIk97IHBGzwx8co3w1W
391387
go.opentelemetry.io/collector/consumer v1.23.0/go.mod h1:8d0uQ6gq64LbPktV4sc888lRj1cQCmrdl13hRIEURgA=
392388
go.opentelemetry.io/collector/consumer/consumererror v0.117.0 h1:PPIZCcYZcENnyIrpRV4ERvMUoPSTV0zIP0QPzJvz80g=
393389
go.opentelemetry.io/collector/consumer/consumererror v0.117.0/go.mod h1:L47xOVC+Vzos8350j3SWtU43w7rzms6UDhb6IrFxymY=
394-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.117.0 h1:gT9VUzerc4rSRUDMEBQdrgBxbrpjinoa4Oxo5qlj6gw=
395-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.117.0/go.mod h1:AzJIPm65RpEeoQk8OuQ4HLT6QQPDNrWWKk8IEaNBiIQ=
396390
go.opentelemetry.io/collector/consumer/consumertest v0.117.0 h1:9WFyyjLudvfJDEuUaGsQyNRd1m6D1iRg8Iyg3xliFko=
397391
go.opentelemetry.io/collector/consumer/consumertest v0.117.0/go.mod h1:B7A+OS76QKAzM8W7cmvlfVynFELj9Sa444hSm1SILFw=
398392
go.opentelemetry.io/collector/consumer/xconsumer v0.117.0 h1:vsBNJGaEbYqgMU3PEsOcqjMxX5ul++Cxda44sttoi8c=
399393
go.opentelemetry.io/collector/consumer/xconsumer v0.117.0/go.mod h1:dTr+Tms53lRLvR3OAzYic0yhcwldhTUdVIwJNSDmBmw=
400-
go.opentelemetry.io/collector/exporter v0.117.0 h1:A9kVXzdb8i1eFELImuaSPyijAfg4qMIpM/4y/98mlxk=
401-
go.opentelemetry.io/collector/exporter v0.117.0/go.mod h1:Cbrorch2s18w1X7+A+zXQtAffbInnIOP7Su26gbRG+k=
402-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.117.0 h1:1e991aHPgSvWFMOFFir40HANg2SkXcrkG4AlRvK2+KI=
403-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.117.0/go.mod h1:TkPEGX28zDvGAqlJRZQhKohG+82iN2lWPjF+dTuzS9Q=
404-
go.opentelemetry.io/collector/exporter/exportertest v0.117.0 h1:u+loeqxpniMiJL1iqc/lCCcfniWrqHBgJTAjXfqVBqQ=
405-
go.opentelemetry.io/collector/exporter/exportertest v0.117.0/go.mod h1:GyHwJLsOPPau0m+TYrIA7jWD9/GU+ID+l/9sL0cAqhE=
406-
go.opentelemetry.io/collector/exporter/otlpexporter v0.117.0 h1:A/qDjii7WN2Wdx+gtdLvSVpPu8to6ogVutxIggNBEio=
407-
go.opentelemetry.io/collector/exporter/otlpexporter v0.117.0/go.mod h1:rW4Re7GGCPB4JwZoZjXaPqJ77GEIr8OjTz5YK59avJM=
408-
go.opentelemetry.io/collector/exporter/xexporter v0.117.0 h1:BB8D0Dvb46CVAZrnPEg5nYgXO7LzONmXeGKEfzSIOZs=
409-
go.opentelemetry.io/collector/exporter/xexporter v0.117.0/go.mod h1:yo0T8WkvLCJ7NOqIquHGFe4Xpuc4CbDb8a06T2G5De4=
410394
go.opentelemetry.io/collector/extension v0.117.0 h1:B3cG7g+wbhmpMFugaDxOcyiPKeulaW8+EQdJbZxDfho=
411395
go.opentelemetry.io/collector/extension v0.117.0/go.mod h1:WjyD5h9N5Y0SF8azB2rulvHJieJoWqroGO5hi3ax5+8=
412396
go.opentelemetry.io/collector/extension/auth v0.117.0 h1:tXQdYIdcABXalWyFZP22pREY7+nWUNurx8Y6FseWs7w=
413397
go.opentelemetry.io/collector/extension/auth v0.117.0/go.mod h1:ofrV2BuE46+k7Su/h0ccrMl5Zk5Y7NVlzOb3AwU7Dzw=
414398
go.opentelemetry.io/collector/extension/auth/authtest v0.117.0 h1:wV4OIiWrt7gteQrxL8MCmGvjGhMiu5TplKJHOfVZO6Y=
415399
go.opentelemetry.io/collector/extension/auth/authtest v0.117.0/go.mod h1:nHxcAOyo26JnuYwKIoQM9mDlSXpERQrbjIw3Dtp9hug=
416-
go.opentelemetry.io/collector/extension/extensiontest v0.117.0 h1:XH+tkHdATylYZtASZKK3rCoN/xlaFi8MXLh07ZlQQWw=
417-
go.opentelemetry.io/collector/extension/extensiontest v0.117.0/go.mod h1:ABqB9D41p4MCeGVmABOgJi7i7roWZlFbqeFJDy7lskQ=
418-
go.opentelemetry.io/collector/extension/xextension v0.117.0 h1:ADUKWHGaVvvmebJHiNRuX6YAfQXFDW/UaXK9W1hCo1k=
419-
go.opentelemetry.io/collector/extension/xextension v0.117.0/go.mod h1:BmR8xN7Ja+El4IJ9aVmtON2miudjsbq2COZ9azVXsNg=
420-
go.opentelemetry.io/collector/featuregate v1.23.0 h1:N033ROo85qKrsK16QzR6RV+3UWOWF7kpOO8FSnX99s0=
421-
go.opentelemetry.io/collector/featuregate v1.23.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg=
422400
go.opentelemetry.io/collector/internal/sharedcomponent v0.117.0 h1:mk+qZO2HpNny3FuYeb4mjL4mbrEfkJN5untocHA8AqM=
423401
go.opentelemetry.io/collector/internal/sharedcomponent v0.117.0/go.mod h1:Hlzn5+54tgYchP3OJz/YMnrbMNHX8PggDpZFlDTB2kQ=
424402
go.opentelemetry.io/collector/pdata v1.23.0 h1:tEk0dkfB8RdSukoOMfEa8duB938gfZowdfRkrJxGDrw=
@@ -429,8 +407,6 @@ go.opentelemetry.io/collector/pdata/testdata v0.117.0 h1:ainpacShKHaDkPK6lcvgJ0a
429407
go.opentelemetry.io/collector/pdata/testdata v0.117.0/go.mod h1:LZAymmRKHQEqJqJUSO15rej3+V1rNRyBMF5mWCKCMBY=
430408
go.opentelemetry.io/collector/pipeline v0.117.0 h1:CSv0Dd3n9AQNQ73e7PdEkgexkSMRZliKATxkoZKUFcY=
431409
go.opentelemetry.io/collector/pipeline v0.117.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74=
432-
go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0 h1:jnHQNaNfVRIdrtOPCORUy8s1cEJyxql3uv/WQ1ve1Js=
433-
go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0/go.mod h1:lNY3uQjRcb3f7CW1JQMXJcWzCJp5122LOKrKs5eito8=
434410
go.opentelemetry.io/collector/receiver v0.117.0 h1:jm+b2G2IKKwGE213lB9cviKEdeATvYtNSY1kO0XdpMM=
435411
go.opentelemetry.io/collector/receiver v0.117.0/go.mod h1:fZXigB3afp54OE+ogPcup/RPwI7j+CwZh9Mz6ObB/Cg=
436412
go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0 h1:Ezv4K3TGcQ5sd6lj0QsemjUeO+5RTnSsfodfPyjHo2o=

‎tests/receivers/scriptedinputs/script_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func TestScriptReceiverCpu(t *testing.T) {
4141
return
4242
}
4343
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
44-
tc.OTLPReceiverSink.Reset()
4544

4645
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
4746
assert.Regexp(tt, regexp.MustCompile("CPU\\s+pctUser\\s+pctNice\\s+pctSystem\\s+pctIowait\\s+pctIdle\\nall(\\s*\\d{1,3}.\\d{1,3}){5}\\n0(\\s*\\d{1,3}.\\d{1,3}){5}"), lr.Body().Str())
@@ -62,7 +61,6 @@ func TestScriptReceiverDf(t *testing.T) {
6261
return
6362
}
6463
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
65-
tc.OTLPReceiverSink.Reset()
6664

6765
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
6866
fmt.Printf("Received log entry - \n%s", lr.Body().Str())
@@ -84,7 +82,6 @@ func TestScriptReceiverHardware(t *testing.T) {
8482
return
8583
}
8684
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
87-
tc.OTLPReceiverSink.Reset()
8885

8986
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
9087
assert.Regexp(tt, regexp.MustCompile("KEY\\s+VALUE"), lr.Body().Str())
@@ -105,7 +102,6 @@ func TestScriptReceiverInterfaces(t *testing.T) {
105102
return
106103
}
107104
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
108-
tc.OTLPReceiverSink.Reset()
109105

110106
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
111107
assert.Regexp(tt, regexp.MustCompile("Name\\s+MAC\\s+inetAddr\\s+inet6Addr\\s+Collisions\\s+RXbytes\\s+RXerrors\\s+RXdropped\\s+TXbytes\\s+TXerrors\\s+TXdropped\\s+Speed\\s+Duplex"), lr.Body().Str())
@@ -126,7 +122,6 @@ func TestScriptReceiverIostat(t *testing.T) {
126122
return
127123
}
128124
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
129-
tc.OTLPReceiverSink.Reset()
130125

131126
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
132127
assert.Regexp(tt, regexp.MustCompile("Device\\s+r/s\\s+rkB/s\\s+rrqm/s\\s+%rrqm\\s+r_await\\s+rareq-sz\\s+w/s\\s+wkB/s\\s+wrqm/s\\s+%wrqm\\s+w_await\\s+wareq-sz\\s+d/s\\s+dkB/s\\s+drqm/s\\s+%drqm\\s+d_await\\s+dareq-sz\\s+(f/s\\s+)?(f_await\\s+)?aqu-sz\\s+%util"), lr.Body().Str())
@@ -147,7 +142,6 @@ func TestScriptReceiverLsof(t *testing.T) {
147142
return
148143
}
149144
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
150-
tc.OTLPReceiverSink.Reset()
151145

152146
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
153147
assert.Regexp(tt, regexp.MustCompile("COMMAND\\s+PID\\s+USER\\s+FD\\s+TYPE\\s+DEVICE\\s+SIZE\\s+NODE\\s+NAME"), lr.Body().Str())
@@ -168,7 +162,6 @@ func TestScriptReceiverNetstat(t *testing.T) {
168162
return
169163
}
170164
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
171-
tc.OTLPReceiverSink.Reset()
172165

173166
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
174167
assert.Regexp(tt, regexp.MustCompile("Proto\\s+Recv-Q\\s+Send-Q\\s+LocalAddress\\s+ForeignAddress\\s+State"), lr.Body().Str())
@@ -189,7 +182,6 @@ func TestScriptReceiverOpenPorts(t *testing.T) {
189182
return
190183
}
191184
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
192-
tc.OTLPReceiverSink.Reset()
193185

194186
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
195187
assert.Regexp(tt, regexp.MustCompile("Proto\\s+Port"), lr.Body().Str())
@@ -210,7 +202,6 @@ func TestScriptReceiverPackage(t *testing.T) {
210202
return
211203
}
212204
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
213-
tc.OTLPReceiverSink.Reset()
214205

215206
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
216207
assert.Regexp(tt, regexp.MustCompile("NAME\\s+VERSION\\s+RELEASE\\s+ARCH\\s+VENDOR\\s+GROUP"), lr.Body().Str())
@@ -231,7 +222,6 @@ func TestScriptReceiverProtocol(t *testing.T) {
231222
return
232223
}
233224
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
234-
tc.OTLPReceiverSink.Reset()
235225

236226
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
237227
assert.Regexp(tt, regexp.MustCompile("IPdropped\\s+TCPrexmits\\s+TCPreorder\\s+TCPpktRecv\\s+TCPpktSent\\s+UDPpktLost\\s+UDPunkPort\\s+UDPpktRecv\\s+UDPpktSent"), lr.Body().Str())
@@ -252,7 +242,6 @@ func TestScriptReceiverPs(t *testing.T) {
252242
return
253243
}
254244
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
255-
tc.OTLPReceiverSink.Reset()
256245

257246
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
258247
assert.Regexp(tt, regexp.MustCompile("USER\\s+PID\\s+%CPU\\s+%MEM\\s+VSZ\\s+RSS\\s+TTY\\s+STAT\\s+START\\s+TIME\\s+COMMAND\\s+ARGS"), lr.Body().Str())
@@ -273,7 +262,6 @@ func TestScriptReceiverTop(t *testing.T) {
273262
return
274263
}
275264
receivedOTLPLogs := tc.OTLPReceiverSink.AllLogs()
276-
tc.OTLPReceiverSink.Reset()
277265

278266
lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
279267
assert.Regexp(tt, regexp.MustCompile("PID\\s+USER\\s+PR\\s+NI\\s+VIRT\\s+RES\\s+SHR\\s+S\\s+pctCPU\\s+pctMEM\\s+cpuTIME\\s+COMMAND"), lr.Body().Str())

0 commit comments

Comments
 (0)