@@ -27,6 +27,7 @@ import (
2727 "go.opentelemetry.io/collector/pdata/pmetric"
2828 "go.opentelemetry.io/collector/pdata/ptrace"
2929 "go.opentelemetry.io/collector/pdata/testdata"
30+ "go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata"
3031 "go.opentelemetry.io/collector/processor/batchprocessor/internal/metadatatest"
3132 "go.opentelemetry.io/collector/processor/processortest"
3233)
@@ -35,7 +36,7 @@ func TestProcessorShutdown(t *testing.T) {
3536 factory := NewFactory ()
3637
3738 ctx := context .Background ()
38- processorCreationSet := processortest .NewNopSettingsWithType (processortest . NopType )
39+ processorCreationSet := processortest .NewNopSettingsWithType (metadata . Type )
3940
4041 for i := 0 ; i < 5 ; i ++ {
4142 require .NotPanics (t , func () {
@@ -62,7 +63,7 @@ func TestProcessorLifecycle(t *testing.T) {
6263 factory := NewFactory ()
6364
6465 ctx := context .Background ()
65- processorCreationSet := processortest .NewNopSettingsWithType (processortest . NopType )
66+ processorCreationSet := processortest .NewNopSettingsWithType (metadata . Type )
6667
6768 for i := 0 ; i < 5 ; i ++ {
6869 tProc , err := factory .CreateTraces (ctx , processorCreationSet , factory .CreateDefaultConfig (), consumertest .NewNop ())
@@ -86,7 +87,7 @@ func TestBatchProcessorSpansDelivered(t *testing.T) {
8687 sink := new (consumertest.TracesSink )
8788 cfg := createDefaultConfig ().(* Config )
8889 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 )
9091 require .NoError (t , err )
9192 require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
9293
@@ -127,7 +128,7 @@ func TestBatchProcessorSpansDeliveredEnforceBatchSize(t *testing.T) {
127128 cfg := createDefaultConfig ().(* Config )
128129 cfg .SendBatchSize = 128
129130 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 )
131132 require .NoError (t , err )
132133 require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
133134
@@ -368,7 +369,7 @@ func TestBatchProcessorSentByTimeout(t *testing.T) {
368369 spansPerRequest := 10
369370 start := time .Now ()
370371
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 )
372373 require .NoError (t , err )
373374 require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
374375
@@ -413,7 +414,7 @@ func TestBatchProcessorTraceSendWhenClosing(t *testing.T) {
413414 }
414415 sink := new (consumertest.TracesSink )
415416
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 )
417418 require .NoError (t , err )
418419 require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
419420
@@ -442,7 +443,7 @@ func TestBatchMetricProcessor_ReceivingData(t *testing.T) {
442443 metricsPerRequest := 5
443444 sink := new (consumertest.MetricsSink )
444445
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 )
446447 require .NoError (t , err )
447448 require .NoError (t , metrics .Start (context .Background (), componenttest .NewNopHost ()))
448449
@@ -603,7 +604,7 @@ func TestBatchMetricsProcessor_Timeout(t *testing.T) {
603604 metricsPerRequest := 10
604605 sink := new (consumertest.MetricsSink )
605606
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 )
607608 require .NoError (t , err )
608609 require .NoError (t , metrics .Start (context .Background (), componenttest .NewNopHost ()))
609610
@@ -650,7 +651,7 @@ func TestBatchMetricProcessor_Shutdown(t *testing.T) {
650651 metricsPerRequest := 10
651652 sink := new (consumertest.MetricsSink )
652653
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 )
654655 require .NoError (t , err )
655656 require .NoError (t , metrics .Start (context .Background (), componenttest .NewNopHost ()))
656657
@@ -746,7 +747,7 @@ func BenchmarkMultiBatchMetricProcessor(b *testing.B) {
746747func runMetricsProcessorBenchmark (b * testing.B , cfg * Config ) {
747748 ctx := context .Background ()
748749 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 )
750751 require .NoError (b , err )
751752 require .NoError (b , metrics .Start (ctx , componenttest .NewNopHost ()))
752753
@@ -792,7 +793,7 @@ func TestBatchLogProcessor_ReceivingData(t *testing.T) {
792793 logsPerRequest := 5
793794 sink := new (consumertest.LogsSink )
794795
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 )
796797 require .NoError (t , err )
797798 require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
798799
@@ -931,7 +932,7 @@ func TestBatchLogsProcessor_Timeout(t *testing.T) {
931932 logsPerRequest := 10
932933 sink := new (consumertest.LogsSink )
933934
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 )
935936 require .NoError (t , err )
936937 require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
937938
@@ -978,7 +979,7 @@ func TestBatchLogProcessor_Shutdown(t *testing.T) {
978979 logsPerRequest := 10
979980 sink := new (consumertest.LogsSink )
980981
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 )
982983 require .NoError (t , err )
983984 require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
984985
@@ -1055,7 +1056,7 @@ func TestBatchProcessorSpansBatchedByMetadata(t *testing.T) {
10551056 cfg .SendBatchSize = 1000
10561057 cfg .Timeout = 10 * time .Minute
10571058 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 )
10591060 require .NoError (t , err )
10601061 require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
10611062
@@ -1146,7 +1147,7 @@ func TestBatchProcessorMetadataCardinalityLimit(t *testing.T) {
11461147 cfg := createDefaultConfig ().(* Config )
11471148 cfg .MetadataKeys = []string {"token" }
11481149 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 )
11501151 require .NoError (t , err )
11511152 require .NoError (t , traces .Start (context .Background (), componenttest .NewNopHost ()))
11521153
@@ -1187,7 +1188,7 @@ func TestBatchZeroConfig(t *testing.T) {
11871188 const requestCount = 5
11881189 const logsPerRequest = 10
11891190 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 )
11911192 require .NoError (t , err )
11921193 require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
11931194 defer func () { require .NoError (t , logs .Shutdown (context .Background ())) }()
@@ -1226,7 +1227,7 @@ func TestBatchSplitOnly(t *testing.T) {
12261227 require .NoError (t , cfg .Validate ())
12271228
12281229 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 )
12301231 require .NoError (t , err )
12311232 require .NoError (t , logs .Start (context .Background (), componenttest .NewNopHost ()))
12321233 defer func () { require .NoError (t , logs .Shutdown (context .Background ())) }()
0 commit comments