@@ -27,6 +27,7 @@ import (
27
27
"go.opentelemetry.io/collector/pdata/pmetric"
28
28
"go.opentelemetry.io/collector/pdata/ptrace"
29
29
"go.opentelemetry.io/collector/pdata/testdata"
30
+ "go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata"
30
31
"go.opentelemetry.io/collector/processor/batchprocessor/internal/metadatatest"
31
32
"go.opentelemetry.io/collector/processor/processortest"
32
33
)
@@ -35,7 +36,7 @@ func TestProcessorShutdown(t *testing.T) {
35
36
factory := NewFactory ()
36
37
37
38
ctx := context .Background ()
38
- processorCreationSet := processortest .NewNopSettingsWithType (processortest . NopType )
39
+ processorCreationSet := processortest .NewNopSettingsWithType (metadata . Type )
39
40
40
41
for i := 0 ; i < 5 ; i ++ {
41
42
require .NotPanics (t , func () {
@@ -62,7 +63,7 @@ func TestProcessorLifecycle(t *testing.T) {
62
63
factory := NewFactory ()
63
64
64
65
ctx := context .Background ()
65
- processorCreationSet := processortest .NewNopSettingsWithType (processortest . NopType )
66
+ processorCreationSet := processortest .NewNopSettingsWithType (metadata . Type )
66
67
67
68
for i := 0 ; i < 5 ; i ++ {
68
69
tProc , err := factory .CreateTraces (ctx , processorCreationSet , factory .CreateDefaultConfig (), consumertest .NewNop ())
@@ -86,7 +87,7 @@ func TestBatchProcessorSpansDelivered(t *testing.T) {
86
87
sink := new (consumertest.TracesSink )
87
88
cfg := createDefaultConfig ().(* Config )
88
89
cfg .SendBatchSize = 128
89
- traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
90
+ traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
90
91
require .NoError (t , err )
91
92
require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
92
93
@@ -127,7 +128,7 @@ func TestBatchProcessorSpansDeliveredEnforceBatchSize(t *testing.T) {
127
128
cfg := createDefaultConfig ().(* Config )
128
129
cfg .SendBatchSize = 128
129
130
cfg .SendBatchMaxSize = 130
130
- traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
131
+ traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
131
132
require .NoError (t , err )
132
133
require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
133
134
@@ -368,7 +369,7 @@ func TestBatchProcessorSentByTimeout(t *testing.T) {
368
369
spansPerRequest := 10
369
370
start := time .Now ()
370
371
371
- traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
372
+ traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
372
373
require .NoError (t , err )
373
374
require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
374
375
@@ -413,7 +414,7 @@ func TestBatchProcessorTraceSendWhenClosing(t *testing.T) {
413
414
}
414
415
sink := new (consumertest.TracesSink )
415
416
416
- traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
417
+ traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
417
418
require .NoError (t , err )
418
419
require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
419
420
@@ -442,7 +443,7 @@ func TestBatchMetricProcessor_ReceivingData(t *testing.T) {
442
443
metricsPerRequest := 5
443
444
sink := new (consumertest.MetricsSink )
444
445
445
- metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
446
+ metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
446
447
require .NoError (t , err )
447
448
require .NoError (t , metrics .Start (context .Background (), componenttest .NewNopHost ()))
448
449
@@ -603,7 +604,7 @@ func TestBatchMetricsProcessor_Timeout(t *testing.T) {
603
604
metricsPerRequest := 10
604
605
sink := new (consumertest.MetricsSink )
605
606
606
- metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
607
+ metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
607
608
require .NoError (t , err )
608
609
require .NoError (t , metrics .Start (context .Background (), componenttest .NewNopHost ()))
609
610
@@ -650,7 +651,7 @@ func TestBatchMetricProcessor_Shutdown(t *testing.T) {
650
651
metricsPerRequest := 10
651
652
sink := new (consumertest.MetricsSink )
652
653
653
- metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
654
+ metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
654
655
require .NoError (t , err )
655
656
require .NoError (t , metrics .Start (context .Background (), componenttest .NewNopHost ()))
656
657
@@ -746,7 +747,7 @@ func BenchmarkMultiBatchMetricProcessor(b *testing.B) {
746
747
func runMetricsProcessorBenchmark (b * testing.B , cfg * Config ) {
747
748
ctx := context .Background ()
748
749
sink := new (metricsSink )
749
- metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
750
+ metrics , err := NewFactory ().CreateMetrics (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
750
751
require .NoError (b , err )
751
752
require .NoError (b , metrics .Start (ctx , componenttest .NewNopHost ()))
752
753
@@ -792,7 +793,7 @@ func TestBatchLogProcessor_ReceivingData(t *testing.T) {
792
793
logsPerRequest := 5
793
794
sink := new (consumertest.LogsSink )
794
795
795
- logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
796
+ logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
796
797
require .NoError (t , err )
797
798
require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
798
799
@@ -931,7 +932,7 @@ func TestBatchLogsProcessor_Timeout(t *testing.T) {
931
932
logsPerRequest := 10
932
933
sink := new (consumertest.LogsSink )
933
934
934
- logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
935
+ logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
935
936
require .NoError (t , err )
936
937
require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
937
938
@@ -978,7 +979,7 @@ func TestBatchLogProcessor_Shutdown(t *testing.T) {
978
979
logsPerRequest := 10
979
980
sink := new (consumertest.LogsSink )
980
981
981
- logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
982
+ logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
982
983
require .NoError (t , err )
983
984
require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
984
985
@@ -1055,7 +1056,7 @@ func TestBatchProcessorSpansBatchedByMetadata(t *testing.T) {
1055
1056
cfg .SendBatchSize = 1000
1056
1057
cfg .Timeout = 10 * time .Minute
1057
1058
cfg .MetadataKeys = []string {"token1" , "token2" }
1058
- traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
1059
+ traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
1059
1060
require .NoError (t , err )
1060
1061
require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
1061
1062
@@ -1146,7 +1147,7 @@ func TestBatchProcessorMetadataCardinalityLimit(t *testing.T) {
1146
1147
cfg := createDefaultConfig ().(* Config )
1147
1148
cfg .MetadataKeys = []string {"token" }
1148
1149
cfg .MetadataCardinalityLimit = cardLimit
1149
- traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
1150
+ traces , err := NewFactory ().CreateTraces (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
1150
1151
require .NoError (t , err )
1151
1152
require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
1152
1153
@@ -1187,7 +1188,7 @@ func TestBatchZeroConfig(t *testing.T) {
1187
1188
const requestCount = 5
1188
1189
const logsPerRequest = 10
1189
1190
sink := new (consumertest.LogsSink )
1190
- logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
1191
+ logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
1191
1192
require .NoError (t , err )
1192
1193
require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
1193
1194
defer func () { require .NoError (t , logs .Shutdown (context .Background ())) }()
@@ -1226,7 +1227,7 @@ func TestBatchSplitOnly(t *testing.T) {
1226
1227
require .NoError (t , cfg .Validate ())
1227
1228
1228
1229
sink := new (consumertest.LogsSink )
1229
- logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (processortest . NopType ), cfg , sink )
1230
+ logs , err := NewFactory ().CreateLogs (context .Background (), processortest .NewNopSettingsWithType (metadata . Type ), cfg , sink )
1230
1231
require .NoError (t , err )
1231
1232
require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
1232
1233
defer func () { require .NoError (t , logs .Shutdown (context .Background ())) }()
0 commit comments