Skip to content

Commit 9124bc8

Browse files
codebotencodeboten
authored
[chore] use pdata/testdata instead of coreinternal (open-telemetry#32265)
This will allow us to remove duplicated code in the near future. --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 6229c6a commit 9124bc8

File tree

18 files changed

+55
-52
lines changed

18 files changed

+55
-52
lines changed

‎exporter/alibabacloudlogserviceexporter/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
go.opentelemetry.io/collector/confmap v0.97.1-0.20240409140257-792fac1b62d4
1313
go.opentelemetry.io/collector/exporter v0.97.1-0.20240409140257-792fac1b62d4
1414
go.opentelemetry.io/collector/pdata v1.4.1-0.20240409140257-792fac1b62d4
15+
go.opentelemetry.io/collector/pdata/testdata v0.0.0-20240408153657-fc289290613a
1516
go.opentelemetry.io/collector/semconv v0.97.1-0.20240409140257-792fac1b62d4
1617
go.opentelemetry.io/otel/metric v1.24.0
1718
go.opentelemetry.io/otel/trace v1.24.0

‎exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212
"go.opentelemetry.io/collector/exporter/exportertest"
13-
14-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
13+
"go.opentelemetry.io/collector/pdata/testdata"
1514
)
1615

1716
func TestNewMetricsExporter(t *testing.T) {
@@ -24,7 +23,7 @@ func TestNewMetricsExporter(t *testing.T) {
2423
require.NotNil(t, got)
2524

2625
// This will put trace data to send buffer and return success.
27-
err = got.ConsumeMetrics(context.Background(), testdata.GenerateMetricsOneMetric())
26+
err = got.ConsumeMetrics(context.Background(), testdata.GenerateMetrics(1))
2827
assert.NoError(t, err)
2928
}
3029

‎exporter/kafkaexporter/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ require (
2121
go.opentelemetry.io/collector/consumer v0.97.1-0.20240409140257-792fac1b62d4
2222
go.opentelemetry.io/collector/exporter v0.97.1-0.20240409140257-792fac1b62d4
2323
go.opentelemetry.io/collector/pdata v1.4.1-0.20240409140257-792fac1b62d4
24+
go.opentelemetry.io/collector/pdata/testdata v0.0.0-20240408153657-fc289290613a
2425
go.opentelemetry.io/collector/semconv v0.97.1-0.20240409140257-792fac1b62d4
2526
go.opentelemetry.io/otel/metric v1.24.0
2627
go.opentelemetry.io/otel/trace v1.24.0

‎exporter/kafkaexporter/kafka_exporter_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"go.opentelemetry.io/collector/pdata/plog"
1919
"go.opentelemetry.io/collector/pdata/pmetric"
2020
"go.opentelemetry.io/collector/pdata/ptrace"
21+
"go.opentelemetry.io/collector/pdata/testdata"
2122
"go.uber.org/zap"
2223

23-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
2424
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka"
2525
)
2626

@@ -145,7 +145,7 @@ func TestTracesPusher(t *testing.T) {
145145
t.Cleanup(func() {
146146
require.NoError(t, p.Close(context.Background()))
147147
})
148-
err := p.tracesPusher(context.Background(), testdata.GenerateTracesTwoSpansSameResource())
148+
err := p.tracesPusher(context.Background(), testdata.GenerateTraces(2))
149149
require.NoError(t, err)
150150
}
151151

@@ -163,7 +163,7 @@ func TestTracesPusher_err(t *testing.T) {
163163
t.Cleanup(func() {
164164
require.NoError(t, p.Close(context.Background()))
165165
})
166-
td := testdata.GenerateTracesTwoSpansSameResource()
166+
td := testdata.GenerateTraces(2)
167167
err := p.tracesPusher(context.Background(), td)
168168
assert.EqualError(t, err, expErr.Error())
169169
}
@@ -174,7 +174,7 @@ func TestTracesPusher_marshal_error(t *testing.T) {
174174
marshaler: &tracesErrorMarshaler{err: expErr},
175175
logger: zap.NewNop(),
176176
}
177-
td := testdata.GenerateTracesTwoSpansSameResource()
177+
td := testdata.GenerateTraces(2)
178178
err := p.tracesPusher(context.Background(), td)
179179
require.Error(t, err)
180180
assert.Contains(t, err.Error(), expErr.Error())
@@ -192,7 +192,7 @@ func TestMetricsDataPusher(t *testing.T) {
192192
t.Cleanup(func() {
193193
require.NoError(t, p.Close(context.Background()))
194194
})
195-
err := p.metricsDataPusher(context.Background(), testdata.GenerateMetricsTwoMetrics())
195+
err := p.metricsDataPusher(context.Background(), testdata.GenerateMetrics(2))
196196
require.NoError(t, err)
197197
}
198198

@@ -210,7 +210,7 @@ func TestMetricsDataPusher_err(t *testing.T) {
210210
t.Cleanup(func() {
211211
require.NoError(t, p.Close(context.Background()))
212212
})
213-
md := testdata.GenerateMetricsTwoMetrics()
213+
md := testdata.GenerateMetrics(2)
214214
err := p.metricsDataPusher(context.Background(), md)
215215
assert.EqualError(t, err, expErr.Error())
216216
}
@@ -221,7 +221,7 @@ func TestMetricsDataPusher_marshal_error(t *testing.T) {
221221
marshaler: &metricsErrorMarshaler{err: expErr},
222222
logger: zap.NewNop(),
223223
}
224-
md := testdata.GenerateMetricsTwoMetrics()
224+
md := testdata.GenerateMetrics(2)
225225
err := p.metricsDataPusher(context.Background(), md)
226226
require.Error(t, err)
227227
assert.Contains(t, err.Error(), expErr.Error())
@@ -239,7 +239,7 @@ func TestLogsDataPusher(t *testing.T) {
239239
t.Cleanup(func() {
240240
require.NoError(t, p.Close(context.Background()))
241241
})
242-
err := p.logsDataPusher(context.Background(), testdata.GenerateLogsOneLogRecord())
242+
err := p.logsDataPusher(context.Background(), testdata.GenerateLogs(1))
243243
require.NoError(t, err)
244244
}
245245

@@ -257,7 +257,7 @@ func TestLogsDataPusher_err(t *testing.T) {
257257
t.Cleanup(func() {
258258
require.NoError(t, p.Close(context.Background()))
259259
})
260-
ld := testdata.GenerateLogsOneLogRecord()
260+
ld := testdata.GenerateLogs(1)
261261
err := p.logsDataPusher(context.Background(), ld)
262262
assert.EqualError(t, err, expErr.Error())
263263
}
@@ -268,7 +268,7 @@ func TestLogsDataPusher_marshal_error(t *testing.T) {
268268
marshaler: &logsErrorMarshaler{err: expErr},
269269
logger: zap.NewNop(),
270270
}
271-
ld := testdata.GenerateLogsOneLogRecord()
271+
ld := testdata.GenerateLogs(1)
272272
err := p.logsDataPusher(context.Background(), ld)
273273
require.Error(t, err)
274274
assert.Contains(t, err.Error(), expErr.Error())

‎exporter/logicmonitorexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.21
44

55
require (
66
github.com/logicmonitor/lm-data-sdk-go v1.3.0
7-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0
87
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.97.0
98
github.com/stretchr/testify v1.9.0
109
go.opentelemetry.io/collector/component v0.97.1-0.20240409140257-792fac1b62d4
@@ -15,6 +14,7 @@ require (
1514
go.opentelemetry.io/collector/consumer v0.97.1-0.20240409140257-792fac1b62d4
1615
go.opentelemetry.io/collector/exporter v0.97.1-0.20240409140257-792fac1b62d4
1716
go.opentelemetry.io/collector/pdata v1.4.1-0.20240409140257-792fac1b62d4
17+
go.opentelemetry.io/collector/pdata/testdata v0.0.0-20240408153657-fc289290613a
1818
go.opentelemetry.io/otel/metric v1.24.0
1919
go.opentelemetry.io/otel/trace v1.24.0
2020
go.uber.org/goleak v1.3.0

‎exporter/logicmonitorexporter/internal/traces/sender_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ import (
1414
"github.com/logicmonitor/lm-data-sdk-go/utils"
1515
"github.com/stretchr/testify/assert"
1616
"go.opentelemetry.io/collector/consumer/consumererror"
17+
"go.opentelemetry.io/collector/pdata/testdata"
1718
"go.uber.org/zap"
18-
19-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
2019
)
2120

2221
func TestSendTraces(t *testing.T) {
@@ -41,7 +40,7 @@ func TestSendTraces(t *testing.T) {
4140
sender, err := NewSender(ctx, ts.URL, ts.Client(), authParams, zap.NewNop())
4241
assert.NoError(t, err)
4342

44-
err = sender.SendTraces(ctx, testdata.GenerateTracesOneSpan())
43+
err = sender.SendTraces(ctx, testdata.GenerateTraces(1))
4544
cancel()
4645
assert.NoError(t, err)
4746
})
@@ -62,7 +61,7 @@ func TestSendTraces(t *testing.T) {
6261
sender, err := NewSender(ctx, ts.URL, ts.Client(), authParams, zap.NewNop())
6362
assert.NoError(t, err)
6463

65-
err = sender.SendTraces(ctx, testdata.GenerateTracesOneSpan())
64+
err = sender.SendTraces(ctx, testdata.GenerateTraces(1))
6665
cancel()
6766
assert.Error(t, err)
6867
assert.Equal(t, true, consumererror.IsPermanent(err))
@@ -84,7 +83,7 @@ func TestSendTraces(t *testing.T) {
8483
sender, err := NewSender(ctx, ts.URL, ts.Client(), authParams, zap.NewNop())
8584
assert.NoError(t, err)
8685

87-
err = sender.SendTraces(ctx, testdata.GenerateTracesOneSpan())
86+
err = sender.SendTraces(ctx, testdata.GenerateTraces(1))
8887
cancel()
8988
assert.Error(t, err)
9089
assert.Equal(t, false, consumererror.IsPermanent(err))

‎exporter/logzioexporter/exporter_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ import (
2525
"go.opentelemetry.io/collector/pdata/pcommon"
2626
"go.opentelemetry.io/collector/pdata/plog"
2727
"go.opentelemetry.io/collector/pdata/ptrace"
28+
"go.opentelemetry.io/collector/pdata/testdata"
2829
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
29-
30-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
3130
)
3231

3332
const (
@@ -90,7 +89,7 @@ func fillLogNoTimestamp(log plog.LogRecord) {
9089
}
9190

9291
func generateLogsOneEmptyTimestamp() plog.Logs {
93-
ld := testdata.GenerateLogsOneEmptyLogRecord()
92+
ld := testdata.GenerateLogs(1)
9493
logs := ld.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords()
9594
ld.ResourceLogs().At(0).ScopeLogs().At(0).Scope().SetName("logScopeName")
9695
fillLogOne(logs.At(0))
@@ -195,7 +194,7 @@ func TestExportErrors(tester *testing.T) {
195194
},
196195
}
197196
td := newTestTracesWithAttributes()
198-
ld := testdata.GenerateLogsManyLogRecordsSameResource(10)
197+
ld := testdata.GenerateLogs(10)
199198
err := testTracesExporter(td, tester, cfg)
200199
fmt.Println(err.Error())
201200
require.Error(tester, err)
@@ -283,7 +282,7 @@ func TestPushLogsData(tester *testing.T) {
283282
},
284283
}
285284
defer server.Close()
286-
ld := testdata.GenerateLogsManyLogRecordsSameResource(2)
285+
ld := testdata.GenerateLogs(2)
287286
res := ld.ResourceLogs().At(0).Resource()
288287
res.Attributes().PutStr(conventions.AttributeServiceName, testService)
289288
res.Attributes().PutStr(conventions.AttributeHostName, testHost)

‎exporter/logzioexporter/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.21
55
require (
66
github.com/hashicorp/go-hclog v1.6.3
77
github.com/jaegertracing/jaeger v1.55.0
8-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0
98
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0
109
github.com/stretchr/testify v1.9.0
1110
go.opentelemetry.io/collector/component v0.97.1-0.20240409140257-792fac1b62d4
@@ -17,6 +16,7 @@ require (
1716
go.opentelemetry.io/collector/consumer v0.97.1-0.20240409140257-792fac1b62d4
1817
go.opentelemetry.io/collector/exporter v0.97.1-0.20240409140257-792fac1b62d4
1918
go.opentelemetry.io/collector/pdata v1.4.1-0.20240409140257-792fac1b62d4
19+
go.opentelemetry.io/collector/pdata/testdata v0.0.0-20240408153657-fc289290613a
2020
go.opentelemetry.io/collector/semconv v0.97.1-0.20240409140257-792fac1b62d4
2121
go.opentelemetry.io/otel/metric v1.24.0
2222
go.opentelemetry.io/otel/trace v1.24.0
@@ -54,6 +54,7 @@ require (
5454
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5555
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5656
github.com/modern-go/reflect2 v1.0.2 // indirect
57+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect
5758
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5859
github.com/prometheus/client_golang v1.19.0 // indirect
5960
github.com/prometheus/client_model v0.6.1 // indirect

‎exporter/opencensusexporter/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.21
55
require (
66
github.com/census-instrumentation/opencensus-proto v0.4.1
77
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.97.0
8-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0
98
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.97.0
109
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.97.0
1110
github.com/stretchr/testify v1.9.0
@@ -18,6 +17,7 @@ require (
1817
go.opentelemetry.io/collector/consumer v0.97.1-0.20240409140257-792fac1b62d4
1918
go.opentelemetry.io/collector/exporter v0.97.1-0.20240409140257-792fac1b62d4
2019
go.opentelemetry.io/collector/pdata v1.4.1-0.20240409140257-792fac1b62d4
20+
go.opentelemetry.io/collector/pdata/testdata v0.0.0-20240408153657-fc289290613a
2121
go.opentelemetry.io/collector/receiver v0.97.1-0.20240409140257-792fac1b62d4
2222
go.opentelemetry.io/otel/metric v1.24.0
2323
go.opentelemetry.io/otel/trace v1.24.0
@@ -51,6 +51,7 @@ require (
5151
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5252
github.com/modern-go/reflect2 v1.0.2 // indirect
5353
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
54+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect
5455
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.97.0 // indirect
5556
github.com/pmezard/go-difflib v1.0.0 // indirect
5657
github.com/prometheus/client_golang v1.19.0 // indirect

‎exporter/opencensusexporter/opencensus_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"go.opentelemetry.io/collector/consumer/consumertest"
1717
"go.opentelemetry.io/collector/exporter/exportertest"
1818
"go.opentelemetry.io/collector/pdata/ptrace"
19+
"go.opentelemetry.io/collector/pdata/testdata"
1920
"go.opentelemetry.io/collector/receiver/receivertest"
2021

2122
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
22-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
2323
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver"
2424
)
2525

@@ -55,7 +55,7 @@ func TestSendTraces(t *testing.T) {
5555
assert.NoError(t, exp.Shutdown(context.Background()))
5656
})
5757

58-
td := testdata.GenerateTracesOneSpan()
58+
td := testdata.GenerateTraces(1)
5959
assert.NoError(t, exp.ConsumeTraces(context.Background(), td))
6060
assert.Eventually(t, func() bool {
6161
return len(sink.AllTraces()) == 1
@@ -96,7 +96,7 @@ func TestSendTraces_NoBackend(t *testing.T) {
9696
assert.NoError(t, exp.Shutdown(context.Background()))
9797
})
9898

99-
td := testdata.GenerateTracesOneSpan()
99+
td := testdata.GenerateTraces(1)
100100
for i := 0; i < 10000; i++ {
101101
assert.Error(t, exp.ConsumeTraces(context.Background(), td))
102102
}
@@ -118,7 +118,7 @@ func TestSendTraces_AfterStop(t *testing.T) {
118118
require.NoError(t, exp.Start(context.Background(), host))
119119
assert.NoError(t, exp.Shutdown(context.Background()))
120120

121-
td := testdata.GenerateTracesOneSpan()
121+
td := testdata.GenerateTraces(1)
122122
assert.Error(t, exp.ConsumeTraces(context.Background(), td))
123123
}
124124

@@ -154,7 +154,7 @@ func TestSendMetrics(t *testing.T) {
154154
assert.NoError(t, exp.Shutdown(context.Background()))
155155
})
156156

157-
md := testdata.GenerateMetricsOneMetric()
157+
md := testdata.GenerateMetrics(1)
158158
assert.NoError(t, exp.ConsumeMetrics(context.Background(), md))
159159
assert.Eventually(t, func() bool {
160160
return len(sink.AllMetrics()) == 1
@@ -193,7 +193,7 @@ func TestSendMetrics_NoBackend(t *testing.T) {
193193
assert.NoError(t, exp.Shutdown(context.Background()))
194194
})
195195

196-
md := testdata.GenerateMetricsOneMetric()
196+
md := testdata.GenerateMetrics(1)
197197
for i := 0; i < 10000; i++ {
198198
assert.Error(t, exp.ConsumeMetrics(context.Background(), md))
199199
}
@@ -215,6 +215,6 @@ func TestSendMetrics_AfterStop(t *testing.T) {
215215
require.NoError(t, exp.Start(context.Background(), host))
216216
assert.NoError(t, exp.Shutdown(context.Background()))
217217

218-
md := testdata.GenerateMetricsOneMetric()
218+
md := testdata.GenerateMetrics(1)
219219
assert.Error(t, exp.ConsumeMetrics(context.Background(), md))
220220
}

0 commit comments

Comments
 (0)