Skip to content

Commit 2d48457

Browse files
bogdandrutubogdandrutu
authored
Rename [Trace|Log]Data to Traces|Logs in internal package testdata (open-telemetry#3205)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 4f9e3c0 commit 2d48457

File tree

42 files changed

+203
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+203
-214
lines changed

‎component/componenttest/shutdown_verifier.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func verifyTracesProcessorDoesntProduceAfterShutdown(t *testing.T, factory compo
5050
// Send some traces to the processor.
5151
const generatedCount = 10
5252
for i := 0; i < generatedCount; i++ {
53-
require.NoError(t, processor.ConsumeTraces(context.Background(), testdata.GenerateTraceDataOneSpan()))
53+
require.NoError(t, processor.ConsumeTraces(context.Background(), testdata.GenerateTracesOneSpan()))
5454
}
5555

5656
// Now shutdown the processor.

‎consumer/consumererror/signalerrors_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func TestTraces(t *testing.T) {
29-
td := testdata.GenerateTraceDataOneSpan()
29+
td := testdata.GenerateTracesOneSpan()
3030
err := fmt.Errorf("some error")
3131
traceErr := NewTraces(err, td)
3232
assert.Equal(t, err.Error(), traceErr.Error())
@@ -38,7 +38,7 @@ func TestTraces(t *testing.T) {
3838
}
3939

4040
func TestTraces_Unwrap(t *testing.T) {
41-
td := testdata.GenerateTraceDataOneSpan()
41+
td := testdata.GenerateTracesOneSpan()
4242
var err error = testErrorType{"some error"}
4343
// Wrapping err with error Traces.
4444
traceErr := NewTraces(err, td)
@@ -50,7 +50,7 @@ func TestTraces_Unwrap(t *testing.T) {
5050
}
5151

5252
func TestLogs(t *testing.T) {
53-
td := testdata.GenerateLogDataOneLog()
53+
td := testdata.GenerateLogsOneLogRecord()
5454
err := fmt.Errorf("some error")
5555
logsErr := NewLogs(err, td)
5656
assert.Equal(t, err.Error(), logsErr.Error())
@@ -62,7 +62,7 @@ func TestLogs(t *testing.T) {
6262
}
6363

6464
func TestLogs_Unwrap(t *testing.T) {
65-
td := testdata.GenerateLogDataOneLog()
65+
td := testdata.GenerateLogsOneLogRecord()
6666
var err error = testErrorType{"some error"}
6767
// Wrapping err with error Logs.
6868
logsErr := NewLogs(err, td)

‎consumer/consumertest/sink_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
func TestTracesSink(t *testing.T) {
2929
sink := new(TracesSink)
30-
td := testdata.GenerateTraceDataOneSpan()
30+
td := testdata.GenerateTracesOneSpan()
3131
want := make([]pdata.Traces, 0, 7)
3232
for i := 0; i < 7; i++ {
3333
require.NoError(t, sink.ConsumeTraces(context.Background(), td))
@@ -57,7 +57,7 @@ func TestMetricsSink(t *testing.T) {
5757

5858
func TestLogsSink(t *testing.T) {
5959
sink := new(LogsSink)
60-
md := testdata.GenerateLogDataOneLogNoResource()
60+
md := testdata.GenerateLogsOneLogRecord()
6161
want := make([]pdata.Logs, 0, 7)
6262
for i := 0; i < 7; i++ {
6363
require.NoError(t, sink.ConsumeLogs(context.Background(), md))

‎consumer/fanoutconsumer/cloningconsumer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestTracesProcessorCloningMultiplexing(t *testing.T) {
3838
}
3939

4040
tfc := NewTracesCloning(processors)
41-
td := testdata.GenerateTraceDataTwoSpansSameResource()
41+
td := testdata.GenerateTracesTwoSpansSameResource()
4242

4343
var wantSpansCount = 0
4444
for i := 0; i < 2; i++ {
@@ -124,7 +124,7 @@ func TestLogsProcessorCloningMultiplexing(t *testing.T) {
124124
}
125125

126126
mfc := NewLogsCloning(processors)
127-
ld := testdata.GenerateLogDataOneLog()
127+
ld := testdata.GenerateLogsOneLogRecord()
128128

129129
var wantMetricsCount = 0
130130
for i := 0; i < 2; i++ {

‎consumer/fanoutconsumer/consumer_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestTracesProcessorMultiplexing(t *testing.T) {
3939
}
4040

4141
tfc := NewTraces(processors)
42-
td := testdata.GenerateTraceDataOneSpan()
42+
td := testdata.GenerateTracesOneSpan()
4343

4444
var wantSpansCount = 0
4545
for i := 0; i < 2; i++ {
@@ -68,7 +68,7 @@ func TestTracesProcessorWhenOneErrors(t *testing.T) {
6868
processors[1] = consumertest.NewErr(errors.New("my error"))
6969

7070
tfc := NewTraces(processors)
71-
td := testdata.GenerateTraceDataOneSpan()
71+
td := testdata.GenerateTracesOneSpan()
7272

7373
var wantSpansCount = 0
7474
for i := 0; i < 2; i++ {
@@ -147,7 +147,7 @@ func TestLogsProcessorMultiplexing(t *testing.T) {
147147
}
148148

149149
lfc := NewLogs(processors)
150-
ld := testdata.GenerateLogDataOneLog()
150+
ld := testdata.GenerateLogsOneLogRecord()
151151

152152
var wantMetricsCount = 0
153153
for i := 0; i < 2; i++ {
@@ -176,7 +176,7 @@ func TestLogsProcessorWhenOneErrors(t *testing.T) {
176176
processors[1] = consumertest.NewErr(errors.New("my error"))
177177

178178
lfc := NewLogs(processors)
179-
ld := testdata.GenerateLogDataOneLog()
179+
ld := testdata.GenerateLogsOneLogRecord()
180180

181181
var wantMetricsCount = 0
182182
for i := 0; i < 2; i++ {

‎exporter/exporterhelper/logs_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var (
4646
)
4747

4848
func TestLogsRequest(t *testing.T) {
49-
lr := newLogsRequest(context.Background(), testdata.GenerateLogDataOneLog(), nil)
49+
lr := newLogsRequest(context.Background(), testdata.GenerateLogsOneLogRecord(), nil)
5050

5151
logErr := consumererror.NewLogs(errors.New("some error"), pdata.NewLogs())
5252
assert.EqualValues(
@@ -170,7 +170,7 @@ func checkRecordedMetricsForLogsExporter(t *testing.T, le component.LogsExporter
170170
require.NoError(t, err)
171171
defer doneFn()
172172

173-
ld := testdata.GenerateLogDataTwoLogsSameResource()
173+
ld := testdata.GenerateLogsTwoLogRecordsSameResource()
174174
const numBatches = 7
175175
for i := 0; i < numBatches; i++ {
176176
require.Equal(t, wantError, le.ConsumeLogs(context.Background(), ld))
@@ -185,7 +185,7 @@ func checkRecordedMetricsForLogsExporter(t *testing.T, le component.LogsExporter
185185
}
186186

187187
func generateLogsTraffic(t *testing.T, le component.LogsExporter, numRequests int, wantError error) {
188-
ld := testdata.GenerateLogDataOneLog()
188+
ld := testdata.GenerateLogsOneLogRecord()
189189
ctx, span := trace.StartSpan(context.Background(), fakeLogsParentSpanName, trace.WithSampler(trace.AlwaysSample()))
190190
defer span.End()
191191
for i := 0; i < numRequests; i++ {

‎exporter/exporterhelper/queued_retry_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func TestQueuedRetry_OnError(t *testing.T) {
9696
assert.NoError(t, be.Shutdown(context.Background()))
9797
})
9898

99-
traceErr := consumererror.NewTraces(errors.New("some error"), testdata.GenerateTraceDataOneSpan())
99+
traceErr := consumererror.NewTraces(errors.New("some error"), testdata.GenerateTracesOneSpan())
100100
mockR := newMockRequest(context.Background(), 2, traceErr)
101101
ocs.run(func() {
102102
// This is asynchronous so it should just enqueue, no errors expected.

‎exporter/exporterhelper/traces_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var (
4646
)
4747

4848
func TestTracesRequest(t *testing.T) {
49-
mr := newTracesRequest(context.Background(), testdata.GenerateTraceDataOneSpan(), nil)
49+
mr := newTracesRequest(context.Background(), testdata.GenerateTracesOneSpan(), nil)
5050

5151
traceErr := consumererror.NewTraces(errors.New("some error"), pdata.NewTraces())
5252
assert.EqualValues(t, newTracesRequest(context.Background(), pdata.NewTraces(), nil), mr.onError(traceErr))
@@ -184,7 +184,7 @@ func checkRecordedMetricsForTracesExporter(t *testing.T, te component.TracesExpo
184184
require.NoError(t, err)
185185
defer doneFn()
186186

187-
td := testdata.GenerateTraceDataTwoSpansSameResource()
187+
td := testdata.GenerateTracesTwoSpansSameResource()
188188
const numBatches = 7
189189
for i := 0; i < numBatches; i++ {
190190
require.Equal(t, wantError, te.ConsumeTraces(context.Background(), td))

‎exporter/fileexporter/file_exporter_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestFileTracesExporter(t *testing.T) {
3535
fe := &fileExporter{file: mf}
3636
require.NotNil(t, fe)
3737

38-
td := testdata.GenerateTraceDataTwoSpansSameResource()
38+
td := testdata.GenerateTracesTwoSpansSameResource()
3939
assert.NoError(t, fe.Start(context.Background(), componenttest.NewNopHost()))
4040
assert.NoError(t, fe.ConsumeTraces(context.Background(), td))
4141
assert.NoError(t, fe.Shutdown(context.Background()))
@@ -53,7 +53,7 @@ func TestFileTracesExporterError(t *testing.T) {
5353
fe := &fileExporter{file: mf}
5454
require.NotNil(t, fe)
5555

56-
td := testdata.GenerateTraceDataTwoSpansSameResource()
56+
td := testdata.GenerateTracesTwoSpansSameResource()
5757
assert.NoError(t, fe.Start(context.Background(), componenttest.NewNopHost()))
5858
assert.Error(t, fe.ConsumeTraces(context.Background(), td))
5959
assert.NoError(t, fe.Shutdown(context.Background()))
@@ -93,7 +93,7 @@ func TestFileLogsExporter(t *testing.T) {
9393
fe := &fileExporter{file: mf}
9494
require.NotNil(t, fe)
9595

96-
otlp := testdata.GenerateLogDataTwoLogsSameResource()
96+
otlp := testdata.GenerateLogsTwoLogRecordsSameResource()
9797
assert.NoError(t, fe.Start(context.Background(), componenttest.NewNopHost()))
9898
assert.NoError(t, fe.ConsumeLogs(context.Background(), otlp))
9999
assert.NoError(t, fe.Shutdown(context.Background()))
@@ -111,7 +111,7 @@ func TestFileLogsExporterErrors(t *testing.T) {
111111
fe := &fileExporter{file: mf}
112112
require.NotNil(t, fe)
113113

114-
otlp := testdata.GenerateLogDataTwoLogsSameResource()
114+
otlp := testdata.GenerateLogsTwoLogRecordsSameResource()
115115
assert.NoError(t, fe.Start(context.Background(), componenttest.NewNopHost()))
116116
assert.Error(t, fe.ConsumeLogs(context.Background(), otlp))
117117
assert.NoError(t, fe.Shutdown(context.Background()))

‎exporter/jaegerexporter/exporter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func TestNew(t *testing.T) {
158158
}
159159

160160
// This is expected to fail.
161-
err = got.ConsumeTraces(context.Background(), testdata.GenerateTraceDataNoLibraries())
161+
err = got.ConsumeTraces(context.Background(), testdata.GenerateTracesNoLibraries())
162162
assert.Error(t, err)
163163
})
164164
}

0 commit comments

Comments
 (0)