@@ -28,7 +28,7 @@ import (
28
28
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/schemaprocessor/internal/translation"
29
29
)
30
30
31
- func newTestTransformer (t * testing.T ) * schemaprocessor {
31
+ func newTestProcessor (t * testing.T ) * schemaprocessor {
32
32
trans , err := newSchemaProcessor (context .Background (), newDefaultConfiguration (), processor.Settings {
33
33
TelemetrySettings : component.TelemetrySettings {
34
34
Logger : zaptest .NewLogger (t ),
@@ -39,10 +39,10 @@ func newTestTransformer(t *testing.T) *schemaprocessor {
39
39
return trans
40
40
}
41
41
42
- func TestTransformerStart (t * testing.T ) {
42
+ func TestProcessorStart (t * testing.T ) {
43
43
t .Parallel ()
44
44
45
- trans := newTestTransformer (t )
45
+ trans := newTestProcessor (t )
46
46
assert .NoError (t , trans .start (context .Background (), componenttest .NewNopHost ()))
47
47
}
48
48
@@ -85,23 +85,23 @@ func pmetricsFromJSON(t *testing.T, path string) pmetric.Metrics {
85
85
return inSignals
86
86
}
87
87
88
- func buildTestTransformer (t * testing.T , targetURL string ) * schemaprocessor {
88
+ func buildTestProcessor (t * testing.T , targetURL string ) * schemaprocessor {
89
89
t .Helper ()
90
90
defaultConfig := newDefaultConfiguration ()
91
91
castedConfig := defaultConfig .(* Config )
92
92
castedConfig .Targets = []string {targetURL }
93
- transform , err := newSchemaProcessor (context .Background (), castedConfig , processor.Settings {
93
+ processor , err := newSchemaProcessor (context .Background (), castedConfig , processor.Settings {
94
94
TelemetrySettings : component.TelemetrySettings {
95
95
Logger : zaptest .NewLogger (t ),
96
96
},
97
97
})
98
98
require .NoError (t , err , "Must not error when creating schemaprocessor" )
99
- err = transform .manager .SetProviders (translation .NewTestProvider (& f ))
99
+ err = processor .manager .SetProviders (translation .NewTestProvider (& f ))
100
100
require .NoError (t , err )
101
- return transform
101
+ return processor
102
102
}
103
103
104
- func TestTransformerSchemaBySections (t * testing.T ) {
104
+ func TestProcessorSchemaBySections (t * testing.T ) {
105
105
tests := []struct {
106
106
name string
107
107
section string
@@ -152,30 +152,30 @@ func TestTransformerSchemaBySections(t *testing.T) {
152
152
}
153
153
for _ , tc := range tests {
154
154
t .Run (tc .name , func (t * testing.T ) {
155
- transformerTarget := fmt .Sprintf ("https://example.com/testdata/schema_sections/%s/1.0.0" , tc .section )
156
- transform := buildTestTransformer (t , transformerTarget )
155
+ processorTarget := fmt .Sprintf ("https://example.com/testdata/schema_sections/%s/1.0.0" , tc .section )
156
+ processor := buildTestProcessor (t , processorTarget )
157
157
inDataPath := fmt .Sprintf ("testdata/schema_sections/%s/%s_in.json" , tc .section , tc .dataType )
158
158
outDataPath := fmt .Sprintf ("testdata/schema_sections/%s/%s_out.json" , tc .section , tc .dataType )
159
159
switch tc .dataType {
160
160
case pipeline .SignalLogs :
161
161
inLogs := plogsFromJSON (t , inDataPath )
162
162
expected := plogsFromJSON (t , outDataPath )
163
163
164
- logs , err := transform .processLogs (context .Background (), inLogs )
164
+ logs , err := processor .processLogs (context .Background (), inLogs )
165
165
require .NoError (t , err )
166
166
require .NoError (t , plogtest .CompareLogs (expected , logs ), "Must match the expected values" )
167
167
case pipeline .SignalMetrics :
168
168
inMetrics := pmetricsFromJSON (t , inDataPath )
169
169
expected := pmetricsFromJSON (t , outDataPath )
170
170
171
- metrics , err := transform .processMetrics (context .Background (), inMetrics )
171
+ metrics , err := processor .processMetrics (context .Background (), inMetrics )
172
172
require .NoError (t , err )
173
173
require .NoError (t , pmetrictest .CompareMetrics (expected , metrics ), "Must match the expected values" )
174
174
case pipeline .SignalTraces :
175
175
inTraces := ptracesFromJSON (t , inDataPath )
176
176
expected := ptracesFromJSON (t , outDataPath )
177
177
178
- traces , err := transform .processTraces (context .Background (), inTraces )
178
+ traces , err := processor .processTraces (context .Background (), inTraces )
179
179
require .NoError (t , err )
180
180
require .NoError (t , ptracetest .CompareTraces (expected , traces ), "Must match the expected values" )
181
181
default :
@@ -186,10 +186,10 @@ func TestTransformerSchemaBySections(t *testing.T) {
186
186
}
187
187
}
188
188
189
- func TestTransformerProcessing (t * testing.T ) {
189
+ func TestProcessorProcessing (t * testing.T ) {
190
190
t .Parallel ()
191
191
192
- trans := newTestTransformer (t )
192
+ trans := newTestProcessor (t )
193
193
t .Run ("metrics" , func (t * testing.T ) {
194
194
in := pmetric .NewMetrics ()
195
195
in .ResourceMetrics ().AppendEmpty ()
@@ -263,7 +263,7 @@ var testdataFiles embed.FS
263
263
// case 2: resource schema not set, scope schema set, use scope schema inside
264
264
// case 3: resource schema set, scope schema set, use scope schema
265
265
// case 4: resource schema not set, scope schema not set, noop translation
266
- func TestTransformerScopeLogSchemaPrecedence (t * testing.T ) {
266
+ func TestProcessorScopeLogSchemaPrecedence (t * testing.T ) {
267
267
t .Parallel ()
268
268
tests := []struct {
269
269
name string
@@ -319,16 +319,16 @@ func TestTransformerScopeLogSchemaPrecedence(t *testing.T) {
319
319
defaultConfig := newDefaultConfiguration ()
320
320
castedConfig := defaultConfig .(* Config )
321
321
castedConfig .Targets = []string {"https://example.com/testdata/testschemas/schemaprecedence/1.2.0" }
322
- transform , err := newSchemaProcessor (context .Background (), defaultConfig , processor.Settings {
322
+ processor , err := newSchemaProcessor (context .Background (), defaultConfig , processor.Settings {
323
323
TelemetrySettings : component.TelemetrySettings {
324
324
Logger : zaptest .NewLogger (t ),
325
325
},
326
326
})
327
327
require .NoError (t , err , "Must not error when creating schemaprocessor" )
328
328
329
- err = transform .manager .SetProviders (translation .NewTestProvider (& testdataFiles ))
329
+ err = processor .manager .SetProviders (translation .NewTestProvider (& testdataFiles ))
330
330
require .NoError (t , err )
331
- got , err := transform .processLogs (context .Background (), tt .input ())
331
+ got , err := processor .processLogs (context .Background (), tt .input ())
332
332
if ! tt .wantErr (t , err , fmt .Sprintf ("processLogs(%v)" , tt .input ())) {
333
333
return
334
334
}
@@ -364,7 +364,7 @@ func generateTraceForTest() ptrace.Traces {
364
364
// case 2: resource schema not set, scope schema set, use scope schema inside
365
365
// case 3: resource schema set, scope schema set, use scope schema
366
366
// case 4: resource schema not set, scope schema not set, noop translation
367
- func TestTransformerScopeTraceSchemaPrecedence (t * testing.T ) {
367
+ func TestProcessorScopeTraceSchemaPrecedence (t * testing.T ) {
368
368
t .Parallel ()
369
369
tests := []struct {
370
370
name string
@@ -420,16 +420,16 @@ func TestTransformerScopeTraceSchemaPrecedence(t *testing.T) {
420
420
defaultConfig := newDefaultConfiguration ()
421
421
castedConfig := defaultConfig .(* Config )
422
422
castedConfig .Targets = []string {"https://example.com/testdata/testschemas/schemaprecedence/1.2.0" }
423
- transform , err := newSchemaProcessor (context .Background (), defaultConfig , processor.Settings {
423
+ processor , err := newSchemaProcessor (context .Background (), defaultConfig , processor.Settings {
424
424
TelemetrySettings : component.TelemetrySettings {
425
425
Logger : zaptest .NewLogger (t ),
426
426
},
427
427
})
428
428
require .NoError (t , err , "Must not error when creating schemaprocessor" )
429
429
430
- err = transform .manager .SetProviders (translation .NewTestProvider (& testdataFiles ))
430
+ err = processor .manager .SetProviders (translation .NewTestProvider (& testdataFiles ))
431
431
require .NoError (t , err )
432
- got , err := transform .processTraces (context .Background (), tt .input ())
432
+ got , err := processor .processTraces (context .Background (), tt .input ())
433
433
if ! tt .wantErr (t , err , fmt .Sprintf ("processTraces(%v)" , tt .input ())) {
434
434
return
435
435
}
@@ -464,7 +464,7 @@ func generateMetricForTest() pmetric.Metrics {
464
464
// case 2: resource schema not set, scope schema set, use scope schema inside
465
465
// case 3: resource schema set, scope schema set, use scope schema
466
466
// case 4: resource schema not set, scope schema not set, noop translation
467
- func TestTransformerScopeMetricSchemaPrecedence (t * testing.T ) {
467
+ func TestProcessorScopeMetricSchemaPrecedence (t * testing.T ) {
468
468
t .Parallel ()
469
469
tests := []struct {
470
470
name string
@@ -520,16 +520,16 @@ func TestTransformerScopeMetricSchemaPrecedence(t *testing.T) {
520
520
defaultConfig := newDefaultConfiguration ()
521
521
castedConfig := defaultConfig .(* Config )
522
522
castedConfig .Targets = []string {"https://example.com/testdata/testschemas/schemaprecedence/1.2.0" }
523
- transform , err := newSchemaProcessor (context .Background (), defaultConfig , processor.Settings {
523
+ processor , err := newSchemaProcessor (context .Background (), defaultConfig , processor.Settings {
524
524
TelemetrySettings : component.TelemetrySettings {
525
525
Logger : zaptest .NewLogger (t ),
526
526
},
527
527
})
528
528
require .NoError (t , err , "Must not error when creating schemaprocessor" )
529
529
530
- err = transform .manager .SetProviders (translation .NewTestProvider (& testdataFiles ))
530
+ err = processor .manager .SetProviders (translation .NewTestProvider (& testdataFiles ))
531
531
require .NoError (t , err )
532
- got , err := transform .processMetrics (context .Background (), tt .input ())
532
+ got , err := processor .processMetrics (context .Background (), tt .input ())
533
533
if ! tt .wantErr (t , err , fmt .Sprintf ("processMetrics(%v)" , tt .input ())) {
534
534
return
535
535
}
0 commit comments